From 832311a17094501a6883100ac9dba8c781211782 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 6 Apr 2006 15:21:52 -0400 Subject: [PATCH] Fixed for full system. --HG-- extra : convert_revision : 28c9cd55d887c9de7156c8cf76b7b91117f749d5 --- arch/alpha/regfile.hh | 4 ++-- cpu/cpu_exec_context.hh | 2 +- 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