Fixed for full system.

--HG--
extra : convert_revision : 28c9cd55d887c9de7156c8cf76b7b91117f749d5

diff --git a/arch/alpha/regfile.hh b/arch/alpha/regfile.hh
index 2a331258487ccb9b88dc1edacd354c5bde29aa1e..af01b7829d5b5bb34345ddb0e75e7e1fb5cf7c6b 100644 (file)
--- 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 feaf29d125ab15a072c7b0102028e95648c7210f..c74feec68aea58853010b38cc51f6c2265788ebd 100644 (file)
--- 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