1.1 --- a/sourcehook/sourcehook_hookmangen.cpp Wed Nov 07 16:56:03 2007 +0000
1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp Thu Nov 08 18:17:26 2007 +0000
1.3 @@ -441,19 +441,25 @@
1.4 added_to_stack += ret;
1.5 }
1.6
1.7 + return added_to_stack;
1.8 + }
1.9 +
1.10 + // It is IMPORTANT that PushMemRetPtr doesn't touch ecx and eax
1.11 + jit_int32_t GenContext::PushMemRetPtr(jit_int32_t save_ret_to, jit_int32_t v_place_for_memret)
1.12 + {
1.13 // Memory return support
1.14 if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
1.15 {
1.16 // push address where to save it!
1.17 - int reg = NextRegEBX_ECX_EDX();
1.18 + int reg = REG_EDX;
1.19 IA32_Lea_DispRegImmAuto(&m_HookFunc, reg, REG_EBP,
1.20 MemRetWithTempObj() ? v_place_for_memret : save_ret_to);
1.21 IA32_Push_Reg(&m_HookFunc, reg);
1.22
1.23 - added_to_stack += SIZE_PTR;
1.24 + return (SH_COMP==SH_COMP_MSVC) ? 4 : 0; // varargs funcs on msvc might need this.
1.25 + // gcc doesn't: callee cleans the memret ptr, caller the other params :s
1.26 }
1.27 -
1.28 - return added_to_stack;
1.29 + return 0;
1.30 }
1.31
1.32 void GenContext::SaveRetVal(int v_where, int v_place_for_memret)
1.33 @@ -891,6 +897,7 @@
1.34
1.35 IA32_Mov_Reg_Rm(&m_HookFunc, REG_ECX, REG_EAX, MOD_REG);
1.36 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.37 + gcc_clean_bytes += PushMemRetPtr(v_plugin_ret, v_place_for_memret);
1.38 IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
1.39 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EAX, 2*SIZE_PTR);
1.40 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.41 @@ -1006,6 +1013,7 @@
1.42 IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.43 // on msvc, simply leave it in ecx
1.44 #endif
1.45 + gcc_clean_bytes += PushMemRetPtr(v_orig_ret, v_place_for_memret);
1.46
1.47 // call
1.48 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EBP, v_vfnptr_origentry);
1.49 @@ -1193,11 +1201,11 @@
1.50
1.51 // on msvc, save thisptr
1.52 #if SH_COMP == SH_COMP_MSVC
1.53 - const jit_int8_t v_this = -4;
1.54 + jit_int8_t v_this = -4;
1.55 const int addstackoffset = -4;
1.56 IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.57 #elif SH_COMP == SH_COMP_GCC
1.58 - const jit_int8_t v_this = 12; // first param
1.59 + jit_int8_t v_this = 12; // first param
1.60 const int addstackoffset = 0;
1.61 #endif
1.62
1.63 @@ -1249,8 +1257,17 @@
1.64 jit_int32_t v_memret_addr = 0;
1.65 if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
1.66 {
1.67 +#if SH_COMP == SH_COMP_GCC
1.68 + // gcc: now: first param = mem ret addr
1.69 + // second param = this pointer
1.70 + // third param = actual first param
1.71 + v_memret_addr = 12;
1.72 + v_this += 4;
1.73 + param_base_offs += SIZE_PTR;
1.74 +#elif SH_COMP == SH_COMP_MSVC
1.75 v_memret_addr = param_base_offs;
1.76 param_base_offs += SIZE_PTR;
1.77 +#endif
1.78 }
1.79
1.80 jit_int32_t v_ret_ptr = -28 + addstackoffset;
1.81 @@ -1380,8 +1397,14 @@
1.82 IA32_Pop_Reg(&m_HookFunc, REG_EBX);
1.83 IA32_Pop_Reg(&m_HookFunc, REG_EBP);
1.84 MSVC_ONLY(IA32_Return_Popstack(&m_HookFunc, GetParamsStackSize()));
1.85 - GCC_ONLY(IA32_Return(&m_HookFunc)); // :TODO: ?? Memory return? Should I pop 4 bytes then?
1.86 -
1.87 + // gcc: Remove 4 bytes from stack on memory return
1.88 +#if SH_COMP == SH_COMP_GCC
1.89 + if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
1.90 + IA32_Return_Popstack(&m_HookFunc, SIZE_PTR);
1.91 + else
1.92 + IA32_Return(&m_HookFunc);
1.93 +#endif
1.94 +
1.95 // Store pointer for later use
1.96 // m_HookfuncVfnPtr is a pointer to a void* because SH expects a pointer
1.97 // into the hookman's vtable