sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use the inPalMode function instead of the PC_PAL macro

Browse source 
--HG--
extra : convert_revision : 58e0a19ba98777e5d2e2572ed02dee1914378ff7
This commit is contained in:
Nathan Binkert 2004-11-10 18:44:37 -05:00
parent ab8409738e
commit 338513c681
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/alpha/ev5.cc
View file

@ -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]);