changeset:   11660:3021001736bc
tag:         tip
user:        Fernando A. Endo <fernando.endo@inria.fr>
date:        Wed Oct 05 17:18:58 2016 +0200
summary:     arm: Fix register index printing

diff -r b29aca3fcb75 -r 3021001736bc src/arch/arm/insts/static_inst.cc
--- a/src/arch/arm/insts/static_inst.cc	Tue Oct 04 13:06:05 2016 -0400
+++ b/src/arch/arm/insts/static_inst.cc	Wed Oct 05 17:18:58 2016 +0200
@@ -301,6 +301,10 @@
         if (aarch64) {
             if (reg == INTREG_UREG0)
                 ccprintf(os, "ureg0");
+            else if (reg == INTREG_UREG1)
+                ccprintf(os, "ureg1");
+            else if (reg == INTREG_UREG2)
+                ccprintf(os, "ureg2");
             else if (reg == INTREG_SPX)
                ccprintf(os, "%s%s", (intWidth == 32) ? "w" : "", "sp");
             else if (reg == INTREG_X31)
diff -r b29aca3fcb75 -r 3021001736bc src/arch/arm/insts/vfp.cc
--- a/src/arch/arm/insts/vfp.cc	Tue Oct 04 13:06:05 2016 -0400
+++ b/src/arch/arm/insts/vfp.cc	Wed Oct 05 17:18:58 2016 +0200
@@ -51,9 +51,9 @@
 {
     std::stringstream ss;
     printMnemonic(ss, "", false);
-    printReg(ss, op1);
+    printReg(ss, op1 + FP_Reg_Base);
     ccprintf(ss, ", ");
-    printReg(ss, op2);
+    printReg(ss, op2 + FP_Reg_Base);
     ccprintf(ss, ", #%d", defCc);
     ccprintf(ss, ", ");
     printCondition(ss, condCode, true);
@@ -66,11 +66,11 @@
 {
     std::stringstream ss;
     printMnemonic(ss, "", false);
-    printReg(ss, dest);
+    printReg(ss, dest + FP_Reg_Base);
     ccprintf(ss, ", ");
-    printReg(ss, op1);
+    printReg(ss, op1 + FP_Reg_Base);
     ccprintf(ss, ", ");
-    printReg(ss, op2);
+    printReg(ss, op2 + FP_Reg_Base);
     ccprintf(ss, ", ");
     printCondition(ss, condCode, true);
     return ss.str();