From: Nathan Binkert <binkertn@umich.edu>
Date: Wed, 10 Nov 2004 23:44:37 +0000 (-0500)
Subject: Use the inPalMode function instead of the PC_PAL macro
X-Git-Tag: m5_1.0_tutorial~144
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=338513c6812501a4ea3a87d633e16b2ce83923eb;p=gem5.git

Use the inPalMode function instead of the PC_PAL macro

--HG--
extra : convert_revision : 58e0a19ba98777e5d2e2572ed02dee1914378ff7
---

diff --git a/arch/alpha/ev5.cc b/arch/alpha/ev5.cc
index aa52916b9..34b65a915 100644
--- a/arch/alpha/ev5.cc
+++ b/arch/alpha/ev5.cc
@@ -176,16 +176,16 @@ ExecContext::ev5_trap(Fault fault)
     AlphaISA::InternalProcReg *ipr = regs.ipr;
 
     // exception restart address
-    if (fault != Interrupt_Fault || !PC_PAL(regs.pc))
+    if (fault != Interrupt_Fault || !inPalMode())
         ipr[AlphaISA::IPR_EXC_ADDR] = regs.pc;
 
     if (fault == Pal_Fault || fault == Arithmetic_Fault /* ||
-        fault == Interrupt_Fault && !PC_PAL(regs.pc) */) {
+        fault == Interrupt_Fault && !inPalMode() */) {
         // traps...  skip faulting instruction
         ipr[AlphaISA::IPR_EXC_ADDR] += 4;
     }
 
-    if (!PC_PAL(regs.pc))
+    if (!inPalMode())
         AlphaISA::swap_palshadow(&regs, true);
 
     regs.pc = ipr[AlphaISA::IPR_PAL_BASE] + AlphaISA::fault_addr[fault];
@@ -225,7 +225,7 @@ ExecContext::hwrei()
 {
     uint64_t *ipr = regs.ipr;
 
-    if (!PC_PAL(regs.pc))
+    if (!inPalMode())
         return Unimplemented_Opcode_Fault;
 
     setNextPC(ipr[AlphaISA::IPR_EXC_ADDR]);