Fixes loading pre-instrumentation register values on aarch64

dyninst · Oct 16, 2019 · 1090859 · 1090859
1 parent b7c9eee
commit 1090859
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dyninstAPI/src/emit-aarch64.C b/dyninstAPI/src/emit-aarch64.C
@@ -274,17 +274,17 @@ void EmitterAARCH64::emitLoadOrigRegister(Address register_num, Register destina
    registerSlot *dest = (*gen.rs())[destination];
    assert(dest);
 
-   if (register_num == REG_SP) {
+   if (src->name == "sp") {
       insnCodeGen::generateAddSubImmediate(gen, insnCodeGen::Add, 0,
-             TRAMP_FRAME_SIZE_64, destination, REG_SP, true);
+             TRAMP_FRAME_SIZE_64, REG_SP, destination, true);
 
       return;
    }
 
    if (src->spilledState == registerSlot::unspilled)
    {
       // not on the stack. Directly move the value
-      emitMoveRegToReg((Register) register_num, destination, gen);
+      insnCodeGen::generateMove(gen, destination, (Register) register_num, true);
       return;
    }