Index: unittest/AssemblerX8664/LowLevel.cpp |
diff --git a/unittest/AssemblerX8664/LowLevel.cpp b/unittest/AssemblerX8664/LowLevel.cpp |
index 2281b144116a83fa41835298313d26a4d741705a..c4cec9a85d42883a4cbf03f6111fde25075dcbce 100644 |
--- a/unittest/AssemblerX8664/LowLevel.cpp |
+++ b/unittest/AssemblerX8664/LowLevel.cpp |
@@ -187,7 +187,7 @@ TEST_F(AssemblerX8664LowLevelTest, Cmp) { |
", " #__VA_ARGS__ ")"; \ |
static constexpr uint8_t ByteCount = ByteCountUntyped; \ |
__ Inst(IceType_##OpType, Encoded_GPR_##Dst(), \ |
- Address(Disp, AssemblerFixup::NoFixup)); \ |
+ Address::RipRelative(Disp, AssemblerFixup::NoFixup)); \ |
ASSERT_EQ(ByteCount, codeBytesSize()) << TestString; \ |
ASSERT_TRUE(verifyBytes<ByteCount>(codeBytes(), __VA_ARGS__)) \ |
<< TestString; \ |
@@ -414,18 +414,18 @@ TEST_F(AssemblerX8664LowLevelTest, Cmp) { |
TestRegImm(cmp, r15, 0x100, i16, 6, 0x66, 0x41, 0x81, 0xFF, 0x00, 0x01); |
/* cmp GPR, Absolute */ |
- TestRegAbsoluteAddr(cmp, eax, 0xF00FBEEF, i32, 8, 0x67, 0x3B, 0x04, 0x25, |
- 0xEF, 0xBE, 0x0F, 0xF0); |
- TestRegAbsoluteAddr(cmp, eax, 0xF00FBEEF, i16, 9, 0x66, 0x67, 0x3B, 0x04, |
- 0x25, 0xEF, 0xBE, 0x0F, 0xF0); |
- TestRegAbsoluteAddr(cmp, eax, 0xF00FBEEF, i8, 8, 0x67, 0x3A, 0x04, 0x25, 0xEF, |
+ TestRegAbsoluteAddr(cmp, eax, 0xF00FBEEF, i32, 7, 0x67, 0x3B, 0x05, 0xEF, |
0xBE, 0x0F, 0xF0); |
- TestRegAbsoluteAddr(cmp, r8, 0xF00FBEEF, i32, 9, 0x67, 0x44, 0x3B, 0x04, 0x25, |
+ TestRegAbsoluteAddr(cmp, eax, 0xF00FBEEF, i16, 8, 0x66, 0x67, 0x3B, 0x05, |
0xEF, 0xBE, 0x0F, 0xF0); |
- TestRegAbsoluteAddr(cmp, r8, 0xF00FBEEF, i16, 10, 0x66, 0x67, 0x44, 0x3B, |
- 0x04, 0x25, 0xEF, 0xBE, 0x0F, 0xF0); |
- TestRegAbsoluteAddr(cmp, r8, 0xF00FBEEF, i8, 9, 0x67, 0x44, 0x3A, 0x04, 0x25, |
+ TestRegAbsoluteAddr(cmp, eax, 0xF00FBEEF, i8, 7, 0x67, 0x3A, 0x05, 0xEF, 0xBE, |
+ 0x0F, 0xF0); |
+ TestRegAbsoluteAddr(cmp, r8, 0xF00FBEEF, i32, 8, 0x67, 0x44, 0x3B, 0x05, 0xEF, |
+ 0xBE, 0x0F, 0xF0); |
+ TestRegAbsoluteAddr(cmp, r8, 0xF00FBEEF, i16, 9, 0x66, 0x67, 0x44, 0x3B, 0x05, |
0xEF, 0xBE, 0x0F, 0xF0); |
+ TestRegAbsoluteAddr(cmp, r8, 0xF00FBEEF, i8, 8, 0x67, 0x44, 0x3A, 0x05, 0xEF, |
+ 0xBE, 0x0F, 0xF0); |
/* cmp GPR, 0(Base) */ |
TestRegAddrBase(cmp, eax, ecx, 0, i32, 3, 0x67, 0x3B, 0x01); |