1.1 --- a/sourcehook/sourcehook_hookmangen.cpp Sun Nov 11 18:55:34 2007 +0000
1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp Sat Nov 17 09:53:58 2007 +0000
1.3 @@ -19,6 +19,7 @@
1.4 #include "sourcehook_hookmangen.h"
1.5 #include "sourcehook_hookmangen_x86.h"
1.6 #include "sh_memory.h"
1.7 +#include <stdarg.h> // we might need the address of vsnprintf
1.8
1.9 #if SH_COMP == SH_COMP_MSVC
1.10 # define GCC_ONLY(x)
1.11 @@ -988,7 +989,7 @@
1.12 // ECX = pContext
1.13 // gcc: push ecx
1.14 // eax = [ecx]
1.15 - // eax = [eax + 3*PTR_SIZE]
1.16 + // eax = [eax + 3*SIZE_PTR]
1.17 // call eax
1.18 // gcc: clean up
1.19 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_pContext);
1.20 @@ -1193,6 +1194,24 @@
1.21 GCC_ONLY(IA32_Add_Rm_Imm8(&m_HookFunc, REG_ESP, 2*SIZE_PTR, MOD_REG));
1.22 }
1.23
1.24 + void GenContext::ResetFrame(jit_int32_t startOffset)
1.25 + {
1.26 + m_HookFunc_FrameOffset = startOffset;
1.27 + m_HookFunc_FrameVarsSize = 0;
1.28 + }
1.29 +
1.30 + jit_int32_t GenContext::AddVarToFrame(jit_int32_t size)
1.31 + {
1.32 + m_HookFunc_FrameOffset -= size;
1.33 + m_HookFunc_FrameVarsSize += size;
1.34 + return m_HookFunc_FrameOffset;
1.35 + }
1.36 +
1.37 + jit_int32_t GenContext::ComputeVarsSize()
1.38 + {
1.39 + return m_HookFunc_FrameVarsSize;
1.40 + }
1.41 +
1.42 void * GenContext::GenerateHookFunc()
1.43 {
1.44 // prologue
1.45 @@ -1200,19 +1219,21 @@
1.46 IA32_Push_Reg(&m_HookFunc, REG_EBX);
1.47 IA32_Mov_Reg_Rm(&m_HookFunc, REG_EBP, REG_ESP, MOD_REG);
1.48
1.49 +
1.50 // on msvc, save thisptr
1.51 #if SH_COMP == SH_COMP_MSVC
1.52 - jit_int8_t v_this = -4;
1.53 - const int addstackoffset = -4;
1.54 + jit_int32_t v_this = -4;
1.55 IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.56 #elif SH_COMP == SH_COMP_GCC
1.57 - jit_int8_t v_this = 12; // first param
1.58 - const int addstackoffset = 0;
1.59 + jit_int32_t v_this = 12; // first param
1.60 #endif
1.61
1.62 + ResetFrame(
1.63 + (SH_COMP==SH_COMP_MSVC) ? -4 : 0
1.64 + ); // on msvc, start on offset -4 because there already is the thisptr variable
1.65
1.66 // ********************** stack frame **********************
1.67 - // MSVC
1.68 + // MSVC
1.69 // second param (gcc: first real param) ebp + 16
1.70 // first param (gcc: thisptr) ebp + 12
1.71 // ret address: ebp + 8
1.72 @@ -1227,26 +1248,33 @@
1.73 // IHookContext *pContext ebp - 24 -4
1.74 // == 3 ptrs + 3 enums = 24 bytes
1.75 //
1.76 + // varargs:
1.77 + // va_list argptr ebp - 28 -4
1.78 + //
1.79 // non-void: add:
1.80 - // my_rettype *ret_ptr ebp - 28 -4
1.81 - // my_rettype orig_ret ebp - 28 - sizeof(my_rettype) -4
1.82 - // my_rettype override_ret ebp - 28 - sizeof(my_rettype)*2 -4
1.83 - // my_rettype plugin_ret ebp - 28 - sizeof(my_rettype)*3 -4
1.84 + // my_rettype *ret_ptr ebp - 28 (va: -4) -4
1.85 + // my_rettype orig_ret ebp - 28 (va: -4) - sizeof(my_rettype) -4
1.86 + // my_rettype override_ret ebp - 28 (va: -4) - sizeof(my_rettype)*2 -4
1.87 + // my_rettype plugin_ret ebp - 28 (va: -4) - sizeof(my_rettype)*3 -4
1.88 // == + 3 * sizeof(my_rettype) bytes
1.89
1.90 // if required:
1.91 - // my_rettype place_for_memret ebp - 28 - sizeof(my_rettype)*4 -4
1.92 + // my_rettype place_for_memret ebp - 28 (va: -4) - sizeof(my_rettype)*4 -4
1.93
1.94 // gcc only: if required:
1.95 - // place forced byref params ebp - 28 - sizeof(my_rettype)*{4 or 5}
1.96 + // place forced byref params ebp - 28 (va: -4) - sizeof(my_rettype)*{4 or 5}
1.97
1.98
1.99 - const jit_int8_t v_vfnptr_origentry = -4 + addstackoffset;
1.100 - const jit_int8_t v_status = -8 + addstackoffset;
1.101 - const jit_int8_t v_prev_res = -12 + addstackoffset;
1.102 - const jit_int8_t v_cur_res = -16 + addstackoffset;
1.103 - const jit_int8_t v_iter = -20 + addstackoffset;
1.104 - const jit_int8_t v_pContext = -24 + addstackoffset;
1.105 + const jit_int8_t v_vfnptr_origentry = AddVarToFrame(SIZE_PTR);
1.106 + const jit_int8_t v_status = AddVarToFrame(sizeof(META_RES));
1.107 + const jit_int8_t v_prev_res = AddVarToFrame(sizeof(META_RES));
1.108 + const jit_int8_t v_cur_res = AddVarToFrame(sizeof(META_RES));
1.109 + const jit_int8_t v_iter = AddVarToFrame(SIZE_PTR);
1.110 + const jit_int8_t v_pContext = AddVarToFrame(SIZE_PTR);
1.111 + // Only exists for varargs functions
1.112 + const jit_int8_t v_va_argptr = (m_Proto.GetConvention() & ProtoInfo::CallConv_HasVarArgs) ?
1.113 + AddVarToFrame(sizeof(va_list)) :
1.114 + 0;
1.115
1.116 #if SH_COMP == SH_COMP_GCC
1.117 jit_int32_t param_base_offs = 16;
1.118 @@ -1271,34 +1299,51 @@
1.119 #endif
1.120 }
1.121
1.122 - jit_int32_t v_ret_ptr = -28 + addstackoffset;
1.123 - jit_int32_t v_orig_ret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 1;
1.124 - jit_int32_t v_override_ret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 2;
1.125 - jit_int32_t v_plugin_ret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 3;
1.126 -
1.127 - jit_int32_t v_place_for_memret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 4;
1.128 -
1.129 - jit_int32_t v_place_fbrr_base = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * (MemRetWithTempObj() ? 5 : 4);
1.130 + jit_int32_t v_ret_ptr = 0;
1.131 + jit_int32_t v_orig_ret = 0;
1.132 + jit_int32_t v_override_ret = 0;
1.133 + jit_int32_t v_plugin_ret = 0;
1.134 +
1.135 + if (m_Proto.GetRet().size != 0)
1.136 + {
1.137 + v_ret_ptr = AddVarToFrame(SIZE_PTR);
1.138 + v_orig_ret = AddVarToFrame(GetStackSize(m_Proto.GetRet()));
1.139 + v_override_ret = AddVarToFrame(GetStackSize(m_Proto.GetRet()));
1.140 + v_plugin_ret = AddVarToFrame(GetStackSize(m_Proto.GetRet()));
1.141 + }
1.142
1.143 - // Hash for temporary storage for byval params with copy constructors
1.144 - // (param, offset into stack)
1.145 - short usedStackBytes = 3*SIZE_MWORD + 3*SIZE_PTR // vfnptr_origentry, status, prev_res, cur_res, iter, pContext
1.146 - + 3 * GetStackSize(m_Proto.GetRet()) + (m_Proto.GetRet().size == 0 ? 0 : SIZE_PTR) // ret_ptr, orig_ret, override_ret, plugin_ret
1.147 - + (MemRetWithTempObj() ? GetStackSize(m_Proto.GetRet()) : 0)
1.148 - + GetForcedByRefParamsSize()
1.149 - - addstackoffset; // msvc: current thisptr
1.150 + jit_int32_t v_place_for_memret = 0;
1.151 + if (MemRetWithTempObj())
1.152 + {
1.153 + v_place_for_memret = AddVarToFrame(GetStackSize(m_Proto.GetRet()));
1.154 + }
1.155
1.156 - IA32_Sub_Rm_Imm32(&m_HookFunc, REG_ESP, usedStackBytes, MOD_REG);
1.157 + jit_int32_t v_place_fbrr_base = 0;
1.158 + if (GetForcedByRefParamsSize())
1.159 + {
1.160 + v_place_fbrr_base = AddVarToFrame(GetForcedByRefParamsSize());
1.161 + }
1.162 +
1.163 + IA32_Sub_Rm_Imm32(&m_HookFunc, REG_ESP, ComputeVarsSize(), MOD_REG);
1.164
1.165 // init status localvar
1.166 IA32_Mov_Rm_Imm32_Disp8(&m_HookFunc, REG_EBP, MRES_IGNORED, v_status);
1.167
1.168 + // VarArgs: init argptr
1.169 + if (m_Proto.GetConvention() & ProtoInfo::CallConv_HasVarArgs)
1.170 + {
1.171 + // argptr = first vararg param
1.172 + // lea eax, [esp + param_base_offs + paramssize]
1.173 + // mov argptr, eax
1.174 +
1.175 + IA32_Lea_Reg_DispRegMultImm32(&m_HookFunc, REG_EAX, REG_NOIDX, REG_ESP, NOSCALE, param_base_offs + GetParamsStackSize());
1.176 + IA32_Mov_Rm_Reg_DispAuto(&m_HookFunc, REG_EBP, v_va_argptr, REG_EAX);
1.177 + }
1.178 +
1.179 // Call constructors for ret vars if required
1.180 if((m_Proto.GetRet().flags & PassInfo::PassFlag_ByVal) &&
1.181 m_Proto.GetRet().pNormalCtor)
1.182 {
1.183 - // :TODO: Gcc version
1.184 -
1.185 // orig_reg
1.186 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.187 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));