1.1 --- a/sourcehook/sourcehook_hookmangen.cpp Fri Nov 23 15:26:00 2007 +0000
1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp Sat Nov 24 16:53:27 2007 +0000
1.3 @@ -203,6 +203,53 @@
1.4 IA32_Pop_Reg(&m_HookFunc, REG_EDI);
1.5 }
1.6
1.7 + jit_int32_t GenContext::AlignStackBeforeCall(int paramsize, int flags)
1.8 + {
1.9 + paramsize +=
1.10 + GCC_ONLY( ((flags & AlignStack_GCC_ThisOnStack)!=0 ? SIZE_PTR : 0) + )
1.11 + MSVC_ONLY( ((flags & AlignStack_MSVC_ThisOnStack)!=0 ? SIZE_PTR : 0) + )
1.12 + ((flags & AlignStack_MemRet)!=0 ? SIZE_PTR : 0);
1.13 +
1.14 + // At the beginning of the hookfunc, the stack is aligned to a 16 bytes boundary.
1.15 + // Then, m_BytesPushedAfterInitialAlignment were pushed (can also be 0).
1.16 +
1.17 + // After this function is called, paramsize bytes will be pushed onto the stack
1.18 + // After that, the alignment has to be a 16 bytes boundary again.
1.19 +
1.20 +
1.21 + // How many bytes we would subtract if the alignment was alright now:
1.22 + int subtractFromEsp = 16 - (paramsize % 16);
1.23 + if (subtractFromEsp == 16)
1.24 + subtractFromEsp = 0;
1.25 +
1.26 + // But: there might be bytes pushed alreay!
1.27 + subtractFromEsp -= m_BytesPushedAfterInitialAlignment;
1.28 +
1.29 + // For example: paramsize was 0 and m_BytesPushedAfterInitialAlignment was 4.
1.30 + // we then have to push another 12 bytes to reach 16 bytes alignment again.
1.31 +
1.32 + if (subtractFromEsp < 0)
1.33 + subtractFromEsp = 16 - ((-subtractFromEsp) % 16);
1.34 +
1.35 + IA32_Sub_Rm_ImmAuto(&m_HookFunc, REG_ESP, subtractFromEsp, MOD_REG);
1.36 +
1.37 + return subtractFromEsp;
1.38 + }
1.39 +
1.40 + void GenContext::AlignStackAfterCall(jit_int32_t numofbytes)
1.41 + {
1.42 + IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, numofbytes, MOD_REG);
1.43 + }
1.44 +
1.45 + void GenContext::CheckAlignmentBeforeCall()
1.46 + {
1.47 +#if 0
1.48 + IA32_Test_Rm_Imm32(&m_HookFunc, REG_ESP, 15, MOD_REG);
1.49 + IA32_Jump_Cond_Imm8(&m_HookFunc, CC_Z, 1);
1.50 + IA32_Int3(&m_HookFunc);
1.51 +#endif
1.52 + }
1.53 +
1.54 short GenContext::GetParamsTotalStackSize()
1.55 {
1.56 short acc = 0;
1.57 @@ -220,7 +267,7 @@
1.58 for (int i = 0; i < p; ++i)
1.59 {
1.60 if (m_Proto.GetParam(i).flags & PassFlag_ForcedByRef)
1.61 - off += AlignSize(m_Proto.GetParam(i).size, 4);
1.62 + off += AlignSize(static_cast<jit_int32_t>(m_Proto.GetParam(i).size), 4);
1.63 }
1.64 return off;
1.65 }
1.66 @@ -328,31 +375,35 @@
1.67 // if there is a copy constructor..
1.68 if (pi.pCopyCtor)
1.69 {
1.70 - // save eax
1.71 - // push src addr
1.72 - // this= target addr = forcedbyref ? ebp+place_fbrr : esp+12
1.73 - // call copy constructor
1.74 - // restore eax
1.75 -
1.76 + // :TODO: alignment here?
1.77 + // can't use normal alignment methods
1.78 + // because an unknown number of bytes has been pushed already (the other params)
1.79 IA32_Push_Reg(&m_HookFunc, REG_EAX);
1.80 -
1.81 +
1.82 + // compute dest addr to ECX
1.83 + // = forcedbyref ? ebp+place_fbrr : esp+12
1.84 if (pi.flags & PassFlag_ForcedByRef)
1.85 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, place_fbrr);
1.86 else
1.87 IA32_Lea_Reg_DispRegMultImm8(&m_HookFunc, REG_ECX, REG_NOIDX, REG_ESP, NOSCALE, 4);
1.88
1.89 + // compute src addr to EAX
1.90 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EAX, REG_EBP, param_offset);
1.91 +
1.92 + // push params (gcc: also this)
1.93 IA32_Push_Reg(&m_HookFunc, REG_EAX);
1.94 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.95 +
1.96 + // call
1.97 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EDX, DownCastPtr(pi.pCopyCtor));
1.98 IA32_Call_Reg(&m_HookFunc, REG_EDX);
1.99 - GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
1.100 +
1.101 + // restore eax
1.102 IA32_Pop_Reg(&m_HookFunc, REG_EAX);
1.103 }
1.104 else
1.105 {
1.106 // bitwise copy
1.107 -
1.108
1.109 BitwiseCopy_Setup();
1.110
1.111 @@ -379,7 +430,7 @@
1.112 return SIZE_PTR;
1.113 }
1.114
1.115 - return DownCastSize(pi.size);
1.116 + return GetParamStackSize(pi);
1.117 }
1.118
1.119 void GenContext::DestroyParams(jit_int32_t fbrr_base)
1.120 @@ -391,11 +442,15 @@
1.121 (pi.flags & PassInfo::PassFlag_ByVal) && (pi.flags & PassFlag_ForcedByRef))
1.122 {
1.123 // Actually, this is only for GCC (see line above: ForcedByRef)
1.124 + jit_int32_t tmpAlign = AlignStackBeforeCall(0, AlignStack_GCC_ThisOnStack);
1.125 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, fbrr_base + GetForcedByRefParamOffset(i));
1.126 IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.127 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(pi.pDtor));
1.128 + CheckAlignmentBeforeCall();
1.129 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.130 IA32_Pop_Reg(&m_HookFunc, REG_ECX);
1.131 +
1.132 + AlignStackAfterCall(tmpAlign);
1.133 }
1.134 }
1.135 }
1.136 @@ -436,7 +491,7 @@
1.137 }
1.138 else if (pi.flags & PassInfo::PassFlag_ByRef)
1.139 {
1.140 - PushRef(cur_offset, pi);
1.141 + ret = PushRef(cur_offset, pi);
1.142 }
1.143 else
1.144 {
1.145 @@ -501,14 +556,19 @@
1.146 // call it
1.147 // gcc: clean up
1.148
1.149 + jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR, AlignStack_GCC_ThisOnStack);
1.150 +
1.151 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_place_for_memret);
1.152 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_where);
1.153 IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.154 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.155
1.156 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.157 + CheckAlignmentBeforeCall();
1.158 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.159 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.160 +
1.161 + AlignStackAfterCall(tmpAlign);
1.162 }
1.163 else
1.164 {
1.165 @@ -531,11 +591,16 @@
1.166 //call it
1.167 //gcc: clean up
1.168
1.169 + jit_int32_t tmpAlign = AlignStackBeforeCall(0, AlignStack_GCC_ThisOnStack);
1.170 +
1.171 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_place_for_memret);
1.172 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.173 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.174 + CheckAlignmentBeforeCall();
1.175 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.176 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.177 +
1.178 + AlignStackAfterCall(tmpAlign);
1.179 }
1.180 }
1.181 else
1.182 @@ -636,7 +701,7 @@
1.183 tmppos = IA32_Jump_Cond_Imm8(&m_HookFunc, CC_NGE, 0);
1.184 m_HookFunc.start_count(counter);
1.185
1.186 - // eax = pContext->GetOverrideRetPtr()
1.187 + // eax = pContext->GetOverrideRetPtr() no alignment needs
1.188 // ECX = pContext
1.189 // gcc: push ecx
1.190 // eax = [ecx]
1.191 @@ -672,6 +737,8 @@
1.192 // call it
1.193 // gcc: clean up
1.194
1.195 + jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR, AlignStack_GCC_ThisOnStack);
1.196 +
1.197 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_plugin_ret);
1.198 IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.199 #if SH_COMP == SH_COMP_MSVC
1.200 @@ -681,8 +748,11 @@
1.201 #endif
1.202
1.203 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.204 + CheckAlignmentBeforeCall();
1.205 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.206 GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
1.207 +
1.208 + AlignStackAfterCall(tmpAlign);
1.209 }
1.210 else
1.211 {
1.212 @@ -817,6 +887,8 @@
1.213 // call it
1.214 // gcc: clean up
1.215
1.216 + jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR, AlignStack_GCC_ThisOnStack);
1.217 +
1.218 IA32_Mov_Reg_Rm(&m_HookFunc, REG_EDX, REG_ECX, MOD_REG);
1.219 IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.220
1.221 @@ -827,8 +899,11 @@
1.222 #endif
1.223
1.224 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pCopyCtor));
1.225 + CheckAlignmentBeforeCall();
1.226 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.227 GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
1.228 +
1.229 + AlignStackAfterCall(tmpAlign);
1.230 }
1.231 else
1.232 {
1.233 @@ -898,6 +973,12 @@
1.234 // gcc: clean up
1.235
1.236 jit_int32_t caller_clean_bytes = 0; // gcc always, msvc never (hooks never have varargs!)
1.237 +
1.238 + jit_int32_t alignBytes = AlignStackBeforeCall(
1.239 + GetParamsTotalStackSize() + ((m_Proto.GetConvention() & ProtoInfo::CallConv_HasVafmt)!=0 ? SIZE_PTR : 0),
1.240 + AlignStack_GCC_ThisOnStack | ((m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem) == 0 ? 0 : AlignStack_MemRet)
1.241 + );
1.242 +
1.243 // vafmt: push va_buf
1.244 if (m_Proto.GetConvention() & ProtoInfo::CallConv_HasVafmt)
1.245 {
1.246 @@ -914,8 +995,11 @@
1.247 caller_clean_bytes += PushMemRetPtr(v_plugin_ret, v_place_for_memret);
1.248 IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
1.249 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EAX, 2*SIZE_PTR);
1.250 + CheckAlignmentBeforeCall();
1.251 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.252
1.253 + AlignStackAfterCall(alignBytes);
1.254 +
1.255 DestroyParams(v_place_fbrr_base);
1.256
1.257 SaveRetVal(v_plugin_ret, v_place_for_memret);
1.258 @@ -956,7 +1040,7 @@
1.259 // jump back to loop begin
1.260 tmppos2 = IA32_Jump_Imm32(&m_HookFunc, 0);
1.261 m_HookFunc.end_count(loop_begin_counter);
1.262 - m_HookFunc.rewrite(tmppos2, -static_cast<jit_int32_t>(loop_begin_counter));
1.263 + m_HookFunc.rewrite(tmppos2, static_cast<jit_int32_t>(-loop_begin_counter));
1.264
1.265 m_HookFunc.end_count(counter);
1.266 m_HookFunc.rewrite(tmppos, static_cast<jit_int32_t>(counter));
1.267 @@ -1016,7 +1100,14 @@
1.268 m_HookFunc.start_count(counter2);
1.269
1.270 jit_int32_t caller_clean_bytes = 0; // gcc always, msvc when cdecl-like (varargs)
1.271 -
1.272 +
1.273 + jit_int32_t alignBytes = AlignStackBeforeCall(
1.274 + GetParamsTotalStackSize() + ((m_Proto.GetConvention() & ProtoInfo::CallConv_HasVafmt)!=0 ? 2*SIZE_PTR : 0),
1.275 + AlignStack_GCC_ThisOnStack |
1.276 + ((m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem) == 0 ? 0 : AlignStack_MemRet) |
1.277 + ((m_Proto.GetConvention() & ProtoInfo::CallConv_HasVarArgs) == 0 ? 0 : AlignStack_MSVC_ThisOnStack)
1.278 + );
1.279 +
1.280 // vafmt: push va_buf, then "%s"
1.281 if (m_Proto.GetConvention() & ProtoInfo::CallConv_HasVafmt)
1.282 {
1.283 @@ -1056,8 +1147,11 @@
1.284
1.285 // call
1.286 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EBP, v_vfnptr_origentry);
1.287 + CheckAlignmentBeforeCall();
1.288 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.289
1.290 + AlignStackAfterCall(alignBytes);
1.291 +
1.292 // cleanup
1.293 if (SH_COMP == SH_COMP_GCC || (m_Proto.GetConvention() & ProtoInfo::CallConv_HasVarArgs))
1.294 IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, caller_clean_bytes + SIZE_PTR, MOD_REG);
1.295 @@ -1099,14 +1193,19 @@
1.296 // call it
1.297 // gcc: clean up
1.298
1.299 + jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR, AlignStack_GCC_ThisOnStack);
1.300 +
1.301 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_override_ret);
1.302 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.303 IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.304 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.305
1.306 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.307 + CheckAlignmentBeforeCall();
1.308 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.309 GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2*SIZE_PTR, MOD_REG));
1.310 +
1.311 + AlignStackAfterCall(tmpAlign);
1.312 }
1.313 else
1.314 {
1.315 @@ -1390,6 +1489,10 @@
1.316
1.317 IA32_Sub_Rm_Imm32(&m_HookFunc, REG_ESP, ComputeVarsSize(), MOD_REG);
1.318
1.319 + // Initial stack alignment
1.320 + IA32_And_Rm_Imm32(&m_HookFunc, REG_ESP, MOD_REG, -16);
1.321 + m_BytesPushedAfterInitialAlignment = 0;
1.322 +
1.323 // init status localvar
1.324 IA32_Mov_Rm_Imm32_Disp8(&m_HookFunc, REG_EBP, MRES_IGNORED, v_status);
1.325
1.326 @@ -1407,6 +1510,8 @@
1.327 {
1.328 // vsnprintf
1.329
1.330 + jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR*3 + sizeof(size_t), AlignStack_GCC_ThisOnStack);
1.331 +
1.332 // push valist, fmt param, maxsize, buffer
1.333 IA32_Push_Reg(&m_HookFunc, REG_EAX);
1.334 IA32_Push_Rm_DispAuto(&m_HookFunc, REG_EBP, param_base_offs + GetParamsTotalStackSize()); // last given param (+4-4, see above)
1.335 @@ -1416,11 +1521,14 @@
1.336
1.337 // call
1.338 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(&vsnprintf));
1.339 + CheckAlignmentBeforeCall();
1.340 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.341
1.342 // Clean up (cdecl)
1.343 IA32_Add_Rm_Imm32(&m_HookFunc, REG_ESP, 0x10, MOD_REG);
1.344
1.345 + AlignStackAfterCall(tmpAlign);
1.346 +
1.347 // Set trailing zero
1.348 IA32_Xor_Reg_Rm(&m_HookFunc, REG_EDX, REG_EDX, MOD_REG);
1.349 IA32_Mov_Rm8_Reg8_DispAuto(&m_HookFunc, REG_EBP, REG_EDX, v_va_buf + SourceHook::STRBUF_LEN - 1);
1.350 @@ -1430,10 +1538,13 @@
1.351 if((m_Proto.GetRet().flags & PassInfo::PassFlag_ByVal) &&
1.352 m_Proto.GetRet().pNormalCtor)
1.353 {
1.354 + jit_int32_t tmpAlign = AlignStackBeforeCall(0, AlignStack_GCC_ThisOnStack);
1.355 +
1.356 // orig_reg
1.357 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.358 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.359 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
1.360 + CheckAlignmentBeforeCall();
1.361 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.362 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.363
1.364 @@ -1441,6 +1552,7 @@
1.365 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_override_ret);
1.366 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.367 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
1.368 + CheckAlignmentBeforeCall();
1.369 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.370 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.371
1.372 @@ -1448,9 +1560,12 @@
1.373 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
1.374 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.375 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
1.376 + CheckAlignmentBeforeCall();
1.377 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.378 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.379
1.380 + AlignStackAfterCall(tmpAlign);
1.381 +
1.382 // _don't_ call a constructor for v_place_for_memret !
1.383 }
1.384
1.385 @@ -1477,6 +1592,9 @@
1.386 CallEndContext(v_pContext);
1.387
1.388 // Call destructors of byval object params which have a destructor
1.389 +
1.390 + jit_int32_t tmpAlign = AlignStackBeforeCall(0, AlignStack_GCC_ThisOnStack);
1.391 +
1.392 jit_int32_t cur_param_pos = param_base_offs;
1.393 for (int i = 0; i < m_Proto.GetNumOfParams(); ++i)
1.394 {
1.395 @@ -1487,11 +1605,16 @@
1.396 {
1.397 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, cur_param_pos);
1.398 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(pi.pDtor));
1.399 + GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.400 + CheckAlignmentBeforeCall();
1.401 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.402 + GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.403 }
1.404 cur_param_pos += GetParamStackSize(pi);
1.405 }
1.406
1.407 + AlignStackAfterCall(tmpAlign);
1.408 +
1.409 DoReturn(v_ret_ptr, v_memret_addr);
1.410
1.411 // Call destructors of orig_ret/ ...
1.412 @@ -1502,26 +1625,37 @@
1.413 IA32_Push_Reg(&m_HookFunc, REG_EAX);
1.414 IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.415
1.416 + m_BytesPushedAfterInitialAlignment += 8;
1.417 +
1.418 + jit_int32_t tmpAlign = AlignStackBeforeCall(0, AlignStack_GCC_ThisOnStack);
1.419 +
1.420 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
1.421 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.422 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.423 + CheckAlignmentBeforeCall();
1.424 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.425 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.426
1.427 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_override_ret);
1.428 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.429 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.430 + CheckAlignmentBeforeCall();
1.431 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.432 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.433
1.434 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.435 GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
1.436 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.437 + CheckAlignmentBeforeCall();
1.438 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.439 GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
1.440
1.441 + AlignStackAfterCall(tmpAlign);
1.442 +
1.443 IA32_Pop_Reg(&m_HookFunc, REG_EDX);
1.444 IA32_Pop_Reg(&m_HookFunc, REG_EAX);
1.445 +
1.446 + m_BytesPushedAfterInitialAlignment -= 8;
1.447 }
1.448
1.449 // epilogue