|
From: <sv...@va...> - 2014-05-04 10:54:16
|
Author: sewardj
Date: Sun May 4 10:54:08 2014
New Revision: 13934
Log:
Renaming only (no functional change): rename IR artefacts to do
with i-cache invalidation to be more consistent with new d-cache
flushing functionality, so as to track changes in Vex r2852:
Ijk_TInval -> Ijk_InvalICache
TISTART -> CMSTART (CM == "Cache Management")
TILEN -> CMLEN
VEX_TRC_JMP_TINVAL -> VEX_TRC_JMP_INVALICACHE
Modified:
trunk/coregrind/m_scheduler/scheduler.c
trunk/memcheck/mc_machine.c
Modified: trunk/coregrind/m_scheduler/scheduler.c
==============================================================================
--- trunk/coregrind/m_scheduler/scheduler.c (original)
+++ trunk/coregrind/m_scheduler/scheduler.c Sun May 4 10:54:08 2014
@@ -198,7 +198,8 @@
const HChar* name_of_sched_event ( UInt event )
{
switch (event) {
- case VEX_TRC_JMP_TINVAL: return "TINVAL";
+ case VEX_TRC_JMP_INVALICACHE: return "INVALICACHE";
+ case VEX_TRC_JMP_FLUSHDCACHE: return "FLUSHDCACHE";
case VEX_TRC_JMP_NOREDIR: return "NOREDIR";
case VEX_TRC_JMP_SIGILL: return "SIGILL";
case VEX_TRC_JMP_SIGTRAP: return "SIGTRAP";
@@ -1497,19 +1498,19 @@
break;
}
- case VEX_TRC_JMP_TINVAL:
+ case VEX_TRC_JMP_INVALICACHE:
VG_(discard_translations)(
- (Addr64)VG_(threads)[tid].arch.vex.guest_TISTART,
- VG_(threads)[tid].arch.vex.guest_TILEN,
- "scheduler(VEX_TRC_JMP_TINVAL)"
+ (Addr64)VG_(threads)[tid].arch.vex.guest_CMSTART,
+ VG_(threads)[tid].arch.vex.guest_CMLEN,
+ "scheduler(VEX_TRC_JMP_INVALICACHE)"
);
if (0)
VG_(printf)("dump translations done.\n");
break;
case VEX_TRC_JMP_FLUSHDCACHE: {
- void* start = (void*)VG_(threads)[tid].arch.vex.guest_TISTART;
- SizeT len = VG_(threads)[tid].arch.vex.guest_TILEN;
+ void* start = (void*)VG_(threads)[tid].arch.vex.guest_CMSTART;
+ SizeT len = VG_(threads)[tid].arch.vex.guest_CMLEN;
VG_(debugLog)(2, "sched", "flush_dcache(%p, %lu)\n", start, len);
VG_(flush_dcache)(start, len);
break;
Modified: trunk/memcheck/mc_machine.c
==============================================================================
--- trunk/memcheck/mc_machine.c (original)
+++ trunk/memcheck/mc_machine.c Sun May 4 10:54:08 2014
@@ -211,8 +211,8 @@
if (o == GOF(FPROUND) && sz == 1) return -1;
if (o == GOF(DFPROUND) && sz == 1) return -1;
if (o == GOF(EMNOTE) && sz == 4) return -1;
- if (o == GOF(TISTART) && sz == 8) return -1;
- if (o == GOF(TILEN) && sz == 8) return -1;
+ if (o == GOF(CMSTART) && sz == 8) return -1;
+ if (o == GOF(CMLEN) && sz == 8) return -1;
if (o == GOF(VSCR) && sz == 4) return -1;
if (o == GOF(VRSAVE) && sz == 4) return -1;
if (o == GOF(REDIR_SP) && sz == 8) return -1;
@@ -412,8 +412,8 @@
if (o == GOF(DFPROUND) && sz == 1) return -1;
if (o == GOF(VRSAVE) && sz == 4) return -1;
if (o == GOF(EMNOTE) && sz == 4) return -1;
- if (o == GOF(TISTART) && sz == 4) return -1;
- if (o == GOF(TILEN) && sz == 4) return -1;
+ if (o == GOF(CMSTART) && sz == 4) return -1;
+ if (o == GOF(CMLEN) && sz == 4) return -1;
if (o == GOF(VSCR) && sz == 4) return -1;
if (o == GOF(REDIR_SP) && sz == 4) return -1;
if (o == GOF(SPRG3_RO) && sz == 4) return -1;
@@ -601,8 +601,8 @@
if (o == GOF(ACFLAG) && sz == 8) return -1; /* slot unused */
if (o == GOF(FS_ZERO) && sz == 8) return -1; /* slot unused */
if (o == GOF(GS_0x60) && sz == 8) return -1; /* slot unused */
- if (o == GOF(TISTART) && sz == 8) return -1; /* slot unused */
- if (o == GOF(TILEN) && sz == 8) return -1; /* slot unused */
+ if (o == GOF(CMSTART) && sz == 8) return -1; /* slot unused */
+ if (o == GOF(CMLEN) && sz == 8) return -1; /* slot unused */
if (o == GOF(NRADDR) && sz == 8) return -1; /* slot unused */
/* Treat %AH, %BH, %CH, %DH as independent registers. To do this
@@ -714,8 +714,8 @@
if (o == GOF(IP_AT_SYSCALL) && sz == 4) return -1; /* slot unused */
if (o == GOF(IDFLAG) && sz == 4) return -1; /* slot used for %DH */
if (o == GOF(ACFLAG) && sz == 4) return -1; /* slot unused */
- if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
- if (o == GOF(TILEN) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(CMSTART) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(CMLEN) && sz == 4) return -1; /* slot unused */
if (o == GOF(NRADDR) && sz == 4) return -1; /* slot unused */
/* Treat %AH, %BH, %CH, %DH as independent registers. To do this
@@ -827,8 +827,8 @@
return o;
if (o == GOF(CC_DEP2) && sz == 8) return o;
if (o == GOF(CC_NDEP) && sz == 8) return -1;
- if (o == GOF(TISTART) && sz == 8) return -1;
- if (o == GOF(TILEN) && sz == 8) return -1;
+ if (o == GOF(CMSTART) && sz == 8) return -1;
+ if (o == GOF(CMLEN) && sz == 8) return -1;
if (o == GOF(NRADDR) && sz == 8) return -1;
if (o == GOF(IP_AT_SYSCALL) && sz == 8) return -1;
if (o == GOF(fpc) && sz == 4) return -1;
@@ -890,7 +890,7 @@
//if (o == GOF(SYSCALLNO) && sz == 4) return -1; /* slot unused */
//if (o == GOF(CC) && sz == 4) return -1; /* slot unused */
//if (o == GOF(EMNOTE) && sz == 4) return -1; /* slot unused */
- //if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
+ //if (o == GOF(CMSTART) && sz == 4) return -1; /* slot unused */
//if (o == GOF(NRADDR) && sz == 4) return -1; /* slot unused */
if (o == GOF(FPSCR) && sz == 4) return -1;
@@ -953,8 +953,8 @@
if (o >= GOF(D30) && o+sz <= GOF(D30)+2*SZB(D30)) return GOF(D30); // Q15
}
- if (o == GOF(TISTART) && sz == 4) return -1;
- if (o == GOF(TILEN) && sz == 4) return -1;
+ if (o == GOF(CMSTART) && sz == 4) return -1;
+ if (o == GOF(CMLEN) && sz == 4) return -1;
VG_(printf)("MC_(get_otrack_shadow_offset)(arm)(off=%d,sz=%d)\n",
offset,szB);
@@ -1055,8 +1055,8 @@
if (o == GOF(FPCR) && sz == 4) return -1; // untracked
if (o == GOF(FPSR) && sz == 4) return -1; // untracked
- if (o == GOF(TISTART) && sz == 8) return -1; // untracked
- if (o == GOF(TILEN) && sz == 8) return -1; // untracked
+ if (o == GOF(CMSTART) && sz == 8) return -1; // untracked
+ if (o == GOF(CMLEN) && sz == 8) return -1; // untracked
VG_(printf)("MC_(get_otrack_shadow_offset)(arm64)(off=%d,sz=%d)\n",
offset,szB);
@@ -1129,8 +1129,8 @@
if (o == GOF(ULR) && sz == 4) return -1;
if (o == GOF(EMNOTE) && sz == 4) return -1; /* slot unused */
- if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
- if (o == GOF(TILEN) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(CMSTART) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(CMLEN) && sz == 4) return -1; /* slot unused */
if (o == GOF(NRADDR) && sz == 4) return -1; /* slot unused */
if (o >= GOF(f0) && o+sz <= GOF(f0) +SZB(f0)) return GOF(f0);
@@ -1217,8 +1217,8 @@
if (o == GOF(ULR) && sz == 8) return o;
if (o == GOF(EMNOTE) && sz == 4) return -1; /* slot unused */
- if (o == GOF(TISTART) && sz == 4) return -1; /* slot unused */
- if (o == GOF(TILEN) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(CMSTART) && sz == 4) return -1; /* slot unused */
+ if (o == GOF(CMLEN) && sz == 4) return -1; /* slot unused */
if (o == GOF(NRADDR) && sz == 4) return -1; /* slot unused */
if (o >= GOF(f0) && o+sz <= GOF(f0) +SZB(f0)) return GOF(f0);
|