1.1 --- a/sourcehook/sourcehook_hookmangen.cpp Fri Nov 02 11:59:57 2007 +0000
1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp Fri Nov 02 12:41:00 2007 +0000
1.3 @@ -965,35 +965,46 @@
1.4 m_HookFunc.rewrite(tmppos2, static_cast<jit_uint32_t>(counter2));
1.5
1.6 // *v_orig_ret = *v_override_ret
1.7 - if (m_Proto.GetRet().pAssignOperator)
1.8 + if (m_Proto.GetRet().flags & PassInfo::PassFlag_ByRef)
1.9 {
1.10 - // lea edx, [ebp + v_override_ret] <-- src addr
1.11 - // lea ecx, [ebp + v_orig_ret] <-- dest addr
1.12 - // gcc: push ecx
1.13 - // push edx <-- src addr
1.14 - // call it
1.15 + // mov ecx, [ebp + v_override_ret]
1.16 + // mov [ebp + v_orig_ret], ecx
1.17
1.18 - IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_override_ret);
1.19 - IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.20 -#if SH_COMP == SH_COMP_GCC
1.21 - IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.22 -#endif
1.23 - IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.24 -
1.25 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.26 - IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.27 + IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_override_ret);
1.28 + IA32_Mov_Rm_Reg_DispAuto(&m_HookFunc, REG_EBP, REG_ECX, v_orig_ret);
1.29 }
1.30 else
1.31 {
1.32 - // bitwise copy
1.33 - BitwiseCopy_Setup();
1.34 + if (m_Proto.GetRet().pAssignOperator)
1.35 + {
1.36 + // lea edx, [ebp + v_override_ret] <-- src addr
1.37 + // lea ecx, [ebp + v_orig_ret] <-- dest addr
1.38 + // gcc: push ecx
1.39 + // push edx <-- src addr
1.40 + // call it
1.41 +
1.42 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_override_ret);
1.43 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.44 +#if SH_COMP == SH_COMP_GCC
1.45 + IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.46 +#endif
1.47 + IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.48
1.49 - //lea edi, [ebp+v_orig_ret] <-- destination
1.50 - //lea esi, [ebp+v_override_ret] <-- src
1.51 - IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDI, REG_EBP, v_orig_ret);
1.52 - IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_override_ret);
1.53 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.54 + IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.55 + }
1.56 + else
1.57 + {
1.58 + // bitwise copy
1.59 + BitwiseCopy_Setup();
1.60
1.61 - BitwiseCopy_Do(m_Proto.GetRet().size);
1.62 + //lea edi, [ebp+v_orig_ret] <-- destination
1.63 + //lea esi, [ebp+v_override_ret] <-- src
1.64 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDI, REG_EBP, v_orig_ret);
1.65 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_override_ret);
1.66 +
1.67 + BitwiseCopy_Do(m_Proto.GetRet().size);
1.68 + }
1.69 }
1.70
1.71 // skip don't call label target:
1.72 @@ -1194,7 +1205,8 @@
1.73 IA32_Mov_Rm_Imm32_Disp8(&m_HookFunc, REG_EBP, MRES_IGNORED, v_status);
1.74
1.75 // Call constructors for ret vars if required
1.76 - if(m_Proto.GetRet().pNormalCtor)
1.77 + if((m_Proto.GetRet().flags & PassInfo::PassFlag_ByVal) &&
1.78 + m_Proto.GetRet().pNormalCtor)
1.79 {
1.80 // :TODO: Gcc version
1.81
1.82 @@ -1256,7 +1268,8 @@
1.83 DoReturn(v_ret_ptr, v_memret_addr);
1.84
1.85 // Call destructors of orig_ret/ ...
1.86 - if(m_Proto.GetRet().pDtor)
1.87 + if((m_Proto.GetRet().flags & PassInfo::PassFlag_ByVal) &&
1.88 + m_Proto.GetRet().pDtor)
1.89 {
1.90 // Preserve return value in EAX(:EDX)
1.91 IA32_Push_Reg(&m_HookFunc, REG_EAX);
2.1 --- a/sourcehook/test/testhookmangen.cpp Fri Nov 02 11:59:57 2007 +0000
2.2 +++ b/sourcehook/test/testhookmangen.cpp Fri Nov 02 12:41:00 2007 +0000
2.3 @@ -371,6 +371,40 @@
2.4 THGM_SETUP_RI(110, ObjRet13, SourceHook::PassInfo::PassType_Object,
2.5 SourceHook::PassInfo::PassFlag_ByVal | SourceHook::PassInfo::PassFlag_OCtor | SourceHook::PassInfo::PassFlag_ODtor |
2.6 SourceHook::PassInfo::PassFlag_CCtor | SourceHook::PassInfo::PassFlag_AssignOp);
2.7 +
2.8 + MAKE_OBJRET(111);
2.9 + ObjRet111 g_O111_0;
2.10 + ObjRet111 g_O111_1;
2.11 + ObjRet111 g_O111_2;
2.12 + ObjRet111 g_O111_3;
2.13 + ObjRet111 g_O111_4;
2.14 +
2.15 + template <>
2.16 + struct MakeRet< ObjRet111& >
2.17 + {
2.18 + static ObjRet111 &Do(int a)
2.19 + {
2.20 + switch (a)
2.21 + {
2.22 + case 0:
2.23 + return g_O111_0;
2.24 + case 1:
2.25 + return g_O111_1;
2.26 + case 2:
2.27 + return g_O111_2;
2.28 + case 3:
2.29 + return g_O111_3;
2.30 + default:
2.31 + return g_O111_4;
2.32 + }
2.33 + }
2.34 + };
2.35 +
2.36 + THGM_MAKE_TEST0(111, ObjRet111& );
2.37 + THGM_SETUP_PI0(111);
2.38 + THGM_SETUP_RI(111, ObjRet111& , SourceHook::PassInfo::PassType_Object,
2.39 + SourceHook::PassInfo::PassFlag_ByRef | SourceHook::PassInfo::PassFlag_OCtor | SourceHook::PassInfo::PassFlag_ODtor |
2.40 + SourceHook::PassInfo::PassFlag_CCtor | SourceHook::PassInfo::PassFlag_AssignOp);
2.41 }
2.42
2.43 bool TestHookManGen(std::string &error)
2.44 @@ -378,6 +412,15 @@
2.45 GET_SHPTR(g_SHPtr);
2.46 g_PLID = 1337;
2.47
2.48 + // 5 Global constructors (g_O111_*)
2.49 + CHECK_STATES((&g_States,
2.50 + new State_ObjOCtor_Called(111),
2.51 + new State_ObjOCtor_Called(111),
2.52 + new State_ObjOCtor_Called(111),
2.53 + new State_ObjOCtor_Called(111),
2.54 + new State_ObjOCtor_Called(111),
2.55 + NULL), "GlobCtors");
2.56 +
2.57 THGM_DO_TEST_void(0, ());
2.58
2.59 THGM_DO_TEST_void(1, (100));
2.60 @@ -750,6 +793,10 @@
2.61 THGM_REMOVE_HOOK(110, 3);
2.62 THGM_REMOVE_HOOK(110, 4);
2.63
2.64 +
2.65 + // RefRet
2.66 + THGM_DO_TEST(111, ());
2.67 +
2.68 // Shutdown now!
2.69 // If we don't SH will auto-shutdown _after_ genc's destructor is called
2.70 // -> crash
3.1 --- a/sourcehook/test/testhookmangen.h Fri Nov 02 11:59:57 2007 +0000
3.2 +++ b/sourcehook/test/testhookmangen.h Fri Nov 02 12:41:00 2007 +0000
3.3 @@ -518,6 +518,7 @@
3.4
3.5 #define THGM_MAKE_TEST0(id, ret_type) \
3.6 struct TestClass##id; \
3.7 + typedef ret_type RetType##id; \
3.8 typedef ParamState0<0 > ParamState_m##id; \
3.9 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.10 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.11 @@ -728,6 +729,7 @@
3.12
3.13 #define THGM_MAKE_TEST1(id, ret_type, param1) \
3.14 struct TestClass##id; \
3.15 + typedef ret_type RetType##id; \
3.16 typedef ParamState1<0, param1 > ParamState_m##id; \
3.17 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.18 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.19 @@ -938,6 +940,7 @@
3.20
3.21 #define THGM_MAKE_TEST2(id, ret_type, param1, param2) \
3.22 struct TestClass##id; \
3.23 + typedef ret_type RetType##id; \
3.24 typedef ParamState2<0, param1, param2 > ParamState_m##id; \
3.25 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.26 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.27 @@ -1148,6 +1151,7 @@
3.28
3.29 #define THGM_MAKE_TEST3(id, ret_type, param1, param2, param3) \
3.30 struct TestClass##id; \
3.31 + typedef ret_type RetType##id; \
3.32 typedef ParamState3<0, param1, param2, param3 > ParamState_m##id; \
3.33 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.34 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.35 @@ -1358,6 +1362,7 @@
3.36
3.37 #define THGM_MAKE_TEST4(id, ret_type, param1, param2, param3, param4) \
3.38 struct TestClass##id; \
3.39 + typedef ret_type RetType##id; \
3.40 typedef ParamState4<0, param1, param2, param3, param4 > ParamState_m##id; \
3.41 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.42 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.43 @@ -1568,6 +1573,7 @@
3.44
3.45 #define THGM_MAKE_TEST5(id, ret_type, param1, param2, param3, param4, param5) \
3.46 struct TestClass##id; \
3.47 + typedef ret_type RetType##id; \
3.48 typedef ParamState5<0, param1, param2, param3, param4, param5 > ParamState_m##id; \
3.49 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.50 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.51 @@ -1778,6 +1784,7 @@
3.52
3.53 #define THGM_MAKE_TEST6(id, ret_type, param1, param2, param3, param4, param5, param6) \
3.54 struct TestClass##id; \
3.55 + typedef ret_type RetType##id; \
3.56 typedef ParamState6<0, param1, param2, param3, param4, param5, param6 > ParamState_m##id; \
3.57 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
3.58 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
3.59 @@ -2015,10 +2022,21 @@
3.60 THGM_REMOVE_HOOK(id, 3); \
3.61 THGM_REMOVE_HOOK(id, 4);
3.62
3.63 +template<class T>
3.64 +T ComparableRef(T x)
3.65 +{
3.66 + return x;
3.67 +}
3.68 +
3.69 +template <class T>
3.70 +T* ComparableRef(T& x)
3.71 +{
3.72 + return &x;
3.73 +}
3.74
3.75 #define THGM_CALLS(id, call_params, exp_ret_norm, exp_ret_shcall, err) \
3.76 - CHECK_COND(pTest##id->Func call_params == exp_ret_norm, err " /retcallnorm"); \
3.77 - CHECK_COND(SH_CALL(pTest##id, &TestClass##id::Func) call_params == exp_ret_shcall, err " /retcallshcall");
3.78 + CHECK_COND(ComparableRef<RetType##id>(pTest##id->Func call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_norm)), err " /retcallnorm"); \
3.79 + CHECK_COND(ComparableRef<RetType##id>(SH_CALL(pTest##id, &TestClass##id::Func) call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_shcall)), err " /retcallshcall");
3.80
3.81 #define THGM_DO_TEST(id, call_params) \
3.82 setuppi_##id(); \
4.1 --- a/sourcehook/test/testhookmangen.hxx Fri Nov 02 11:59:57 2007 +0000
4.2 +++ b/sourcehook/test/testhookmangen.hxx Fri Nov 02 12:41:00 2007 +0000
4.3 @@ -260,6 +260,7 @@
4.4
4.5 #define THGM_MAKE_TEST$1(id, ret_type@[$2,1,$1:, param$2@]) \
4.6 struct TestClass##id; \
4.7 + typedef ret_type RetType##id; \
4.8 typedef ParamState$1<0@[$2,1,$1:, param$2@] > ParamState_m##id; \
4.9 MAKE_STATE_2(State_Func##id, TestClass##id* /*thisptr*/, ParamState_m##id ); \
4.10 MAKE_STATE_3(State_Deleg1_##id, TestClass##id* /*ifptr*/, int /*deleg thisptr*/, ParamState_m##id ); \
4.11 @@ -497,10 +498,21 @@
4.12 THGM_REMOVE_HOOK(id, 3); \
4.13 THGM_REMOVE_HOOK(id, 4);
4.14
4.15 +template<class T>
4.16 +T ComparableRef(T x)
4.17 +{
4.18 + return x;
4.19 +}
4.20 +
4.21 +template <class T>
4.22 +T* ComparableRef(T& x)
4.23 +{
4.24 + return &x;
4.25 +}
4.26
4.27 #define THGM_CALLS(id, call_params, exp_ret_norm, exp_ret_shcall, err) \
4.28 - CHECK_COND(pTest##id->Func call_params == exp_ret_norm, err " /retcallnorm"); \
4.29 - CHECK_COND(SH_CALL(pTest##id, &TestClass##id::Func) call_params == exp_ret_shcall, err " /retcallshcall");
4.30 + CHECK_COND(ComparableRef<RetType##id>(pTest##id->Func call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_norm)), err " /retcallnorm"); \
4.31 + CHECK_COND(ComparableRef<RetType##id>(SH_CALL(pTest##id, &TestClass##id::Func) call_params) == ComparableRef<RetType##id>(MakeRet< RetType##id >::Do(exp_ret_shcall)), err " /retcallshcall");
4.32
4.33 #define THGM_DO_TEST(id, call_params) \
4.34 setuppi_##id(); \