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 1999f6611e6843784c1c90615beefb3dec2df40c..d1d75387d396bef0cf83b872780b4ec5af4efb2a 100644 (file)
--- 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));