xin/diffu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: load global variable with macro, rename symbols

Browse source
This commit is contained in:
xinyangli 2024-07-22 16:15:45 +08:00
parent 607ed58ffa
commit 46c943dea9
Signed by: xin
SSH key fingerprint: SHA256:qZ/tzd8lYRtUFSrfBDBMcUqV4GHKxqeqRA3huItgvbk
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/loader.cpp
View file

@ -9,7 +9,7 @@ Target::Target(const std::string &name, const std::string &func_prefix,
meta = {.name = name, meta = {.name = name,
.libpath = path, .libpath = path,
.dlhandle = dlopen(path.c_str(), RTLD_LAZY)}; .dlhandle = dlopen(path.c_str(), RTLD_NOW)};
if (!meta.dlhandle) { if (!meta.dlhandle) {
throw std::runtime_error(dlerror()); throw std::runtime_error(dlerror());
@ -17,9 +17,9 @@ Target::Target(const std::string &name, const std::string &func_prefix,
#define LOAD_SYMBOL(ops, handle, prefix, name) \ #define LOAD_SYMBOL(ops, handle, prefix, name) \
do { \ do { \
ops.name = reinterpret_cast<decltype(DiffTargetApi::name)>( \ (ops).name = reinterpret_cast<decltype((ops).name)>( \
dlsym(handle, (prefix + #name).c_str())); \ dlsym((handle), ((prefix) + #name).c_str())); \
if (!ops.name) \ if (!((ops).name)) \
goto load_error; \ goto load_error; \
} while (0); } while (0);
@ -34,22 +34,14 @@ Target::Target(const std::string &name, const std::string &func_prefix,
LOAD_SYMBOL(ops, meta.dlhandle, func_prefix, on_interrupt); LOAD_SYMBOL(ops, meta.dlhandle, func_prefix, on_interrupt);
LOAD_SYMBOL(ops, meta.dlhandle, func_prefix, init); LOAD_SYMBOL(ops, meta.dlhandle, func_prefix, init);
LOAD_SYMBOL(*this, meta.dlhandle, func_prefix, do_difftest);
*do_difftest = true;
LOAD_SYMBOL(*this, meta.dlhandle, func_prefix, dbg_state_size);
args.resize(*dbg_state_size);
LOAD_SYMBOL(*this, meta.dlhandle, func_prefix, isa_arch_info);
#undef LOAD_SYMBOL #undef LOAD_SYMBOL
size_t *argsize_sym;
argsize_sym = reinterpret_cast<size_t *>(dlsym(meta.dlhandle, "argsize"));
if (!argsize_sym)
goto load_error;
argsize = *argsize_sym;
args = std::vector<uint8_t>(argsize);
arch_info_t *arch_sym;
arch_sym =
reinterpret_cast<arch_info_t *>(dlsym(meta.dlhandle, "isa_arch_info"));
if (!arch_sym)
goto load_error;
arch = *arch_sym;
return; return;
load_error: load_error: