From 90d3d3535b206fa011ab86ffc278c8851fe997a6 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 27 Jul 2009 00:54:24 -0700 Subject: [PATCH] imported patch nativetracestreamline.patch --- src/arch/arm/nativetrace.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc index 7301653f4..469869e56 100644 --- a/src/arch/arm/nativetrace.cc +++ b/src/arch/arm/nativetrace.cc @@ -91,13 +91,17 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record) 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 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record) 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 @@ Trace::ArmNativeTrace::check(NativeTraceRecord *record) 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; } } } -- 2.30.2