summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-04-06 15:21:52 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-04-06 15:21:52 -0400
commit832311a17094501a6883100ac9dba8c781211782 (patch)
treebf959193c5a777d1ca49fee5be04dcf3b611391c
parentbb4c2fba259d80e64edace509dc16f9a2ff2d2a6 (diff)
downloadgem5-832311a17094501a6883100ac9dba8c781211782.tar.xz
Fixed for full system.
--HG-- extra : convert_revision : 28c9cd55d887c9de7156c8cf76b7b91117f749d5
-rw-r--r--arch/alpha/regfile.hh4
-rw-r--r--cpu/cpu_exec_context.hh2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/regfile.hh b/arch/alpha/regfile.hh
index 2a3312584..af01b7829 100644
--- a/arch/alpha/regfile.hh
+++ b/arch/alpha/regfile.hh
@@ -162,9 +162,9 @@ namespace AlphaISA
#if FULL_SYSTEM
int intrflag; // interrupt flag
inline int instAsid()
- { return miscRegs.getInstAsid(); }
+ { return miscRegFile.getInstAsid(); }
inline int dataAsid()
- { return miscRegs.getDataAsid(); }
+ { return miscRegFile.getDataAsid(); }
#endif // FULL_SYSTEM
void clear()
diff --git a/cpu/cpu_exec_context.hh b/cpu/cpu_exec_context.hh
index feaf29d12..c74feec68 100644
--- a/cpu/cpu_exec_context.hh
+++ b/cpu/cpu_exec_context.hh
@@ -497,7 +497,7 @@ class CPUExecContext
int readIntrFlag() { return regs.intrflag; }
void setIntrFlag(int val) { regs.intrflag = val; }
Fault hwrei();
- bool inPalMode() { return AlphaISA::PcPAL(regs.pc); }
+ bool inPalMode() { return AlphaISA::PcPAL(regs.readPC()); }
bool simPalCheck(int palFunc);
#endif