sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

imported patch nativetracestreamline.patch

Browse source
This commit is contained in:
Gabe Black 2009-07-27 00:54:24 -07:00
parent 8ec235c7b1
commit 90d3d3535b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/arch/arm/nativetrace.cc
View file

@ -91,13 +91,17 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record)
for (int i = 0; i < STATE_NUMVALS; i++) { for (int i = 0; i < STATE_NUMVALS; i++) {
if (nState.changed[i] || mState.changed[i]) { if (nState.changed[i] || mState.changed[i]) {
const char *vergence = " "; const char *vergence = " ";
if (mState.oldState[i] == nState.oldState[i] && bool oldMatch = (mState.oldState[i] == nState.oldState[i]);
mState.newState[i] != nState.newState[i]) { bool newMatch = (mState.newState[i] == nState.newState[i]);
if (oldMatch && newMatch) {
// The more things change, the more they stay the same.
continue;
} else if (oldMatch && !newMatch) {
vergence = "<>"; vergence = "<>";
} else if (mState.oldState[i] != nState.oldState[i] && } else if (!oldMatch && newMatch) {
mState.newState[i] == nState.newState[i]) {
vergence = "><"; vergence = "><";
} }
errorFound = true;
if (!nState.changed[i]) { if (!nState.changed[i]) {
DPRINTF(ExecRegDelta, "%s [%5s] "\ DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x "\ "Native: %#010x "\
@ -105,7 +109,6 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record)
vergence, regNames[i], vergence, regNames[i],
nState.newState[i], nState.newState[i],
mState.oldState[i], mState.newState[i]); mState.oldState[i], mState.newState[i]);
errorFound = true;
} else if (!mState.changed[i]) { } else if (!mState.changed[i]) {
DPRINTF(ExecRegDelta, "%s [%5s] "\ DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x => %#010x "\ "Native: %#010x => %#010x "\
@ -113,16 +116,13 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record)
vergence, regNames[i], vergence, regNames[i],
nState.oldState[i], nState.newState[i], nState.oldState[i], nState.newState[i],
mState.newState[i]); mState.newState[i]);
errorFound = true; } else {
} else if (mState.oldState[i] != nState.oldState[i] ||
mState.newState[i] != nState.newState[i]) {
DPRINTF(ExecRegDelta, "%s [%5s] "\ DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x => %#010x "\ "Native: %#010x => %#010x "\
"M5: %#010x => %#010x\n", "M5: %#010x => %#010x\n",
vergence, regNames[i], vergence, regNames[i],
nState.oldState[i], nState.newState[i], nState.oldState[i], nState.newState[i],
mState.oldState[i], mState.newState[i]); mState.oldState[i], mState.newState[i]);
errorFound = true;
} }
} }
} }