Enhance address mode recovery

unittest/AssemblerX8632/ControlFlow.cpp

Index: unittest/AssemblerX8632/ControlFlow.cpp
diff --git a/unittest/AssemblerX8632/ControlFlow.cpp b/unittest/AssemblerX8632/ControlFlow.cpp
index 35adf072c304ed14b1ab19cbeed9a237a1c62de9..b325bfdcaba264fe62e3a5cd54cb2f98d32e63c9 100644
--- a/unittest/AssemblerX8632/ControlFlow.cpp
+++ b/unittest/AssemblerX8632/ControlFlow.cpp
@@ -133,7 +133,8 @@ TEST_F(AssemblerX8632Test, CallAddr) {
   __ hlt();
   __ hlt();
   __ mov(IceType_i32, GPRRegister::Encoded_Reg_eax, Immediate(0xf1f2f300));
-  __ call(Address(GPRRegister::Encoded_Reg_esp, 0));
+  static constexpr AssemblerFixup *Fixup = nullptr;

[Jim Stichnoth, 2015/10/27 22:19:52]

Is there some place you could put a single instance of:

  static constexpr AssemblerFixup *NoFixup = nullptr;

and then use NoFixup as the Address() arg?  Cutting down the repetition of the
NoFixup definitions.

I would be OK with a "#define NoFixup nullptr" if there isn't a common
superclass.

[sehr, 2015/10/27 23:24:05]

Added a NoFixup constexpr to the interface of AssemblerFixup.  Great suggestion.

+  __ call(Address(GPRRegister::Encoded_Reg_esp, 0, Fixup));
   __ popl(GPRRegister::Encoded_Reg_edx);
 
   AssembledTest test = assemble();