From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Mar 2011 08:41:44 +0000 (-0800)
Subject: X86: Use the npc as the pc when doing a nativetrace, not what M5 considers the pc.
X-Git-Tag: stable_2012_02_02~499
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07b507d2785f9d7696f980d6556e362392f92fda;p=gem5.git

X86: Use the npc as the pc when doing a nativetrace, not what M5 considers the pc.
---

diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index 1999f6611..d1d75387d 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -85,7 +85,7 @@ X86NativeTrace::ThreadState::update(ThreadContext *tc)
     r13 = tc->readIntReg(X86ISA::INTREG_R13);
     r14 = tc->readIntReg(X86ISA::INTREG_R14);
     r15 = tc->readIntReg(X86ISA::INTREG_R15);
-    rip = tc->pcState().pc();
+    rip = tc->pcState().npc();
     //This should be expanded if x87 registers are considered
     for (int i = 0; i < 8; i++)
         mmx[i] = tc->readFloatRegBits(X86ISA::FLOATREG_MMX(i));