Fixed build errors.

dyninst · Mar 14, 2017 · 3d29a56 · 3d29a56
1 parent 1d52bc0
commit 3d29a56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/dyninstAPI/src/codegen-aarch64.h b/dyninstAPI/src/codegen-aarch64.h
@@ -37,6 +37,18 @@ class codeGen;
 
 class insnCodeGen {
 public:
+
+    enum MoveOp {
+        MovOp_MOVK = 0xE5,
+        MovOp_MOVN = 0x25,
+        MovOp_MOVZ = 0xA5
+    };
+
+    enum LoadStore {
+        Load,
+        Store
+    };
+
     static instructUnion *insnPtr(codeGen &gen);
     //static instructUnion *ptrAndInc(codeGen &gen);
 
@@ -173,17 +185,6 @@ class insnCodeGen {
     static bool modifyData(Address target,
                            NS_aarch64::instruction &insn,
                            codeGen &gen);
-
-    enum MoveOp {
-        MovOp_MOVK = 0xE5,
-        MovOp_MOVN = 0x25,
-        MovOp_MOVZ = 0xA5
-    };
-
-    enum LoadStore {
-        Load,
-        Store
-    };
 };
 
 #endif
diff --git a/dyninstAPI/src/emit-aarch64.h b/dyninstAPI/src/emit-aarch64.h
@@ -227,7 +227,7 @@ class EmitterAARCH64SaveRegs {
 public:
     virtual ~EmitterAARCH64SaveRegs() {}
 
-    unsigned saveGPRegisters(baseTramp *bt, codeGen &gen, registerSpace *theRegSpace, int numReqGPRs = -1, int &offset);
+    unsigned saveGPRegisters(baseTramp *bt, codeGen &gen, registerSpace *theRegSpace, int &offset, int numReqGPRs = -1);
 
     unsigned saveFPRegisters(codeGen &gen, registerSpace *theRegSpace, int &offset);
 

diff --git a/dyninstAPI/src/inst-aarch64.C b/dyninstAPI/src/inst-aarch64.C
@@ -171,7 +171,7 @@ void EmitterAARCH64SaveRegs::saveFPRegister(codeGen &gen, Register reg, int save
 
 /********************************* Public methods *********************************************/
 
-unsigned EmitterAARCH64SaveRegs::saveGPRegisters(baseTramp *bt, codeGen &gen, registerSpace *theRegSpace, int numReqGPRs, int &offset) {
+unsigned EmitterAARCH64SaveRegs::saveGPRegisters(baseTramp *bt, codeGen &gen, registerSpace *theRegSpace, int &offset, int numReqGPRs) {
     unsigned ret = 0;
     if(numReqGPRs == -1)
         numReqGPRs = theRegSpace->numGPRs();