X86: fix some simple compile issues

static should not be used for constants that are not inside a class definition.

diff --git a/src/arch/x86/insts/microldstop.hh b/src/arch/x86/insts/microldstop.hh
index 309a2e6b75811260a50f935a222ef2e8add56e04..048535a2758ac279091be4711c068ae50c16160e 100644 (file)
--- 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 7ebe2ec10cfe44b0bf31a8faf19bc35c52ef937c..9c53fa0fbd464a77a39394d8427fd6288bd7ba5e 100644 (file)
--- 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);