Merge with head.
This commit is contained in:
commit
e251b42c59
2 changed files with 4 additions and 4 deletions
|
@ -64,8 +64,8 @@
|
||||||
|
|
||||||
namespace X86ISA
|
namespace X86ISA
|
||||||
{
|
{
|
||||||
static const Request::FlagsType SegmentFlagMask = mask(4);
|
const Request::FlagsType SegmentFlagMask = mask(4);
|
||||||
static const int FlagShift = 4;
|
const int FlagShift = 4;
|
||||||
enum FlagBit {
|
enum FlagBit {
|
||||||
CPL0FlagBit = 1,
|
CPL0FlagBit = 1,
|
||||||
AddrSizeFlagBit = 2,
|
AddrSizeFlagBit = 2,
|
||||||
|
|
|
@ -1406,8 +1406,8 @@ let {{
|
||||||
(0 - (arg2Bits & (1 << (sizeBits - 1))));
|
(0 - (arg2Bits & (1 << (sizeBits - 1))));
|
||||||
|
|
||||||
uint64_t resBits = 0;
|
uint64_t resBits = 0;
|
||||||
if ((ext & 0x2) == 0 && arg1 == arg2 ||
|
if (((ext & 0x2) == 0 && arg1 == arg2) ||
|
||||||
(ext & 0x2) == 0x2 && arg1 > arg2)
|
((ext & 0x2) == 0x2 && arg1 > arg2))
|
||||||
resBits = mask(sizeBits);
|
resBits = mask(sizeBits);
|
||||||
|
|
||||||
result = insertBits(result, hiIndex, loIndex, resBits);
|
result = insertBits(result, hiIndex, loIndex, resBits);
|
||||||
|
|
Loading…
Reference in a new issue