summaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorKorey Sewell <ksewell@umich.edu>2006-03-09 03:27:51 -0500
committerKorey Sewell <ksewell@umich.edu>2006-03-09 03:27:51 -0500
commita3aae21d031c93ab1b9a90d435d9590dad2482c4 (patch)
treec3a5ac3042cd619a3d284c653bfb795dcb35069e /arch/alpha
parent9e304ed3e6d96e2090981a8aa825dab5b662909a (diff)
downloadgem5-a3aae21d031c93ab1b9a90d435d9590dad2482c4.tar.xz
last changes before big merge
arch/alpha/isa_traits.hh: arch/sparc/isa_traits.hh: add nnpc for compiling purposes in exec_context setNextNPC function cpu/exec_context.hh: set NNPC function cpu/simple/cpu.cc: use NNPC in determining what PC we are using --HG-- extra : convert_revision : e810cfbc5dc31879b20d2cc40bf9871613203532
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/isa_traits.hh2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 9db16a1bf..940e3f300 100644
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -200,6 +200,8 @@ extern const int reg_redir[NumIntRegs];
MiscRegFile miscRegs; // control register file
Addr pc; // program counter
Addr npc; // next-cycle program counter
+ Addr nnpc;
+
#if FULL_SYSTEM
int intrflag; // interrupt flag
inline int instAsid()