From: Lena Olson <lena@cs.wisc.edu>
Date: Fri, 3 Apr 2015 16:42:10 +0000 (-0500)
Subject: x86: fix debug trace output for mwait
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=333988a73e06cb4067f113b7043ab68dd0e86c9d;p=gem5.git

x86: fix debug trace output for mwait

When running with the Exec flag, the mwait instruction attempted
to print out its source registers, which were never actually
initialized. This led to sporadic assertion failures when the
value stored there was invalid.

Committed by: Nilay Vaish <nilay@cs.wisc.edu>
---

diff --git a/src/arch/x86/isa/formats/monitor_mwait.isa b/src/arch/x86/isa/formats/monitor_mwait.isa
index 493b7c58a..b26c1f267 100644
--- a/src/arch/x86/isa/formats/monitor_mwait.isa
+++ b/src/arch/x86/isa/formats/monitor_mwait.isa
@@ -112,9 +112,9 @@ output decoder {{
     {
         std::stringstream response;
 
+        // Although mwait could take hints from eax and ecx, the _srcRegIdx
+        // is not set, and thus should not be printed here
         printMnemonic(response, mnemonic);
-        ccprintf(response, " ");
-        printReg(response, _srcRegIdx[0], machInst.opSize);
         return response.str();
     }
 }};