X86: fix some simple compile issues

static should not be used for constants that are not inside a class definition.
This commit is contained in:
Nathan Binkert
2009-08-21 09:10:25 -07:00
parent f6bb7ec4eb
commit 890be77362
2 changed files with 4 additions and 4 deletions

View File

@@ -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,

View File

@@ -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);