changeset 362e27c08d96 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=362e27c08d96
description:
imported patch nativetracestreamline.patch
diffstat:
1 file changed, 9 insertions(+), 9 deletions(-)
src/arch/arm/nativetrace.cc | 18 +++++++++---------
diffs (51 lines):
diff -r 6eaa041d043e -r 362e27c08d96 src/arch/arm/nativetrace.cc
--- a/src/arch/arm/nativetrace.cc Mon Jul 27 00:54:09 2009 -0700
+++ b/src/arch/arm/nativetrace.cc Mon Jul 27 00:54:24 2009 -0700
@@ -91,13 +91,17 @@
for (int i = 0; i < STATE_NUMVALS; i++) {
if (nState.changed[i] || mState.changed[i]) {
const char *vergence = " ";
- if (mState.oldState[i] == nState.oldState[i] &&
- mState.newState[i] != nState.newState[i]) {
+ bool oldMatch = (mState.oldState[i] == nState.oldState[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 = "<>";
- } else if (mState.oldState[i] != nState.oldState[i] &&
- mState.newState[i] == nState.newState[i]) {
+ } else if (!oldMatch && newMatch) {
vergence = "><";
}
+ errorFound = true;
if (!nState.changed[i]) {
DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x "\
@@ -105,7 +109,6 @@
vergence, regNames[i],
nState.newState[i],
mState.oldState[i], mState.newState[i]);
- errorFound = true;
} else if (!mState.changed[i]) {
DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x => %#010x "\
@@ -113,16 +116,13 @@
vergence, regNames[i],
nState.oldState[i], nState.newState[i],
mState.newState[i]);
- errorFound = true;
- } else if (mState.oldState[i] != nState.oldState[i] ||
- mState.newState[i] != nState.newState[i]) {
+ } else {
DPRINTF(ExecRegDelta, "%s [%5s] "\
"Native: %#010x => %#010x "\
"M5: %#010x => %#010x\n",
vergence, regNames[i],
nState.oldState[i], nState.newState[i],
mState.oldState[i], mState.newState[i]);
- errorFound = true;
}
}
}
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
