commit 05f5e0172384dd2983fb16fbb7deebd74d71cd35
author sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sun May 04 10:52:11 2014 +0000
committer sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sun May 04 10:52:11 2014 +0000
tree 903e2476c9fc68f398672472c5b80e9123c7716d
parent 65902992da28822e4753594c7b72f7cb177fe3a6

Renaming only (no functional change): rename IR artefacts to do 
with i-cache invalidation to be more consistent with new d-cache
invalidation functionality:
  Ijk_TInval          -> Ijk_InvalICache
  TISTART             -> CMSTART (CM == "Cache Management")
  TILEN               -> CMLEN
  VEX_TRC_JMP_TINVAL  -> VEX_TRC_JMP_INVALICACHE



git-svn-id: svn://svn.valgrind.org/vex/trunk@2852 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_s390_toIR.c

diff --git a/priv/guest_s390_toIR.c b/priv/guest_s390_toIR.c
index eb750a8..b6fc165 100644
--- a/priv/guest_s390_toIR.c
+++ b/priv/guest_s390_toIR.c
@@ -417,7 +417,8 @@
 {
    vassert(typeOfIRExpr(irsb->tyenv, condition) == Ity_I1);
 
-   stmt(IRStmt_Exit(condition, Ijk_TInval, IRConst_U64(guest_IA_curr_instr),
+   stmt(IRStmt_Exit(condition, Ijk_InvalICache,
+                    IRConst_U64(guest_IA_curr_instr),
                     S390X_GUEST_OFFSET(guest_IA)));
 }
 
@@ -10862,9 +10863,9 @@
    stmt(IRStmt_Dirty(d));
 
    /* and restart */
-   stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TISTART),
+   stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMSTART),
                    mkU64(guest_IA_curr_instr)));
-   stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TILEN), mkU64(4)));
+   stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMLEN), mkU64(4)));
    restart_if(mkexpr(cond));
 
    ss.bytes = last_execute_target;
@@ -10893,15 +10894,15 @@
                              mkIRExprVec_1(load(Ity_I64, mkexpr(addr2))));
       stmt(IRStmt_Dirty(d));
       /* and restart */
-      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TISTART),
+      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMSTART),
                       mkU64(guest_IA_curr_instr)));
-      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TILEN), mkU64(4)));
+      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMLEN), mkU64(4)));
       restart_if(IRExpr_Const(IRConst_U1(True)));
 
       /* we know that this will be invalidated */
       put_IA(mkaddr_expr(guest_IA_next_instr));
       dis_res->whatNext = Dis_StopHere;
-      dis_res->jk_StopHere = Ijk_TInval;
+      dis_res->jk_StopHere = Ijk_InvalICache;
       break;
    }
 
@@ -10967,8 +10968,8 @@
       stmt(IRStmt_Dirty(d));
 
       /* and restart */
-      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TISTART), mkU64(guest_IA_curr_instr)));
-      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TILEN), mkU64(4)));
+      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMSTART), mkU64(guest_IA_curr_instr)));
+      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMLEN), mkU64(4)));
       restart_if(mkexpr(cond));
 
       /* Now comes the actual translation */
@@ -16362,16 +16363,16 @@
          injecting here can change. In which case the translation has to
          be redone. For ease of handling, we simply invalidate all the
          time. */
-      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TISTART),
+      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMSTART),
                       mkU64(guest_IA_curr_instr)));
-      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_TILEN),
+      stmt(IRStmt_Put(S390X_GUEST_OFFSET(guest_CMLEN),
                       mkU64(guest_IA_next_instr - guest_IA_curr_instr)));
       vassert(guest_IA_next_instr - guest_IA_curr_instr ==
               S390_SPECIAL_OP_PREAMBLE_SIZE + S390_SPECIAL_OP_SIZE);
 
       put_IA(mkaddr_expr(guest_IA_next_instr));
       dis_res->whatNext    = Dis_StopHere;
-      dis_res->jk_StopHere = Ijk_TInval;
+      dis_res->jk_StopHere = Ijk_InvalICache;
    } else {
       /* We don't know what it is. */
       return S390_DECODE_UNKNOWN_SPECIAL_INSN;