Subzero. x8664. Resurrects the Target.

unittest/AssemblerX8664/ControlFlow.cpp

 //===- subzero/unittest/AssemblerX8664/ControlFlow.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 142 matching lines @@
   TestImpl(r15, r1);
 
 #undef TestImpl
 }
 
 TEST_F(AssemblerX8664Test, CallAddr) {
 #define TestImpl(Dst, Src)                                                     \
   do {                                                                         \
     const uint32_t T0 = allocateQword();                                       \
     const uint64_t V0 = 0xA0C0FFEEBEEFFEEFull;                                 \
+    const uint32_t T1 = allocateDword();                                       \
     __ call(Immediate(16));                                                    \
     int CallTargetAddr = codeBytesSize() + 12;                                 \
     __ mov(IceType_i8, Encoded_GPR_##Dst##l(), Immediate(0xf4));               \
     __ ret();                                                                  \
     for (int I = codeBytesSize(); I < CallTargetAddr; ++I) {                   \
       __ hlt();                                                                \
     }                                                                          \
     __ mov(IceType_i64, Encoded_GPR_##Dst##q(), dwordAddress(T0));             \
-    __ mov(IceType_i64, Encoded_GPR_##Src##q(), Encoded_GPR_rsp());            \
-    __ call(Address(Encoded_GPR_##Src##q(), 0, AssemblerFixup::NoFixup));      \
     __ popl(Encoded_GPR_##Src##q());                                           \
+    __ mov(IceType_i32, dwordAddress(T1), Encoded_GPR_##Src##d());             \
+    __ call(dwordAddress(T1));                                                 \
                                                                                \
     AssembledTest test = assemble();                                           \
     test.setQwordTo(T0, V0);                                                   \
     test.run();                                                                \
                                                                                \
     ASSERT_EQ(0xA0C0FFEEBEEFFEF4ull, test.Dst##q()) << "(" #Dst ", " #Src ")"; \
     reset();                                                                   \
   } while (0)
 
   TestImpl(r1, r2);
@@ skipping 114 matching lines @@
   TestImplReg(r15);
 
 #undef TestImplReg
 #undef TestImplAddr
 }
 
 } // end of anonymous namespace
 } // end of namespace Test
 } // end of namespace X8664
 } // end of namespace Ice