sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge with head.

Browse source
This commit is contained in:
Gabe Black 2009-08-23 14:19:14 -07:00
parent d0d597004f 890be77362
commit e251b42c59
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/arch/x86/insts/microldstop.hh
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,

4
src/arch/x86/isa/microops/mediaop.isa
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);