diff options
| author | Ali Saidi <Ali.Saidi@ARM.com> | 2010-10-01 16:02:45 -0500 |
|---|---|---|
| committer | Ali Saidi <Ali.Saidi@ARM.com> | 2010-10-01 16:02:45 -0500 |
| commit | b331b02669f95adf4744b1e7db50ad4b231fb704 (patch) | |
| tree | 682fc56d99d2efd7fd45651ad6d1ee35560d19f1 /src/arch/arm/faults.cc | |
| parent | aef4a9904e0324b2aba2ddc212768d5b0c72b566 (diff) | |
| download | gem5-b331b02669f95adf4744b1e7db50ad4b231fb704.tar.xz | |
ARM: Clean up use of TBit and JBit.
Rather tha constantly using ULL(1) << PcXBitShift define those directly.
Additionally, add some helper functions to further clean up the code.
Diffstat (limited to 'src/arch/arm/faults.cc')
| -rw-r--r-- | src/arch/arm/faults.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc index a5ecdad25..6e138119c 100644 --- a/src/arch/arm/faults.cc +++ b/src/arch/arm/faults.cc @@ -140,7 +140,7 @@ ArmFault::invoke(ThreadContext *tc, StaticInstPtr inst) } Addr pc M5_VAR_USED = tc->readPC(); - Addr newPc = getVector(tc) | (sctlr.te ? (ULL(1) << PcTBitShift) : 0); + Addr newPc = getVector(tc) | (sctlr.te ? PcTBit : 0); DPRINTF(Faults, "Invoking Fault:%s cpsr:%#x PC:%#x lr:%#x newVec: %#x\n", name(), cpsr, pc, tc->readIntReg(INTREG_LR), newPc); tc->setPC(newPc); |