From 67feacc2fa26419ed4cab7793bedf361a33f6fd8 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Wed, 4 Aug 2021 18:26:02 +0000
Subject: [PATCH] Remove ZIPR_INSTALL variable in favor of ZIPR_PLUGIN_PATH
---
SConscript | 5 ++---
unpin_x86.cpp | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SConscript b/SConscript
index d36c37500..dddb4cad6 100644
--- a/SConscript
+++ b/SConscript
@@ -18,7 +18,6 @@ myenv.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
myenv.Replace(ZIPR_HOME=os.environ['ZIPR_HOME'])
myenv.Replace(IRDB_SDK=os.environ['IRDB_SDK'])
myenv.Replace(ZIPR_SDK=os.environ['ZIPR_SDK'])
-myenv.Replace(ZIPR_INSTALL=os.environ['ZIPR_INSTALL'])
myenv.Replace(do_cgc=ARGUMENTS.get("do_cgc",0))
files= '''
@@ -55,14 +54,14 @@ myenv.Append(CXXFLAGS=" -std=c++11 ")
myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="")
lib=myenv.SharedLibrary("unpin", Split(files))
-install=myenv.Install("$ZIPR_INSTALL/plugins/", lib)
+install=myenv.Install("$PEASOUP_HOME/zipr_install/plugins/", lib)
Default(install)
ret=[install,lib]
pedi = Command( target = "./unpin-testoutput",
source = install,
- action = "cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" )
+ action = "cd "+os.environ['PEASOUP_HOME']+"/zipr_install ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" )
if Dir('.').abspath == Dir('#.').abspath:
ret=ret+pedi
diff --git a/unpin_x86.cpp b/unpin_x86.cpp
index 13ce61488..a18a979cf 100644
--- a/unpin_x86.cpp
+++ b/unpin_x86.cpp
@@ -120,6 +120,7 @@ void UnpinX86_t::HandlePcrelReloc(Instruction_t* from_insn, Relocation_t* reloc)
}
else if(insn_wrt)
{
+
to_addr=locMap[insn_wrt];
convert_string=string("insn ")+to_string(insn_wrt->getBaseID())+
":"+insn_wrt->getDisassembly();
--
GitLab