diff options
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/arm/isa/insts/data.isa | 2 | ||||
-rw-r--r-- | src/arch/arm/isa/insts/ldr.isa | 6 | ||||
-rw-r--r-- | src/arch/arm/isa/insts/macromem.isa | 2 | ||||
-rw-r--r-- | src/arch/arm/isa/insts/misc.isa | 4 | ||||
-rw-r--r-- | src/arch/arm/isa/operands.isa | 1 | ||||
-rw-r--r-- | src/arch/arm/predecoder.cc | 14 | ||||
-rw-r--r-- | src/arch/arm/predecoder.hh | 7 | ||||
-rw-r--r-- | src/arch/arm/types.hh | 39 |
8 files changed, 67 insertions, 8 deletions
diff --git a/src/arch/arm/isa/insts/data.isa b/src/arch/arm/isa/insts/data.isa index 26b6bfc92..ac5b12a95 100644 --- a/src/arch/arm/isa/insts/data.isa +++ b/src/arch/arm/isa/insts/data.isa @@ -241,6 +241,8 @@ let {{ CondCodes = CondCodesMask & newCpsr; NextThumb = ((CPSR)newCpsr).t; NextJazelle = ((CPSR)newCpsr).j; + ForcedItState = ((((CPSR)newCpsr).it2 << 2) & 0xFC) + | (((CPSR)newCpsr).it1 & 0x3); ''' buildImmDataInst(mnem + 's', code, flagType, suffix = "ImmPclr", buildCc = False, diff --git a/src/arch/arm/isa/insts/ldr.isa b/src/arch/arm/isa/insts/ldr.isa index 21601f7d3..c60a91a50 100644 --- a/src/arch/arm/isa/insts/ldr.isa +++ b/src/arch/arm/isa/insts/ldr.isa @@ -107,13 +107,15 @@ let {{ SCTLR sctlr = Sctlr; // Use the version of NPC that gets set before NextThumb pNPC = cSwap<uint32_t>(Mem.ud, cpsr.e); + uint32_t tempSpsr = cSwap<uint32_t>(Mem.ud >> 32, cpsr.e); uint32_t newCpsr = - cpsrWriteByInstr(cpsr | CondCodes, - cSwap<uint32_t>(Mem.ud >> 32, cpsr.e), + cpsrWriteByInstr(cpsr | CondCodes, tempSpsr, 0xF, true, sctlr.nmfi); Cpsr = ~CondCodesMask & newCpsr; NextThumb = ((CPSR)newCpsr).t; NextJazelle = ((CPSR)newCpsr).j; + ForcedItState = ((((CPSR)tempSpsr).it2 << 2) & 0xFC) + | (((CPSR)tempSpsr).it1 & 0x3); CondCodes = CondCodesMask & newCpsr; ''' self.codeBlobs["memacc_code"] = accCode diff --git a/src/arch/arm/isa/insts/macromem.isa b/src/arch/arm/isa/insts/macromem.isa index 6bf789efd..33d57a60b 100644 --- a/src/arch/arm/isa/insts/macromem.isa +++ b/src/arch/arm/isa/insts/macromem.isa @@ -94,6 +94,8 @@ let {{ Cpsr = ~CondCodesMask & newCpsr; CondCodes = CondCodesMask & newCpsr; IWNPC = cSwap(Mem.uw, cpsr.e) | ((Spsr & 0x20) ? 1 : 0); + ForcedItState = ((((CPSR)Spsr).it2 << 2) & 0xFC) + | (((CPSR)Spsr).it1 & 0x3); ''' microLdrRetUopIop = InstObjParams('ldr_ret_uop', 'MicroLdrRetUop', 'MicroMemOp', diff --git a/src/arch/arm/isa/insts/misc.isa b/src/arch/arm/isa/insts/misc.isa index 68320d3c5..dc7a71c0f 100644 --- a/src/arch/arm/isa/insts/misc.isa +++ b/src/arch/arm/isa/insts/misc.isa @@ -85,6 +85,8 @@ let {{ Cpsr = ~CondCodesMask & newCpsr; NextThumb = ((CPSR)newCpsr).t; NextJazelle = ((CPSR)newCpsr).j; + ForcedItState = ((((CPSR)Op1).it2 << 2) & 0xFC) + | (((CPSR)Op1).it1 & 0x3); CondCodes = CondCodesMask & newCpsr; ''' msrCpsrRegIop = InstObjParams("msr", "MsrCpsrReg", "MsrRegOp", @@ -111,6 +113,8 @@ let {{ Cpsr = ~CondCodesMask & newCpsr; NextThumb = ((CPSR)newCpsr).t; NextJazelle = ((CPSR)newCpsr).j; + ForcedItState = ((((CPSR)imm).it2 << 2) & 0xFC) + | (((CPSR)imm).it1 & 0x3); CondCodes = CondCodesMask & newCpsr; ''' msrCpsrImmIop = InstObjParams("msr", "MsrCpsrImm", "MsrImmOp", diff --git a/src/arch/arm/isa/operands.isa b/src/arch/arm/isa/operands.isa index 69d8de6da..f403f9372 100644 --- a/src/arch/arm/isa/operands.isa +++ b/src/arch/arm/isa/operands.isa @@ -245,6 +245,7 @@ def operands {{ 'Thumb': pcStateReg('thumb', srtPC), 'NextThumb': pcStateReg('nextThumb', srtMode), 'NextJazelle': pcStateReg('nextJazelle', srtMode), + 'ForcedItState': pcStateReg('forcedItState', srtMode), #Register operands depending on a field in the instruction encoding. These #should be avoided since they may not be portable across different diff --git a/src/arch/arm/predecoder.cc b/src/arch/arm/predecoder.cc index 71d399e35..e532359b5 100644 --- a/src/arch/arm/predecoder.cc +++ b/src/arch/arm/predecoder.cc @@ -162,9 +162,17 @@ Predecoder::moreBytes(const PCState &pc, Addr fetchPC, MachInst inst) FPSCR fpscr = tc->readMiscReg(MISCREG_FPSCR); emi.fpscrLen = fpscr.len; emi.fpscrStride = fpscr.stride; - CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); - itstate.top6 = cpsr.it2; - itstate.bottom2 = cpsr.it1; + + if (pc.forcedItStateIsValid()) { + // returns from exceptions/interrupts force the it state. + itstate = pc.forcedItState(); + DPRINTF(Predecoder, "Predecoder, itstate forced = %08x.\n", pc.forcedItState()); + } else if (predAddrValid && (pc.instAddr() != predAddr)) { + // Control flow changes necessitate a 0 itstate. + itstate.top6 = 0; + itstate.bottom2 = 0; + } + outOfBytes = false; process(); } diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh index 92aab6e30..a99e38ce7 100644 --- a/src/arch/arm/predecoder.hh +++ b/src/arch/arm/predecoder.hh @@ -67,6 +67,8 @@ namespace ArmISA bool outOfBytes; int offset; ITSTATE itstate; + Addr predAddr; + bool predAddrValid; public: void reset() @@ -76,6 +78,9 @@ namespace ArmISA emi = 0; emiReady = false; outOfBytes = true; + itstate = 0; + predAddr = 0; + predAddrValid = false; } Predecoder(ThreadContext * _tc) : @@ -138,6 +143,8 @@ namespace ArmISA assert(emiReady); ExtMachInst thisEmi = emi; pc.npc(pc.pc() + getInstSize()); + predAddrValid = true; + predAddr = pc.pc() + getInstSize(); emi = 0; emiReady = false; return thisEmi; diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh index e270813ef..5ffa988b0 100644 --- a/src/arch/arm/types.hh +++ b/src/arch/arm/types.hh @@ -202,9 +202,10 @@ namespace ArmISA }; uint8_t flags; uint8_t nextFlags; - + uint8_t forcedItStateValue; + bool forcedItStateValid; public: - PCState() : flags(0), nextFlags(0) + PCState() : flags(0), nextFlags(0), forcedItStateValue(0), forcedItStateValid(false) {} void @@ -214,7 +215,7 @@ namespace ArmISA npc(val + (thumb() ? 2 : 4)); } - PCState(Addr val) : flags(0), nextFlags(0) + PCState(Addr val) : flags(0), nextFlags(0), forcedItStateValue(0), forcedItStateValid(false) { set(val); } bool @@ -277,12 +278,40 @@ namespace ArmISA nextFlags &= ~JazelleBit; } + uint8_t + forcedItState() const + { + return forcedItStateValue; + } + + void + forcedItState(uint8_t value) + { + forcedItStateValue = value; + // Not valid unless the advance is called. + forcedItStateValid = false; + } + + bool + forcedItStateIsValid() const + { + return forcedItStateValid; + } + void advance() { Base::advance(); npc(pc() + (thumb() ? 2 : 4)); flags = nextFlags; + + // Validate the itState + if (forcedItStateValue != 0 && !forcedItStateValid) { + forcedItStateValid = true; + } else { + forcedItStateValid = false; + forcedItStateValue = 0; + } } void @@ -366,6 +395,8 @@ namespace ArmISA Base::serialize(os); SERIALIZE_SCALAR(flags); SERIALIZE_SCALAR(nextFlags); + SERIALIZE_SCALAR(forcedItStateValue); + SERIALIZE_SCALAR(forcedItStateValid); } void @@ -374,6 +405,8 @@ namespace ArmISA Base::unserialize(cp, section); UNSERIALIZE_SCALAR(flags); UNSERIALIZE_SCALAR(nextFlags); + UNSERIALIZE_SCALAR(forcedItStateValue); + UNSERIALIZE_SCALAR(forcedItStateValid); } }; |