Better assembly printouts, and added iselCondCode 1:Bit Const

git-svn-id: svn://svn.valgrind.org/vex/trunk@946

diff --git a/VEX/priv/host-ppc32/hdefs.c b/VEX/priv/host-ppc32/hdefs.c
index 4b307b36d4e90e74d37f6e018e9f0915235bd682..a0d86c71ab57298e1731601d1d93545413e83e74 100644 (file)
--- a/VEX/priv/host-ppc32/hdefs.c
+++ b/VEX/priv/host-ppc32/hdefs.c
@@ -721,7 +721,7 @@ void ppPPC32Instr ( PPC32Instr* i )
    case Pin_Cmp32:
       vex_printf("cmp%s %%crf%d,",
                  i->Pin.Cmp32.src2->tag == Pri_Imm ? "i" : "",
-                 i->Pin.Cmp32.crfD);
+                 (7 - i->Pin.Cmp32.crfD));
       ppHRegPPC32(i->Pin.Alu32.src1);
       vex_printf(",");
       ppPPC32RI(i->Pin.Alu32.src2);
@@ -770,32 +770,37 @@ void ppPPC32Instr ( PPC32Instr* i )
 //..          ppX86RMI(i->Xin.Push.src);
 //..          return;
    case Pin_Call:
-      vex_printf("call: la r12, 0x%x ; mtctr r12 ; bcctrl[%d] %s",
-                 i->Pin.Call.target,
-                 i->Pin.Call.regparms,
-                 showPPC32CondCode(i->Pin.Call.cond));
+      vex_printf("call: ");
+      if (i->Pin.Call.cond.test != Pct_ALWAYS) {
+         vex_printf("if (%%crf0.%s) ", showPPC32CondCode(i->Pin.Call.cond));
+      }
+      vex_printf("{ ");
+      if (i->Pin.Call.target < 0x10000) {
+         vex_printf("li %%r12, 0x%x ;", i->Pin.Call.target);
+      } else {
+         vex_printf("lis %%r12,0x%x ; ", i->Pin.Call.target >> 16);
+         vex_printf("ori %%r12,%%r3,0x%x ; ", i->Pin.Call.target & 0xFFFF);
+      }
+      vex_printf("mtctr r12 ; bctrl[%d] }",i->Pin.Call.regparms);
       break;
    case Pin_Goto:
       vex_printf("goto: ");
       if (i->Pin.Goto.cond.test != Pct_ALWAYS) {
-         vex_printf("if (%%crf0.%s) { ", 
-                    showPPC32CondCode(i->Pin.Goto.cond));
+         vex_printf("if (%%crf0.%s) ", showPPC32CondCode(i->Pin.Goto.cond));
       }
+      vex_printf("{ ");
       if (i->Pin.Goto.jk != Ijk_Boring) {
          vex_printf("li %%r31, $");
          ppIRJumpKind(i->Pin.Goto.jk);
          vex_printf(" ; ");
       }
       if (i->Pin.Goto.dst->tag == Pri_Imm) {
-         if (i->Pin.Goto.dst->Pri.Imm.imm32 < 0x10000) {
-            vex_printf("li %%r3, ");
-            ppPPC32RI(i->Pin.Goto.dst);
-            vex_printf(" ; ");
+         UInt imm32 = i->Pin.Goto.dst->Pri.Imm.imm32;
+         if (imm32 < 0x10000) {
+            vex_printf("li %%r3, 0x%x ; ", imm32);
          } else {
-            vex_printf("lis %%r3,0x%x ; ",
-                       i->Pin.Goto.dst->Pri.Imm.imm32 >> 16);
-            vex_printf("la %%r3,0x%x(%%r3) ; ",
-                       i->Pin.Goto.dst->Pri.Imm.imm32 & 0xFFFF);
+            vex_printf("lis %%r3,0x%x ; ", imm32 >> 16);
+            vex_printf("ori %%r3,%%r3,0x%x ; ", imm32 & 0xFFFF);
          }
       } else {
          vex_printf("if (%%r3 != ");
@@ -804,20 +809,46 @@ void ppPPC32Instr ( PPC32Instr* i )
          ppHRegPPC32(i->Pin.Goto.dst->Pri.Reg.reg);
          vex_printf(" } ; ");
       }
-      vex_printf("blr");
-      //      vex_printf("mtctr %%r_dst ; ");
-      //      vex_printf("bctr");
-      if (i->Pin.Goto.cond.test != Pct_ALWAYS) {
-         vex_printf(" }");
-      }
+      vex_printf("blr }");
       return;
    case Pin_CMov32:
-// bc false,cond,8
-// li ...
       vex_printf("cmov32 (%s) ", showPPC32CondCode(i->Pin.CMov32.cond));
       ppHRegPPC32(i->Pin.CMov32.dst);
       vex_printf(",");
       ppPPC32RI(i->Pin.CMov32.src);
+      vex_printf(": ");
+      if (i->Pin.CMov32.cond.test != Pct_ALWAYS) {
+         vex_printf("if (%%crf0.%s) ", showPPC32CondCode(i->Pin.CMov32.cond));
+      }
+      vex_printf("{ ");
+      if (i->Pin.CMov32.src->tag == Pri_Imm) {
+         UInt imm32 = i->Pin.CMov32.src->Pri.Imm.imm32;
+         if (imm32 < 0x10000) {
+            vex_printf("li ");
+            ppHRegPPC32(i->Pin.CMov32.dst);
+            vex_printf(" 0x%x", imm32);
+         } else {
+            vex_printf("lis ");
+            ppHRegPPC32(i->Pin.CMov32.dst);
+            vex_printf(",0x%x ; ", imm32 >> 16);
+            vex_printf("ori ");
+            ppHRegPPC32(i->Pin.CMov32.dst);
+            vex_printf(",");
+            ppHRegPPC32(i->Pin.CMov32.dst);
+            vex_printf(",0x%x", imm32 & 0xFFFF);
+         }
+      } else {
+         vex_printf("if (");
+         ppHRegPPC32(i->Pin.CMov32.dst);
+         vex_printf(" != ");
+         ppHRegPPC32(i->Pin.CMov32.src->Pri.Reg.reg);
+         vex_printf(") { mr ");
+         ppHRegPPC32(i->Pin.CMov32.dst);
+         vex_printf(",");
+         ppHRegPPC32(i->Pin.CMov32.src->Pri.Reg.reg);
+         vex_printf(" }");
+      }
+      vex_printf(" }");
       return;
    case Pin_Load: {
       UChar sz = i->Pin.Load.sz;
@@ -2150,7 +2181,7 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
       /* mtspr 9,r_dst => move r_dst to count register */
       p = mkFormXFX(p, r_dst, 9, 467);
       
-      /* bcctrl 20,0 => branch w. link to count register */
+      /* bctrl => branch to count register (and save to lr) */
       p = mkFormXL(p, 19, Pct_ALWAYS, 0, 0, 528, 1);
 
       /* Fix up the conditional jump, if there was one. */

diff --git a/VEX/priv/host-ppc32/isel.c b/VEX/priv/host-ppc32/isel.c
index a049bbb6fe72f8cf1942a663d52e2df15abcc9f8..cd2b0b8dc015f39115a6294076aedb1dede01c25 100644 (file)
--- a/VEX/priv/host-ppc32/isel.c
+++ b/VEX/priv/host-ppc32/isel.c
@@ -1469,15 +1469,15 @@ static PPC32CondCode iselCondCode_wrk ( ISelEnv* env, IRExpr* e )
 
 //   vex_printf("@iselCondCode_wrk\n");
 
-//..    /* Constant 1:Bit */
-//..    if (e->tag == Iex_Const && e->Iex.Const.con->Ico.U1 == True) {
-//..       HReg r;
-//..       vassert(e->Iex.Const.con->tag == Ico_U1);
-//..       r = newVRegI(env);
-//..       addInstr(env, X86Instr_Alu32R(Xalu_MOV,X86RMI_Imm(0),r));
-//..       addInstr(env, X86Instr_Alu32R(Xalu_XOR,X86RMI_Reg(r),r));
-//..       return Xcc_Z;
-//..    }
+   /* Constant 1:Bit */
+   if (e->tag == Iex_Const && e->Iex.Const.con->Ico.U1 == True) {
+      // Make a compare that will always be true:
+      PPC32RI* ri_one = PPC32RI_Imm(1);
+      HReg r_one = newVRegI(env);
+      addInstr(env, mk_iMOVds_RRI(env, r_one, ri_one));
+      addInstr(env, PPC32Instr_Cmp32(Pcmp_U, 7, r_one, ri_one));
+      return mk_PPCCondCode( Pct_TRUE, Pcf_EQ );
+   }
 
    /* Not1(...) */
    if (e->tag == Iex_Unop && e->Iex.Unop.op == Iop_Not1) {