From 3bd9a8968a2ccae1065526572e22cbdcd66b9cbd Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 2 Apr 2018 18:59:14 -0700 Subject: [PATCH] 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 Maintainer: Gabe Black --- src/arch/alpha/stacktrace.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- 2.30.2