From b331b02669f95adf4744b1e7db50ad4b231fb704 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Fri, 1 Oct 2010 16:02:45 -0500 Subject: 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. --- src/arch/arm/predecoder.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/arch/arm/predecoder.cc') diff --git a/src/arch/arm/predecoder.cc b/src/arch/arm/predecoder.cc index 20c7058b0..04cec59b9 100644 --- a/src/arch/arm/predecoder.cc +++ b/src/arch/arm/predecoder.cc @@ -43,6 +43,7 @@ #include "arch/arm/isa_traits.hh" #include "arch/arm/predecoder.hh" +#include "arch/arm/utility.hh" #include "base/trace.hh" #include "cpu/thread_context.hh" @@ -151,7 +152,7 @@ Predecoder::moreBytes(Addr pc, Addr fetchPC, MachInst inst) { data = inst; offset = (fetchPC >= pc) ? 0 : pc - fetchPC; - emi.thumb = (pc & (ULL(1) << PcTBitShift)) ? 1 : 0; + emi.thumb = isThumb(pc); FPSCR fpscr = tc->readMiscReg(MISCREG_FPSCR); emi.fpscrLen = fpscr.len; emi.fpscrStride = fpscr.stride; -- cgit v1.2.3