summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2011-09-05 18:36:26 -0700
committerGabe Black <gblack@eecs.umich.edu>2011-09-05 18:36:26 -0700
commit87d687e242e3437e7e3a83e04bf9a403d95b3e9e (patch)
tree962a9678367487d02efdbecf67fda2a7886039bb /src/arch/x86
parent3bd0b9654c9757127ca4e535ed75d8c4f5671c4b (diff)
downloadgem5-87d687e242e3437e7e3a83e04bf9a403d95b3e9e.tar.xz
X86: Make sure instruction flags are set properly even on 32 bit machines.
The way flag bits were being set for microops in x86 ended up implicitly calling the bitset constructor which was truncating flags beyond the width of an unsigned long. This change sets the bits in chunks which are always small enough to avoid being truncated. On 64 bit machines this should reduce to be the same as before, and on 32 bit machines it should work properly and not be unreasonably inefficient.
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/insts/microop.hh10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/arch/x86/insts/microop.hh b/src/arch/x86/insts/microop.hh
index 6fc215452..e5248c9ce 100644
--- a/src/arch/x86/insts/microop.hh
+++ b/src/arch/x86/insts/microop.hh
@@ -100,7 +100,15 @@ namespace X86ISA
X86ISA::X86StaticInst(mnem, _machInst, __opClass),
instMnem(_instMnem)
{
- flags |= setFlags;
+ const int ChunkSize = sizeof(unsigned long);
+ const int Chunks = sizeof(setFlags) / ChunkSize;
+
+ // Since the bitset constructor can only handle unsigned long
+ // sized chunks, feed it those one at a time while oring them in.
+ for (int i = 0; i < Chunks; i++) {
+ unsigned shift = i * ChunkSize * 8;
+ flags |= (std::bitset<NumFlags>(setFlags >> shift) << shift);
+ }
}
std::string generateDisassembly(Addr pc,