diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-08-23 14:19:14 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-08-23 14:19:14 -0700 |
| commit | e251b42c59ba112357eb8f1d841fc162b284d83e (patch) | |
| tree | 30d2ae800106235282e8336188046a8f30e235c2 | |
| parent | d0d597004f01ca475c16d5385353e58d3f1f689a (diff) | |
| parent | 890be773623adaa40af90933fcdb5abc717eb742 (diff) | |
| download | gem5-e251b42c59ba112357eb8f1d841fc162b284d83e.tar.xz | |
Merge with head.
| -rw-r--r-- | src/arch/x86/insts/microldstop.hh | 4 | ||||
| -rw-r--r-- | src/arch/x86/isa/microops/mediaop.isa | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/x86/insts/microldstop.hh b/src/arch/x86/insts/microldstop.hh index 309a2e6b7..048535a27 100644 --- a/src/arch/x86/insts/microldstop.hh +++ b/src/arch/x86/insts/microldstop.hh @@ -64,8 +64,8 @@ namespace X86ISA { - static const Request::FlagsType SegmentFlagMask = mask(4); - static const int FlagShift = 4; + const Request::FlagsType SegmentFlagMask = mask(4); + const int FlagShift = 4; enum FlagBit { CPL0FlagBit = 1, AddrSizeFlagBit = 2, diff --git a/src/arch/x86/isa/microops/mediaop.isa b/src/arch/x86/isa/microops/mediaop.isa index 7ebe2ec10..9c53fa0fb 100644 --- a/src/arch/x86/isa/microops/mediaop.isa +++ b/src/arch/x86/isa/microops/mediaop.isa @@ -1406,8 +1406,8 @@ let {{ (0 - (arg2Bits & (1 << (sizeBits - 1)))); uint64_t resBits = 0; - if ((ext & 0x2) == 0 && arg1 == arg2 || - (ext & 0x2) == 0x2 && arg1 > arg2) + if (((ext & 0x2) == 0 && arg1 == arg2) || + ((ext & 0x2) == 0x2 && arg1 > arg2)) resBits = mask(sizeBits); result = insertBits(result, hiIndex, loIndex, resBits); |