Cleaned up backend a little

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

diff --git a/VEX/priv/host-ppc32/hdefs.c b/VEX/priv/host-ppc32/hdefs.c
index 427aebdab77fd39c06f86e6a952d19625379f717..e89389b9607ddc8fc60650a993d9437512b21450 100644 (file)
--- a/VEX/priv/host-ppc32/hdefs.c
+++ b/VEX/priv/host-ppc32/hdefs.c
@@ -700,6 +700,34 @@ PPC32Instr* PPC32Instr_RdWrLR ( Bool wrLR, HReg gpr )
    return i;
 }
 
+
+/* Pretty Print instructions */
+static void ppLoadImm ( HReg dst, UInt imm ) {
+   if (imm < 0x10000) {
+      vex_printf("li ");
+      ppHRegPPC32(dst);
+      vex_printf(",0x%x", imm);
+   } else {
+      vex_printf("lis ");
+      ppHRegPPC32(dst);
+      vex_printf(",0x%x ; ", imm >> 16);
+      vex_printf("ori ");
+      ppHRegPPC32(dst);
+      vex_printf(",");
+      ppHRegPPC32(dst);
+      vex_printf(",0x%x", imm & 0xFFFF);
+   }
+}
+
+static void ppMovReg ( HReg dst, HReg src ) {
+   if (hregNumber(dst) != hregNumber(src)) {
+      vex_printf("mr ");
+      ppHRegPPC32(dst);
+      vex_printf(",");
+      ppHRegPPC32(src);
+   }
+}
+
 void ppPPC32Instr ( PPC32Instr* i )
 {
    switch (i->tag) {
@@ -713,7 +741,7 @@ void ppPPC32Instr ( PPC32Instr* i )
          ppHRegPPC32(i->Pin.Alu32.src1);
          return;
       }
-      if (i->Pin.Alu32.op == Palu_ADD &&     // add Rd,R0,Rs == li Rd,Rs
+      if (i->Pin.Alu32.op == Palu_ADD &&     // add rD,r0,val == li rD,val
           i->Pin.Alu32.src1 == hregPPC32_GPR0() &&
           i->Pin.Alu32.src2->tag == Pri_Imm) {
          vex_printf("li ");
@@ -814,13 +842,8 @@ void ppPPC32Instr ( PPC32Instr* i )
          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,%%r12,0x%x ; ", i->Pin.Call.target & 0xFFFF);
-      }
-      vex_printf("mtctr r12 ; bctrl[%d] }",i->Pin.Call.regparms);
+      ppLoadImm(hregPPC32_GPR12(), i->Pin.Call.target);
+      vex_printf(" ; mtctr r12 ; bctrl[%d] }",i->Pin.Call.regparms);
       break;
    case Pin_Goto:
       vex_printf("goto: ");
@@ -829,26 +852,16 @@ void ppPPC32Instr ( PPC32Instr* i )
       }
       vex_printf("{ ");
       if (i->Pin.Goto.jk != Ijk_Boring) {
-         vex_printf("li %%r31, $");
+         vex_printf("li %%r31,$");
          ppIRJumpKind(i->Pin.Goto.jk);
          vex_printf(" ; ");
       }
       if (i->Pin.Goto.dst->tag == Pri_Imm) {
-         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 ; ", imm32 >> 16);
-            vex_printf("ori %%r3,%%r3,0x%x ; ", imm32 & 0xFFFF);
-         }
+         ppLoadImm(hregPPC32_GPR3(), i->Pin.Goto.dst->Pri.Imm.imm32);
       } else {
-         vex_printf("if (%%r3 != ");
-         ppHRegPPC32(i->Pin.Goto.dst->Pri.Reg.reg);
-         vex_printf(") { mr %%r3,");
-         ppHRegPPC32(i->Pin.Goto.dst->Pri.Reg.reg);
-         vex_printf(" } ; ");
+         ppMovReg(hregPPC32_GPR3(), i->Pin.Goto.dst->Pri.Reg.reg);
       }
-      vex_printf("blr }");
+      vex_printf(" ; blr }");
       return;
    case Pin_CMov32:
       vex_printf("cmov32 (%s) ", showPPC32CondCode(i->Pin.CMov32.cond));
@@ -861,31 +874,9 @@ void ppPPC32Instr ( PPC32Instr* i )
       }
       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);
-         }
+         ppLoadImm(i->Pin.CMov32.dst, i->Pin.CMov32.src->Pri.Imm.imm32);
       } 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(" }");
+         ppMovReg(i->Pin.CMov32.dst, i->Pin.CMov32.src->Pri.Reg.reg);
       }
       vex_printf(" }");
       return;
@@ -2021,7 +2012,7 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
       UInt rD  = iregNo(i->Pin.Alu32.dst);
       UInt rL = iregNo(i->Pin.Alu32.src1);
 
-      /* ADD/ADC/SBB/AND/OR/XOR */
+      /* ADD/AND/OR/XOR */
       if (i->Pin.Alu32.src2->tag == Pri_Reg) {
          op1 = 31;
          rR = iregNo(i->Pin.Alu32.src2->Pri.Reg.reg);
@@ -2030,23 +2021,14 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
          case Palu_AND: op2 =  28; break;
          case Palu_XOR: op2 = 316; break;
          case Palu_OR:  op2 = 444; break;
-//         case Palu_ADC:
-//         case Palu_SBB:
          default:
             goto bad;
          }
 
-         switch (i->Pin.Alu32.op) {
-         case Palu_ADD:
+         if (i->Pin.Alu32.op == Palu_ADD) {
             p = mkFormXO(p, op1, rD, rL, rR, 0, op2, 0);
-            break;
-         case Palu_AND: case Palu_XOR: case Palu_OR:
+         } else {
             p = mkFormX(p, op1, rL, rD, rR, op2, 0);
-            break;
-//         case Palu_ADC:
-//         case Palu_SBB:
-         default:
-            goto bad;
          }
       } else { // Pri_Imm:
          immR = i->Pin.Alu32.src2->Pri.Imm.imm32;
@@ -2055,23 +2037,14 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
          case Palu_AND: op1 = 28; break;
          case Palu_XOR: op1 = 26; break;
          case Palu_OR:  op1 = 24; break;
-//         case Palu_ADC:
-//         case Palu_SBB:
          default:
             goto bad;
          }
 
-         switch (i->Pin.Alu32.op) {
-         case Palu_ADD:
-            p = mkFormD(p, op1, rD, rL, immR); // rD = rA...
-            break;
-         case Palu_AND: case Palu_XOR: case Palu_OR:
-            p = mkFormD(p, op1, rL, rD, immR); // rA = rS...
-            break;
-//         case Palu_ADC:
-//         case Palu_SBB:
-         default:
-            goto bad;
+         if (i->Pin.Alu32.op == Palu_ADD) {
+            p = mkFormD(p, op1, rD, rL, immR);
+         } else {
+            p = mkFormD(p, op1, rL, rD, immR);
          }
       }
       goto done;
@@ -2105,27 +2078,26 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
       UInt op = i->Pin.Sh32.op;
       UInt rS = iregNo(i->Pin.Sh32.src);
       UInt rA = iregNo(i->Pin.Sh32.dst);
-      PPC32RITag ri_tag = i->Pin.Sh32.shft->tag;
-
-      if ((op == Psh_SHL || op == Psh_SHR) && ri_tag == Pri_Imm)
-         goto bad;  // No imm versions of these
-
-      switch (op) {
-      case Psh_SHL: opc2 = 24;  break;
-      case Psh_SHR: opc2 = 536; break;
-      case Psh_SAR: opc2 = (ri_tag == Pri_Reg) ? 792 : 824; break;
-      default: goto bad;
-      }
 
       switch (i->Pin.Sh32.shft->tag) {
       case Pri_Reg:
+         switch (op) {
+         case Psh_SHL: opc2 = 24;  break;
+         case Psh_SHR: opc2 = 536; break;
+         case Psh_SAR: opc2 = 792; break;
+         default: goto bad;
+         }
          rB = iregNo(i->Pin.Sh32.shft->Pri.Reg.reg);
          p = mkFormX(p, opc1, rS, rA, rB, opc2, 0);
          break;
-      case Pri_Imm:
+
+      case Pri_Imm:  // SAR only
+         if (op != Psh_SAR) goto bad;
+         opc2 = 824;
          sh = i->Pin.Sh32.shft->Pri.Imm.imm32;
          p = mkFormX(p, opc1, rS, rA, sh, opc2, 0);
          break;
+
       default:
          goto bad;
       }
@@ -2182,7 +2154,7 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
       UInt r_src2, imm;
 
       switch (i->Pin.MulL.word) {
-      case 0:       // multiply low word
+      case 0:  // Mult LOW word
          switch (i->Pin.MulL.src2->tag) {
          case Pri_Reg:
             // mullw r_dst,r_src1,r_src2
@@ -2200,7 +2172,8 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
             goto bad;
          }
          break;
-      case 1:       // multiply high word
+
+      case 1:  // Mult HIGH word
          vassert(i->Pin.MulL.src2->tag == Pri_Reg);
          r_src2 = iregNo(i->Pin.MulL.src2->Pri.Reg.reg);
          if (syned == True) {
@@ -2211,8 +2184,8 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
             p = mkFormXO(p, 31, r_dst, r_src1, r_src2, 0, 11, 0);
          }
          break;
-      default:
-         goto bad;
+
+      default: goto bad;
       }
       goto done;
    }
@@ -2269,11 +2242,9 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
       PPC32CondCode cond = i->Pin.Call.cond;
       UInt r_dst = 12;
       /* As per detailed comment for Pin_Call in
-         getRegUsage_PPC32Instr above, %r12 is used as an address
-         temporary. */
+         getRegUsage_PPC32Instr above, %r12 is used as an address temp */
 
-      /* jump over the following two insns if the condition does not
-         hold */
+      /* jump over the following two insns if condition does not hold */
       if (cond.test != Pct_ALWAYS) {
          /* don't know how many bytes to jump over yet...
             make space for a jump instruction and fill in later. */
@@ -2298,11 +2269,6 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
          /* bca !ct,cf,jump */
          mkFormB(ptmp, invertCondTest(cond.test), cond.flag, (delta>>2), 1, 0);
       }
-
-/* CAB: Hmm...
-   "When possible, independent instructions should separate the load
-   of the Count Register from the branch to prevent pipeline stalls." */
-
       goto done;
    }
 
@@ -2436,14 +2402,14 @@ Int emit_PPC32Instr ( UChar* buf, Int nbuf, PPC32Instr* i )
 
    case Pin_Set32: {
       /* Make the destination register be 1 or 0, depending on whether
-         the relevant condition holds. Yay! - mfcr doesn't change CR. */
+         the relevant condition holds. */
       UInt r_dst = iregNo(i->Pin.Set32.dst);
       PPC32CondCode cond = i->Pin.Set32.cond;
       UInt rot_imm;
       UInt r_tmp;
 
       if (cond.test == Pct_ALWAYS) {
-         // just load 1 to dst => li dst,1
+         // Just load 1 to dst => li dst,1
          p = mkFormD(p, 14, r_dst, 0, 1);
       } else {
          rot_imm = 1 + cond.flag;

diff --git a/VEX/priv/host-ppc32/hdefs.h b/VEX/priv/host-ppc32/hdefs.h
index 9fc57b8a4db1c4f3f6ffbe388fe92dfbe9adcc38..60c088fd3d74f0c7f46dedcb70c081c08a0bc19c 100644 (file)
--- a/VEX/priv/host-ppc32/hdefs.h
+++ b/VEX/priv/host-ppc32/hdefs.h
@@ -136,7 +136,7 @@ typedef
       Pcf_FX  = 4,   /* neg  | lt          */
       Pcf_FEX = 5,   /* pos  | gt          */
       Pcf_VX  = 6,   /* zero | equal       */
-      Pcf_OX  = 7,   /* summary overflow   */
+      Pcf_OX  = 7    /* summary overflow   */
    }
    PPC32CondFlag;
 
@@ -231,16 +231,6 @@ extern void ppPPC32RI ( PPC32RI* );
 
 /* --------- Instructions. --------- */
 
-//.. /* --------- */
-//.. typedef
-//..    enum {
-//..       Xss_16,
-//..       Xss_32
-//..    }
-//..    X86ScalarSz;
-//.. 
-//.. extern HChar* showX86ScalarSz ( X86ScalarSz );
-
 /* --------- */
 typedef
    enum {
@@ -258,7 +248,6 @@ typedef
    enum {
       Palu_INVALID,
       Palu_ADD,
-//      Palu_ADC, Palu_SBB,
       Palu_AND, Palu_OR, Palu_XOR
    }
    PPC32AluOp;
@@ -353,9 +342,9 @@ typedef
             PPC32RI*   src2;
          } Alu32;
          struct {
-            HReg       dst;    // for a PPC32 sub:
-            PPC32RI*   src1;   // - argL is an RI
-            HReg       src2;   // - argR is a reg
+            HReg       dst;    // PPC32 sub args are switched:
+            PPC32RI*   src1;   // argL => RI
+            HReg       src2;   // argR => R
          } Sub32;
          struct {
             PPC32ShiftOp op;
@@ -375,7 +364,6 @@ typedef
             HReg         dst;
             HReg         src;
          } Unary32;
-         /* DX:AX = AX *s/u r/m16,  or EDX:EAX = EAX *s/u r/m32 */
          struct {
             Bool     syned;
             Bool     word;   /* low=0, high=1 */
@@ -383,7 +371,7 @@ typedef
             HReg     src1;
             PPC32RI* src2;
          } MulL;
-         /* ppc32 div/idiv instruction. */
+         /* ppc32 div/divu instruction. */
          struct {
             Bool syned;
             HReg dst;
@@ -431,7 +419,7 @@ typedef
             HReg        dst;
             PPC32AMode* src;
          } Load;
-         /* 16/8 bit stores, which are troublesome (particularly 8-bit) */
+         /* 16/8 bit stores */
          struct {
             UChar       sz; /* 1|2|4 */
             PPC32AMode* dst;

diff --git a/VEX/priv/host-ppc32/isel.c b/VEX/priv/host-ppc32/isel.c
index 34cb7ec519fe4cb5a441ee8ced463a357e435ba8..760d9b28bc331f706b1b781bcce37af2620d043c 100644 (file)
--- a/VEX/priv/host-ppc32/isel.c
+++ b/VEX/priv/host-ppc32/isel.c
@@ -823,8 +823,6 @@ static HReg iselIntExpr_R_wrk ( ISelEnv* env, IRExpr* e )
    IRType ty = typeOfIRExpr(env->type_env,e);
    vassert(ty == Ity_I32 || Ity_I16 || Ity_I8);
 
-//   vex_printf("@iselIntExpr_R_wrk: tag=%d\n", e->tag);
-
    switch (e->tag) {
 
    /* --------- TEMP --------- */
@@ -1325,9 +1323,6 @@ static HReg iselIntExpr_R_wrk ( ISelEnv* env, IRExpr* e )
    /* --------- LITERAL --------- */
    /* 32/16/8-bit literals */
    case Iex_Const: {
-
-// CAB: Can do better - many instr's take literals...
-
       HReg dst    = newVRegI(env);
       addInstr(env, mk_iMOVds_RRI(env, dst, iselIntExpr_RI ( env, e )));
       return dst;
@@ -1338,13 +1333,14 @@ static HReg iselIntExpr_R_wrk ( ISelEnv* env, IRExpr* e )
       if ((ty == Ity_I32 || ty == Ity_I16 || ty == Ity_I8)
           && typeOfIRExpr(env->type_env,e->Iex.Mux0X.cond) == Ity_I8) {
          PPC32CondCode cc;
-         HReg r8;
+         HReg r_cond;
          HReg rX     = iselIntExpr_R(env, e->Iex.Mux0X.exprX);
          PPC32RI* r0 = iselIntExpr_RI(env, e->Iex.Mux0X.expr0);
          HReg dst    = newVRegI(env);
+
          addInstr(env, mk_iMOVds_RR(dst,rX));
-         r8 = iselIntExpr_R(env, e->Iex.Mux0X.cond);
-         addInstr(env, PPC32Instr_Cmp32(Pcmp_U, 7, r8, PPC32RI_Imm(0)));
+         r_cond = iselIntExpr_R(env, e->Iex.Mux0X.cond);
+         addInstr(env, PPC32Instr_Cmp32(Pcmp_U, 7, r_cond, PPC32RI_Imm(0)));
          cc = mk_PPCCondCode( Pct_TRUE, Pcf_EQ );
          addInstr(env, PPC32Instr_CMov32(cc,dst,r0));
          return dst;
@@ -1404,8 +1400,6 @@ static PPC32AMode* iselIntExpr_AMode_wrk ( ISelEnv* env, IRExpr* e )
    IRType ty = typeOfIRExpr(env->type_env,e);
    vassert(ty == Ity_I32);
    
-//   vex_printf("@iselIntExpr_AMode_wrk\n");
-
    /* Add32(expr,i), where i<0x10000 */
    if (e->tag == Iex_Binop 
        && e->Iex.Binop.op == Iop_Add32
@@ -1460,8 +1454,6 @@ static PPC32RI* iselIntExpr_RI_wrk ( ISelEnv* env, IRExpr* e )
    IRType ty = typeOfIRExpr(env->type_env,e);
    vassert(ty == Ity_I32 || ty == Ity_I16 || ty == Ity_I8);
 
-//   vex_printf("@iselIntExpr_RI_wrk\n");
-
    /* special case: immediate */
    if (e->tag == Iex_Const) {
       UInt u;
@@ -1505,8 +1497,6 @@ static PPC32CondCode iselCondCode_wrk ( ISelEnv* env, IRExpr* e )
    vassert(e);
    vassert(typeOfIRExpr(env->type_env,e) == Ity_I1);
 
-//   vex_printf("@iselCondCode_wrk\n");
-
    /* Constant 1:Bit */
    if (e->tag == Iex_Const && e->Iex.Const.con->Ico.U1 == True) {
       // Make a compare that will always be true:
@@ -1717,8 +1707,6 @@ static void iselInt64Expr_wrk ( HReg* rHi, HReg* rLo, ISelEnv* env, IRExpr* e )
    vassert(e);
    vassert(typeOfIRExpr(env->type_env,e) == Ity_I64);
 
-//   vex_printf("@iselInt64Expr_wrk: tag=%d\n", e->tag);
-
 //..    /* 64-bit literal */
 //..    if (e->tag == Iex_Const) {
 //..       ULong w64 = e->Iex.Const.con->Ico.U64;
@@ -3195,8 +3183,6 @@ static void iselStmt ( ISelEnv* env, IRStmt* stmt )
       vex_printf("\n");
    }
    
-//   vex_printf("@iselStmt: tag=%d\n", stmt->tag);
-
    switch (stmt->tag) {
 
    /* --------- STORE --------- */