From: Gabe Black <gabeblack@google.com>
Date: Tue, 3 Apr 2018 01:59:14 +0000 (-0700)
Subject: arch: alpha: Fix an 8 year old bug from the transition to pc objects.
X-Git-Tag: v19.0.0.0~2175
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3bd9a8968a2ccae1065526572e22cbdcd66b9cbd;p=gem5.git

arch: alpha: Fix an 8 year old bug from the transition to pc objects.

When we transitioned from having PCs and nextPCs stored as individual items
in the ThreadContext and went to having PC objects with abstracted
components (micro PCs, delay slots, variable instruction lengths, etc.), a
small mistake was made when translating the alpha StackTrace code.

Change-Id: Ib5dd65c53a26920e66899f421902607efd139e71
Reviewed-on: https://gem5-review.googlesource.com/9702
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/arch/alpha/stacktrace.cc b/src/arch/alpha/stacktrace.cc
index 1dc5956c7..3c302d27d 100644
--- a/src/arch/alpha/stacktrace.cc
+++ b/src/arch/alpha/stacktrace.cc
@@ -143,7 +143,7 @@ StackTrace::trace(ThreadContext *_tc, bool is_call)
     bool usermode =
         (tc->readMiscRegNoEffect(IPR_DTB_CM) & 0x18) != 0;
 
-    Addr pc = tc->pcState().pc();
+    Addr pc = tc->pcState().npc();
     bool kernel = sys->kernelStart <= pc && pc <= sys->kernelEnd;
 
     if (usermode) {