summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
commita59d219989ec048c16b5bcb14272b1eb09a1cde7 (patch)
treed0075d148f2bb3fe179cf7bd4895b98472b767ab
parent4ddeceba96c5e066d79138709091a6dffec17372 (diff)
downloadgem5-a59d219989ec048c16b5bcb14272b1eb09a1cde7.tar.xz
ARM: Add a bit to the ExtMachInst to select thumb mode.
-rw-r--r--src/arch/arm/predecoder.hh1
-rw-r--r--src/arch/arm/types.hh16
2 files changed, 17 insertions, 0 deletions
diff --git a/src/arch/arm/predecoder.hh b/src/arch/arm/predecoder.hh
index bd4a7b03b..b21b77320 100644
--- a/src/arch/arm/predecoder.hh
+++ b/src/arch/arm/predecoder.hh
@@ -73,6 +73,7 @@ namespace ArmISA
void moreBytes(Addr pc, Addr fetchPC, MachInst inst)
{
emi = inst;
+ emi.thumb = (pc & (ULL(1) << PcTBitShift));
emi.sevenAndFour = bits(inst, 7) && bits(inst, 4);
emi.isMisc = (bits(inst, 24, 23) == 0x2 && bits(inst, 20) == 0);
}
diff --git a/src/arch/arm/types.hh b/src/arch/arm/types.hh
index e0b3951b9..456d65ce0 100644
--- a/src/arch/arm/types.hh
+++ b/src/arch/arm/types.hh
@@ -1,4 +1,16 @@
/*
+ * Copyright (c) 2010 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
* Copyright (c) 2007-2008 The Florida State University
* All rights reserved.
*
@@ -39,6 +51,10 @@ namespace ArmISA
typedef uint32_t MachInst;
BitUnion64(ExtMachInst)
+ // Bitfields to select mode.
+ Bitfield<36> thumb;
+ Bitfield<35> bigThumb;
+
// Made up bitfields that make life easier.
Bitfield<33> sevenAndFour;
Bitfield<32> isMisc;