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);