Subzero. x8664. Resurrects the Target.

unittest/AssemblerX8664/GPRArith.cpp

 //===- subzero/unittest/AssemblerX8664/GPRArith.cpp -----------------------===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 #include "AssemblerX8664/TestUtil.h"
 
@@ skipping 311 matching lines @@
 #undef TestLeaScaled32bitDisp
 #undef TestLeaBaseDisp
 }
 
 TEST_F(AssemblerX8664LowLevelTest, LeaAbsolute) {
 #define TestLeaAbsolute(Dst, Value)                                            \
   do {                                                                         \
     static constexpr char TestString[] = "(" #Dst ", " #Value ")";             \
     __ lea(IceType_i32, GPRRegister::Encoded_Reg_##Dst,                        \
            Address(Value, AssemblerFixup::NoFixup));                           \
-    static constexpr uint32_t ByteCount = 6;                                   \
+    static constexpr uint32_t ByteCount = 8;                                   \
     ASSERT_EQ(ByteCount, codeBytesSize()) << TestString;                       \
     static constexpr uint8_t Opcode = 0x8D;                                    \
     static constexpr uint8_t ModRM =                                           \
-        /*mod=*/0x00 | /*reg*/ (GPRRegister::Encoded_Reg_##Dst << 3) |         \
-        /*rm*/ GPRRegister::Encoded_Reg_ebp;                                   \
+        /*mod*/ 0x00 | /*reg*/ (GPRRegister::Encoded_Reg_##Dst << 3) |         \
+        /*rm*/ GPRRegister::Encoded_Reg_esp;                                   \
+    static constexpr uint8_t SIB =                                             \
+        /*Scale*/ 0x00 | /*Index*/ (GPRRegister::Encoded_Reg_esp << 3) |       \
+        /*base*/ GPRRegister::Encoded_Reg_ebp;                                 \
     ASSERT_TRUE(verifyBytes<ByteCount>(                                        \
-        codeBytes(), Opcode, ModRM, (Value)&0xFF, (Value >> 8) & 0xFF,         \
-        (Value >> 16) & 0xFF, (Value >> 24) & 0xFF));                          \
+        codeBytes(), 0x67, Opcode, ModRM, SIB, (Value)&0xFF,                   \
+        (Value >> 8) & 0xFF, (Value >> 16) & 0xFF, (Value >> 24) & 0xFF));     \
     reset();                                                                   \
   } while (0)
 
   TestLeaAbsolute(eax, 0x11BEEF22);
   TestLeaAbsolute(ebx, 0x33BEEF44);
   TestLeaAbsolute(ecx, 0x55BEEF66);
   TestLeaAbsolute(edx, 0x77BEEF88);
   TestLeaAbsolute(esi, 0x99BEEFAA);
   TestLeaAbsolute(edi, 0xBBBEEFBB);
 
@@ skipping 1550 matching lines @@
 #undef TestImplValue
 #undef TestImplSize
 #undef TestImplRegAddr
 #undef TestImplRegReg
 }
 
 } // end of anonymous namespace
 } // end of namespace Test
 } // end of namespace X8664
 } // end of namespace Ice