diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2010-06-02 12:58:16 -0500 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2010-06-02 12:58:16 -0500 |
| commit | b8ec21455382c3b5e0e9bc8c0dbcd38b07c567e3 (patch) | |
| tree | 273490f7ecbdbf3dc6f89d3ef46c46c7f07bc24c /src/arch/arm/isa/insts/macromem.isa | |
| parent | 3aea20d143ee27e0562f6f9ea3d4c1b4bbfd20f3 (diff) | |
| download | gem5-b8ec21455382c3b5e0e9bc8c0dbcd38b07c567e3.tar.xz | |
ARM: Implement ARM CPU interrupts
Diffstat (limited to 'src/arch/arm/isa/insts/macromem.isa')
| -rw-r--r-- | src/arch/arm/isa/insts/macromem.isa | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/arm/isa/insts/macromem.isa b/src/arch/arm/isa/insts/macromem.isa index 0870a966f..82e9d9842 100644 --- a/src/arch/arm/isa/insts/macromem.isa +++ b/src/arch/arm/isa/insts/macromem.isa @@ -69,8 +69,9 @@ let {{ microLdrRetUopCode = ''' CPSR cpsr = Cpsr; + SCTLR sctlr = Sctlr; uint32_t newCpsr = - cpsrWriteByInstr(cpsr | CondCodes, Spsr, 0xF, true); + cpsrWriteByInstr(cpsr | CondCodes, Spsr, 0xF, true, sctlr.nmfi); Cpsr = ~CondCodesMask & newCpsr; CondCodes = CondCodesMask & newCpsr; IWNPC = cSwap(Mem.uw, cpsr.e) | ((Spsr & 0x20) ? 1 : 0); |