diff --git a/libElfDep/test/SConscript b/libElfDep/test/SConscript index e07d67e74ee3ab43ca4acdfd671107c86bed4eea..1bd868f7e33ea2e8268a955291ba296187291d71 100644 --- a/libElfDep/test/SConscript +++ b/libElfDep/test/SConscript @@ -32,7 +32,7 @@ files=Glob( Dir('.').srcnode().abspath+"/edt*.cpp") pgm="edt.exe" LIBPATH="$SECURITY_TRANSFORMS_HOME/lib" -LIBS=Split("stars "+ myenv.subst('$BASE_IRDB_LIBS')+ " IRDB-core pqxx BeaEngine_s_d transform MEDSannotation EXEIO pebliss ElfDep") +LIBS=Split("stars "+ myenv.subst('$BASE_IRDB_LIBS')+ " IRDB-core pqxx capstone transform MEDSannotation EXEIO pebliss ElfDep") myenv=myenv.Clone(CPPPATH=Split(cpppath)) pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS) install=myenv.Install("$SECURITY_TRANSFORMS_HOME/plugins_install/", pgm) diff --git a/libElfDep/test/edt.cpp b/libElfDep/test/edt.cpp index 12e1ea24f4bbab211770e2bebe8589d88c9886f6..77cff3e41f288bc2d67fe976f0beb5e8a449b2a0 100644 --- a/libElfDep/test/edt.cpp +++ b/libElfDep/test/edt.cpp @@ -41,23 +41,23 @@ int ElfDep_Tester_t::execute() // insert the instrumentation auto tmp=insert_loc; - (void)insertAssemblyBefore(getFileIR(),tmp," push rdi") ; - tmp= insertAssemblyAfter(getFileIR(), tmp," push rsi ") ; - tmp= insertAssemblyAfter(getFileIR(), tmp," push rdx") ; - tmp= insertAssemblyAfter(getFileIR(), tmp," push rcx ") ; - tmp= insertAssemblyAfter(getFileIR(), tmp," push r8 ") ; - tmp= insertAssemblyAfter(getFileIR(), tmp," push r9 ") ; - tmp= insertAssemblyAfter(getFileIR(), tmp," call 0 ", edpcb) ; - tmp= insertAssemblyAfter(getFileIR(), tmp," L1: mov rcx, [rel L1]"); + (void)insertAssemblyBefore(tmp," push rdi") ; + tmp= insertAssemblyAfter(tmp," push rsi ") ; + tmp= insertAssemblyAfter(tmp," push rdx") ; + tmp= insertAssemblyAfter(tmp," push rcx ") ; + tmp= insertAssemblyAfter(tmp," push r8 ") ; + tmp= insertAssemblyAfter(tmp," push r9 ") ; + tmp= insertAssemblyAfter(tmp," call 0 ", edpcb) ; + tmp= insertAssemblyAfter(tmp," L1: mov rcx, [rel L1]"); auto got_insn=tmp; - tmp= insertAssemblyAfter(getFileIR(), tmp," inc dword [rcx]"); - tmp= insertAssemblyAfter(getFileIR(), tmp," call 0", edpcb); - tmp= insertAssemblyAfter(getFileIR(), tmp," pop r9"); - tmp= insertAssemblyAfter(getFileIR(), tmp," pop r8"); - tmp= insertAssemblyAfter(getFileIR(), tmp," pop rcx"); - tmp= insertAssemblyAfter(getFileIR(), tmp," pop rdx"); - tmp= insertAssemblyAfter(getFileIR(), tmp," pop rsi"); - tmp= insertAssemblyAfter(getFileIR(), tmp," pop rdi"); + tmp= insertAssemblyAfter(tmp," inc dword [rcx]"); + tmp= insertAssemblyAfter(tmp," call 0", edpcb); + tmp= insertAssemblyAfter(tmp," pop r9"); + tmp= insertAssemblyAfter(tmp," pop r8"); + tmp= insertAssemblyAfter(tmp," pop rcx"); + tmp= insertAssemblyAfter(tmp," pop rdx"); + tmp= insertAssemblyAfter(tmp," pop rsi"); + tmp= insertAssemblyAfter(tmp," pop rdi"); // map the load to point at the GOT entry.