summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-08-21 09:10:25 -0700
committerNathan Binkert <nate@binkert.org>2009-08-21 09:10:25 -0700
commit890be773623adaa40af90933fcdb5abc717eb742 (patch)
tree3044b85922f39c1a40bd329e3ad5090385734b46
parentf6bb7ec4eb38cc61c32f4c6941e09deda23f979c (diff)
downloadgem5-890be773623adaa40af90933fcdb5abc717eb742.tar.xz
X86: fix some simple compile issues
static should not be used for constants that are not inside a class definition.
-rw-r--r--src/arch/x86/insts/microldstop.hh4
-rw-r--r--src/arch/x86/isa/microops/mediaop.isa4
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);