Return type can now also be an object with normal ctor/copy ctor/dtor/assign op hookman_autogen
Return type can now also be an object with normal ctor/copy ctor/dtor/assign op
1.1 --- a/sourcehook/sourcehook_hookmangen.cpp Thu Nov 01 17:29:39 2007 +0000
1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp Fri Nov 02 00:53:32 2007 +0000
1.3 @@ -147,6 +147,47 @@
1.4 }
1.5 }
1.6
1.7 + void GenContext::BitwiseCopy_Setup()
1.8 + {
1.9 + //cld
1.10 + //push edi
1.11 + //push esi
1.12 +
1.13 + IA32_Cld(&m_HookFunc);
1.14 + IA32_Push_Reg(&m_HookFunc, REG_EDI);
1.15 + IA32_Push_Reg(&m_HookFunc, REG_ESI);
1.16 + }
1.17 +
1.18 + void GenContext::BitwiseCopy_Do(size_t size)
1.19 + {
1.20 + jit_uint32_t dwords = DownCastSize(size) / 4;
1.21 + jit_uint32_t bytes = DownCastSize(size) % 4;
1.22 +
1.23 + //if dwords
1.24 + // mov ecx, <dwords>
1.25 + // rep movsd
1.26 + //if bytes
1.27 + // mov ecx, <bytes>
1.28 + // rep movsb
1.29 + //pop esi
1.30 + //pop edi
1.31 +
1.32 + if (dwords)
1.33 + {
1.34 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, dwords);
1.35 + IA32_Rep(&m_HookFunc);
1.36 + IA32_Movsd(&m_HookFunc);
1.37 + }
1.38 + if (bytes)
1.39 + {
1.40 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, bytes);
1.41 + IA32_Rep(&m_HookFunc);
1.42 + IA32_Movsb(&m_HookFunc);
1.43 + }
1.44 + IA32_Pop_Reg(&m_HookFunc, REG_ESI);
1.45 + IA32_Pop_Reg(&m_HookFunc, REG_EDI);
1.46 + }
1.47 +
1.48 jit_int32_t GenContext::PushRef(jit_int32_t param_offset, const IntPassInfo &pi)
1.49 {
1.50 // push [ebp+<offset>]
1.51 @@ -262,51 +303,24 @@
1.52 }
1.53 else
1.54 {
1.55 - jit_uint32_t dwords = DownCastSize(pi.size) / 4;
1.56 - jit_uint32_t bytes = DownCastSize(pi.size) % 4;
1.57 -
1.58 // bitwise copy
1.59
1.60 - //cld
1.61 - //push edi
1.62 - //push esi
1.63 +
1.64 + BitwiseCopy_Setup();
1.65 +
1.66 //lea edi, [esp+8]
1.67 //lea esi, [ebp+<offs>]
1.68 - //if dwords
1.69 - // mov ecx, <dwords>
1.70 - // rep movsd
1.71 - //if bytes
1.72 - // mov ecx, <bytes>
1.73 - // rep movsb
1.74 - //pop esi
1.75 - //pop edi
1.76 -
1.77 - IA32_Cld(&m_HookFunc);
1.78 - IA32_Push_Reg(&m_HookFunc, REG_EDI);
1.79 - IA32_Push_Reg(&m_HookFunc, REG_ESI);
1.80 IA32_Lea_Reg_DispRegMultImm8(&m_HookFunc, REG_EDI, REG_NOIDX, REG_ESP, NOSCALE, 8);
1.81 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, param_offset);
1.82 - if (dwords)
1.83 - {
1.84 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, dwords);
1.85 - IA32_Rep(&m_HookFunc);
1.86 - IA32_Movsd(&m_HookFunc);
1.87 - }
1.88 - if (bytes)
1.89 - {
1.90 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, bytes);
1.91 - IA32_Rep(&m_HookFunc);
1.92 - IA32_Movsb(&m_HookFunc);
1.93 - }
1.94 - IA32_Pop_Reg(&m_HookFunc, REG_ESI);
1.95 - IA32_Pop_Reg(&m_HookFunc, REG_EDI);
1.96 +
1.97 + BitwiseCopy_Do(pi.size);
1.98 }
1.99
1.100 return DownCastSize(pi.size);
1.101 }
1.102
1.103 // May not touch eax!
1.104 - jit_int32_t GenContext::PushParams(jit_int32_t param_base_offset, jit_int32_t save_ret_to)
1.105 + jit_int32_t GenContext::PushParams(jit_int32_t param_base_offset, jit_int32_t save_ret_to, int v_place_for_memret)
1.106 {
1.107 jit_int32_t added_to_stack = 0;
1.108 jit_int32_t ret = 0;
1.109 @@ -354,7 +368,8 @@
1.110 {
1.111 // push address where to save it!
1.112 int reg = NextRegEBX_ECX_EDX();
1.113 - IA32_Lea_DispRegImmAuto(&m_HookFunc, reg, REG_EBP, save_ret_to);
1.114 + IA32_Lea_DispRegImmAuto(&m_HookFunc, reg, REG_EBP,
1.115 + MemRetWithTempObj() ? v_place_for_memret : save_ret_to);
1.116 IA32_Push_Reg(&m_HookFunc, reg);
1.117
1.118 added_to_stack += SIZE_PTR;
1.119 @@ -363,7 +378,7 @@
1.120 return added_to_stack;
1.121 }
1.122
1.123 - void GenContext::SaveRetVal(int v_where)
1.124 + void GenContext::SaveRetVal(int v_where, int v_place_for_memret)
1.125 {
1.126 size_t size = m_Proto.GetRet().size;
1.127 if (size == 0)
1.128 @@ -373,9 +388,65 @@
1.129 }
1.130
1.131 // Memory return:
1.132 - // PushParams already did everything that was neccessary
1.133 if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
1.134 - return;
1.135 + {
1.136 + if (MemRetWithTempObj())
1.137 + {
1.138 + // *v_where = *v_place_for_memret
1.139 +
1.140 + // if we have an assign operator, use that
1.141 + if (m_Proto.GetRet().pAssignOperator)
1.142 + {
1.143 + // lea edx, [ebp + v_place_for_memret] <-- src addr
1.144 + // lea ecx, [ebp + v_where] <-- dest addr
1.145 + // gcc: push ecx
1.146 + // push edx
1.147 + // call it
1.148 +
1.149 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_place_for_memret);
1.150 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_where);
1.151 +#if SH_COMP == SH_COMP_GCC
1.152 + IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.153 +#endif
1.154 + IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.155 +
1.156 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.157 + IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.158 + }
1.159 + else
1.160 + {
1.161 + // bitwise copy
1.162 + BitwiseCopy_Setup();
1.163 +
1.164 + //lea edi, [evp+v_where] <-- destination
1.165 + //lea esi, [ebp+v_place_for_memret] <-- src
1.166 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDI, REG_EBP, v_where);
1.167 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_place_for_memret);
1.168 +
1.169 + BitwiseCopy_Do(m_Proto.GetRet().size);
1.170 + }
1.171 +
1.172 + // Then: destruct *v_place_for_memret if required
1.173 + if (m_Proto.GetRet().pDtor)
1.174 + {
1.175 + //lea ecx, [ebp+v_place_for_memret]
1.176 + //gcc: push ecx
1.177 + //call it
1.178 +
1.179 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_place_for_memret);
1.180 +#if SH_COMP == SH_COMP_GCC
1.181 + IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.182 +#endif
1.183 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.184 + IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.185 + }
1.186 + }
1.187 + else
1.188 + {
1.189 + // Already copied to correct address -> we're done
1.190 + return;
1.191 + }
1.192 + }
1.193
1.194 if (m_Proto.GetRet().type == PassInfo::PassType_Float)
1.195 {
1.196 @@ -436,6 +507,13 @@
1.197 }
1.198 }
1.199
1.200 + bool GenContext::MemRetWithTempObj()
1.201 + {
1.202 + // Memory return AND (has destructor OR has assign operator)
1.203 + return ((m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
1.204 + && (m_Proto.GetRet().flags & (PassInfo::PassFlag_ODtor | PassInfo::PassFlag_AssignOp)));
1.205 + }
1.206 +
1.207 void GenContext::ProcessPluginRetVal(int v_cur_res, int v_pContext, int v_plugin_ret)
1.208 {
1.209 // only for non-void functions!
1.210 @@ -500,44 +578,15 @@
1.211 }
1.212 else
1.213 {
1.214 - jit_uint32_t dwords = DownCastSize(m_Proto.GetRet().size) / 4;
1.215 - jit_uint32_t bytes = DownCastSize(m_Proto.GetRet().size) % 4;
1.216 + // bitwise copy
1.217 + BitwiseCopy_Setup();
1.218
1.219 - // bitwise copy
1.220 -
1.221 - //cld
1.222 - //push edi
1.223 - //push esi
1.224 //mov edi, eax <-- destination
1.225 //lea esi, [ebp+v_plugin_ret] <-- src
1.226 - //if dwords
1.227 - // mov ecx, <dwords>
1.228 - // rep movsd
1.229 - //if bytes
1.230 - // mov ecx, <bytes>
1.231 - // rep movsb
1.232 - //pop esi
1.233 - //pop edi
1.234 -
1.235 - IA32_Cld(&m_HookFunc);
1.236 - IA32_Push_Reg(&m_HookFunc, REG_EDI);
1.237 - IA32_Push_Reg(&m_HookFunc, REG_ESI);
1.238 IA32_Mov_Reg_Rm(&m_HookFunc, REG_EDI, REG_EAX, MOD_REG);
1.239 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_plugin_ret);
1.240 - if (dwords)
1.241 - {
1.242 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, dwords);
1.243 - IA32_Rep(&m_HookFunc);
1.244 - IA32_Movsd(&m_HookFunc);
1.245 - }
1.246 - if (bytes)
1.247 - {
1.248 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, bytes);
1.249 - IA32_Rep(&m_HookFunc);
1.250 - IA32_Movsb(&m_HookFunc);
1.251 - }
1.252 - IA32_Pop_Reg(&m_HookFunc, REG_ESI);
1.253 - IA32_Pop_Reg(&m_HookFunc, REG_EDI);
1.254 +
1.255 + BitwiseCopy_Do(m_Proto.GetRet().size);
1.256 }
1.257
1.258 m_HookFunc.end_count(counter);
1.259 @@ -600,7 +649,6 @@
1.260 if (!size)
1.261 return;
1.262
1.263 - // :TODO: assign op support
1.264 // :TODO: memory return support
1.265
1.266 // Get real ret pointer into ecx
1.267 @@ -645,7 +693,7 @@
1.268 if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
1.269 {
1.270 // *memret_outaddr = plugin_ret
1.271 - if (m_Proto.GetRet().pAssignOperator)
1.272 + if (m_Proto.GetRet().pCopyCtor)
1.273 {
1.274 // mov edx, ecx <-- src ( we set ecx to [ebp+v_retptr] before )
1.275 // msvc: ecx = [ebp + v_memret_outaddr] <-- dest addr
1.276 @@ -662,49 +710,20 @@
1.277 #endif
1.278 IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.279
1.280 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
1.281 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pCopyCtor));
1.282 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.283 }
1.284 else
1.285 {
1.286 - jit_uint32_t dwords = DownCastSize(m_Proto.GetRet().size) / 4;
1.287 - jit_uint32_t bytes = DownCastSize(m_Proto.GetRet().size) % 4;
1.288 -
1.289 // bitwise copy
1.290 + BitwiseCopy_Setup();
1.291
1.292 - //cld
1.293 - //push edi
1.294 - //push esi
1.295 //mov edi, [ebp+v_memret_outaddr] <-- destination
1.296 //mov esi, ecx <-- src ( we set ecx to [ebp+v_retptr] before )
1.297 - //if dwords
1.298 - // mov ecx, <dwords>
1.299 - // rep movsd
1.300 - //if bytes
1.301 - // mov ecx, <bytes>
1.302 - // rep movsb
1.303 - //pop esi
1.304 - //pop edi
1.305 -
1.306 - IA32_Cld(&m_HookFunc);
1.307 - IA32_Push_Reg(&m_HookFunc, REG_EDI);
1.308 - IA32_Push_Reg(&m_HookFunc, REG_ESI);
1.309 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EDI, REG_EBP, v_memret_outaddr);
1.310 IA32_Mov_Reg_Rm(&m_HookFunc, REG_ESI, REG_ECX, MOD_REG);
1.311 - if (dwords)
1.312 - {
1.313 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, dwords);
1.314 - IA32_Rep(&m_HookFunc);
1.315 - IA32_Movsd(&m_HookFunc);
1.316 - }
1.317 - if (bytes)
1.318 - {
1.319 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, bytes);
1.320 - IA32_Rep(&m_HookFunc);
1.321 - IA32_Movsb(&m_HookFunc);
1.322 - }
1.323 - IA32_Pop_Reg(&m_HookFunc, REG_ESI);
1.324 - IA32_Pop_Reg(&m_HookFunc, REG_EDI);
1.325 +
1.326 + BitwiseCopy_Do(m_Proto.GetRet().size);
1.327 }
1.328
1.329 // In both cases: return the pointer in EAX
1.330 @@ -714,7 +733,7 @@
1.331 }
1.332
1.333 void GenContext::GenerateCallHooks(int v_status, int v_prev_res, int v_cur_res, int v_iter,
1.334 - int v_pContext, int base_param_offset, int v_plugin_ret)
1.335 + int v_pContext, int base_param_offset, int v_plugin_ret, int v_place_for_memret)
1.336 {
1.337 jitoffs_t counter, tmppos;
1.338 jitoffs_t counter2, tmppos2;
1.339 @@ -759,7 +778,7 @@
1.340 // eax = [ecx]
1.341 // eax = [eax+2*SIZE_PTR]
1.342 // call eax
1.343 - jit_int32_t gcc_clean_bytes = PushParams(base_param_offset, v_plugin_ret);
1.344 + jit_int32_t gcc_clean_bytes = PushParams(base_param_offset, v_plugin_ret, v_place_for_memret);
1.345
1.346 IA32_Mov_Reg_Rm(&m_HookFunc, REG_ECX, REG_EAX, MOD_REG);
1.347 #if SH_COMP == SH_COMP_GCC
1.348 @@ -769,7 +788,7 @@
1.349 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EAX, 2*SIZE_PTR);
1.350 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.351
1.352 - SaveRetVal(v_plugin_ret);
1.353 + SaveRetVal(v_plugin_ret, v_place_for_memret);
1.354
1.355 // cleanup
1.356 #if SH_COMP == SH_COMP_GCC
1.357 @@ -831,8 +850,8 @@
1.358 return acc;
1.359 }
1.360
1.361 - void GenContext::GenerateCallOrig(int v_status, int v_pContext,
1.362 - int param_base_offs, int v_this, int v_vfnptr_origentry, int v_orig_ret, int v_override_ret)
1.363 + void GenContext::GenerateCallOrig(int v_status, int v_pContext, int param_base_offs, int v_this,
1.364 + int v_vfnptr_origentry, int v_orig_ret, int v_override_ret, int v_place_for_memret)
1.365 {
1.366 jitoffs_t counter, tmppos;
1.367 jitoffs_t counter2, tmppos2;
1.368 @@ -885,7 +904,7 @@
1.369 m_HookFunc.start_count(counter2);
1.370
1.371 // push params
1.372 - jit_int32_t gcc_clean_bytes = PushParams(param_base_offs, v_orig_ret);
1.373 + jit_int32_t gcc_clean_bytes = PushParams(param_base_offs, v_orig_ret, v_place_for_memret);
1.374
1.375 // thisptr
1.376 IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_this);
1.377 @@ -906,7 +925,7 @@
1.378 #endif
1.379
1.380 // save retval
1.381 - SaveRetVal(v_orig_ret);
1.382 + SaveRetVal(v_orig_ret, v_place_for_memret);
1.383
1.384 // Skip don't call variant
1.385 tmppos3 = IA32_Jump_Imm32(&m_HookFunc, 0);
1.386 @@ -941,44 +960,15 @@
1.387 }
1.388 else
1.389 {
1.390 - jit_uint32_t dwords = DownCastSize(m_Proto.GetRet().size) / 4;
1.391 - jit_uint32_t bytes = DownCastSize(m_Proto.GetRet().size) % 4;
1.392 + // bitwise copy
1.393 + BitwiseCopy_Setup();
1.394
1.395 - // bitwise copy
1.396 -
1.397 - //cld
1.398 - //push edi
1.399 - //push esi
1.400 //lea edi, [ebp+v_orig_ret] <-- destination
1.401 //lea esi, [ebp+v_override_ret] <-- src
1.402 - //if dwords
1.403 - // mov ecx, <dwords>
1.404 - // rep movsd
1.405 - //if bytes
1.406 - // mov ecx, <bytes>
1.407 - // rep movsb
1.408 - //pop esi
1.409 - //pop edi
1.410 -
1.411 - IA32_Cld(&m_HookFunc);
1.412 - IA32_Push_Reg(&m_HookFunc, REG_EDI);
1.413 - IA32_Push_Reg(&m_HookFunc, REG_ESI);
1.414 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDI, REG_EBP, v_orig_ret);
1.415 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_override_ret);
1.416 - if (dwords)
1.417 - {
1.418 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, dwords);
1.419 - IA32_Rep(&m_HookFunc);
1.420 - IA32_Movsd(&m_HookFunc);
1.421 - }
1.422 - if (bytes)
1.423 - {
1.424 - IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, bytes);
1.425 - IA32_Rep(&m_HookFunc);
1.426 - IA32_Movsb(&m_HookFunc);
1.427 - }
1.428 - IA32_Pop_Reg(&m_HookFunc, REG_ESI);
1.429 - IA32_Pop_Reg(&m_HookFunc, REG_EDI);
1.430 +
1.431 + BitwiseCopy_Do(m_Proto.GetRet().size);
1.432 }
1.433
1.434 // skip don't call label target:
1.435 @@ -1134,6 +1124,10 @@
1.436 // my_rettype plugin_ret ebp - 28 - sizeof(my_rettype)*3 -4
1.437 // == + 3 * sizeof(my_rettype) bytes
1.438
1.439 + // if required:
1.440 + // my_rettype place_for_memret ebp - 28 - sizeof(my_rettype)*4 -4
1.441 +
1.442 +
1.443 const jit_int8_t v_vfnptr_origentry = -4 + addstackoffset;
1.444 const jit_int8_t v_status = -8 + addstackoffset;
1.445 const jit_int8_t v_prev_res = -12 + addstackoffset;
1.446 @@ -1160,10 +1154,13 @@
1.447 jit_int32_t v_override_ret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 2;
1.448 jit_int32_t v_plugin_ret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 3;
1.449
1.450 + jit_int32_t v_place_for_memret = -28 + addstackoffset - GetStackSize(m_Proto.GetRet()) * 4;
1.451 +
1.452 // Hash for temporary storage for byval params with copy constructors
1.453 // (param, offset into stack)
1.454 - short usedStackBytes = 3*SIZE_MWORD + 3*SIZE_PTR + // vfnptr_origentry, status, prev_res, cur_res, iter, pContext
1.455 - 3 * GetStackSize(m_Proto.GetRet()) + (m_Proto.GetRet().size == 0 ? 0 : SIZE_PTR) // ret_ptr, orig_ret, override_ret, plugin_ret
1.456 + short usedStackBytes = 3*SIZE_MWORD + 3*SIZE_PTR // vfnptr_origentry, status, prev_res, cur_res, iter, pContext
1.457 + + 3 * GetStackSize(m_Proto.GetRet()) + (m_Proto.GetRet().size == 0 ? 0 : SIZE_PTR) // ret_ptr, orig_ret, override_ret, plugin_ret
1.458 + + (MemRetWithTempObj() ? GetStackSize(m_Proto.GetRet()) : 0)
1.459 - addstackoffset; // msvc: current thisptr
1.460
1.461 IA32_Sub_Rm_Imm32(&m_HookFunc, REG_ESP, usedStackBytes, MOD_REG);
1.462 @@ -1190,6 +1187,8 @@
1.463 IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
1.464 IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
1.465 IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.466 +
1.467 + // _don't_ call a constructor for v_place_for_memret !
1.468 }
1.469
1.470 // ********************** SetupHookLoop **********************
1.471 @@ -1198,15 +1197,15 @@
1.472
1.473 // ********************** call pre hooks **********************
1.474 GenerateCallHooks(v_status, v_prev_res, v_cur_res, v_iter, v_pContext, param_base_offs,
1.475 - v_plugin_ret);
1.476 + v_plugin_ret, v_place_for_memret);
1.477
1.478 // ********************** call orig func **********************
1.479 GenerateCallOrig(v_status, v_pContext, param_base_offs, v_this, v_vfnptr_origentry, v_orig_ret,
1.480 - v_override_ret);
1.481 + v_override_ret, v_place_for_memret);
1.482
1.483 // ********************** call post hooks **********************
1.484 GenerateCallHooks(v_status, v_prev_res, v_cur_res, v_iter, v_pContext, param_base_offs,
1.485 - v_plugin_ret);
1.486 + v_plugin_ret, v_place_for_memret);
1.487
1.488 // ********************** end context and return **********************
1.489
1.490 @@ -1231,7 +1230,37 @@
1.491
1.492 DoReturn(v_ret_ptr, v_memret_addr);
1.493
1.494 - // !! :TODO: Call destructors of orig_ret/ ...
1.495 + // Call destructors of orig_ret/ ...
1.496 + if(m_Proto.GetRet().pDtor)
1.497 + {
1.498 + // Preserve return value in EAX(:EDX)
1.499 + IA32_Push_Reg(&m_HookFunc, REG_EAX);
1.500 + IA32_Push_Reg(&m_HookFunc, REG_EDX);
1.501 +
1.502 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
1.503 +#if SH_COMP == SH_COMP_GCC
1.504 + IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.505 +#endif
1.506 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.507 + IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.508 +
1.509 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_override_ret);
1.510 +#if SH_COMP == SH_COMP_GCC
1.511 + IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.512 +#endif
1.513 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.514 + IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.515 +
1.516 + IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
1.517 +#if SH_COMP == SH_COMP_GCC
1.518 + IA32_Push_Reg(&m_HookFunc, REG_ECX);
1.519 +#endif
1.520 + IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
1.521 + IA32_Call_Reg(&m_HookFunc, REG_EAX);
1.522 +
1.523 + IA32_Pop_Reg(&m_HookFunc, REG_EDX);
1.524 + IA32_Pop_Reg(&m_HookFunc, REG_EAX);
1.525 + }
1.526
1.527 // epilogue
1.528 IA32_Mov_Reg_Rm(&m_HookFunc, REG_ESP, REG_EBP, MOD_REG);
1.529 @@ -1351,17 +1380,16 @@
1.530 if (pi.type == PassInfo::PassType_Object &&
1.531 (pi.flags & PassInfo::PassFlag_ByVal))
1.532 {
1.533 - if ((pi.flags & PassInfo::PassFlag_CCtor) && !pi.pNormalCtor)
1.534 + if ((pi.flags & PassInfo::PassFlag_CCtor) && !pi.pCopyCtor)
1.535 return false;
1.536
1.537 if ((pi.flags & PassInfo::PassFlag_ODtor) && !pi.pDtor)
1.538 return false;
1.539
1.540 - // only care for assignop and normalctor for return types
1.541 - if (is_ret && (pi.flags & PassInfo::PassFlag_AssignOp) && !pi.pAssignOperator)
1.542 + if ((pi.flags & PassInfo::PassFlag_AssignOp) && !pi.pAssignOperator)
1.543 return false;
1.544
1.545 - if (is_ret && (pi.flags & PassInfo::PassFlag_CCtor) && !pi.pNormalCtor)
1.546 + if ((pi.flags & PassInfo::PassFlag_OCtor) && !pi.pNormalCtor)
1.547 return false;
1.548 }
1.549
2.1 --- a/sourcehook/sourcehook_hookmangen.h Thu Nov 01 17:29:39 2007 +0000
2.2 +++ b/sourcehook/sourcehook_hookmangen.h Fri Nov 02 00:53:32 2007 +0000
2.3 @@ -182,28 +182,34 @@
2.4 jit_int32_t GetStackSize(const IntPassInfo &info);
2.5 short GetParamsStackSize(); // sum(GetStackSize(i), 0 <= i < numOfParams)
2.6
2.7 + // Helpers
2.8 + void BitwiseCopy_Setup();
2.9 + void BitwiseCopy_Do(size_t size);
2.10
2.11 // Param push
2.12 - jit_int32_t PushParams(jit_int32_t param_base_offset, jit_int32_t save_ret_to); // save_ret_to only used for memory returns
2.13 + jit_int32_t PushParams(jit_int32_t param_base_offset, jit_int32_t save_ret_to,
2.14 + jit_int32_t v_place_for_memret); // save_ret_to and v_place_for_memret only used for memory returns
2.15 jit_int32_t PushRef(jit_int32_t param_offset, const IntPassInfo &pi);
2.16 jit_int32_t PushBasic(jit_int32_t param_offset, const IntPassInfo &pi);
2.17 jit_int32_t PushFloat(jit_int32_t param_offset, const IntPassInfo &pi);
2.18 jit_int32_t PushObject(jit_int32_t param_offset, const IntPassInfo &pi);
2.19
2.20 // Ret val processing
2.21 - void SaveRetVal(int v_where);
2.22 - void ProcessPluginRetVal(int v_cur_res, int v_pContext, int v_plugin_ret);
2.23 + void SaveRetVal(jit_int32_t v_where, jit_int32_t v_place_for_memret);
2.24 + void ProcessPluginRetVal(jit_int32_t v_cur_res, jit_int32_t v_pContext, jit_int32_t v_plugin_ret);
2.25
2.26 - void PrepareReturn(int v_status, int v_pContext, int v_retptr);
2.27 - void DoReturn(int v_retptr, int v_memret_outaddr);
2.28 + void PrepareReturn(jit_int32_t v_status, jit_int32_t v_pContext, jit_int32_t v_retptr);
2.29 + void DoReturn(jit_int32_t v_retptr, jit_int32_t v_memret_outaddr);
2.30 +
2.31 + bool MemRetWithTempObj(); // do we do a memory return AND need a temporary place for it?
2.32
2.33 // Call hooks
2.34 void GenerateCallHooks(int v_status, int v_prev_res, int v_cur_res, int v_iter,
2.35 - int v_pContext, int base_param_offset, int v_plugin_ret);
2.36 + int v_pContext, int base_param_offset, int v_plugin_ret, int v_place_for_memret);
2.37
2.38 // Call orig
2.39 - void GenerateCallOrig(int v_status, int v_pContext,
2.40 - int param_base_offs, int v_this, int v_vfnptr_origentry, int v_orig_ret, int v_override_ret);
2.41 + void GenerateCallOrig(int v_status, int v_pContext, int param_base_offs, int v_this,
2.42 + int v_vfnptr_origentry, int v_orig_ret, int v_override_ret, int v_place_for_memret);
2.43
2.44 // Hook loop
2.45 void CallSetupHookLoop(int v_orig_ret, int v_override_ret,
3.1 --- a/sourcehook/test/testhookmangen.cpp Thu Nov 01 17:29:39 2007 +0000
3.2 +++ b/sourcehook/test/testhookmangen.cpp Fri Nov 02 00:53:32 2007 +0000
3.3 @@ -41,7 +41,7 @@
3.4 };
3.5
3.6 template <int MYSIZE>
3.7 - std::ostream& operator <<(std::ostream &os, const POD<MYSIZE> &obj)
3.8 + std::ostream& operator <<(std::ostream &os, const POD<MYSIZE> &obj)
3.9 {
3.10 os << "Some POD!";
3.11 return os;
3.12 @@ -50,6 +50,7 @@
3.13 MAKE_STATE_1(State_ObjOCtor_Called, int /*MYSIZE*/);
3.14 MAKE_STATE_1(State_ObjCCtor_Called, int /*MYSIZE*/);
3.15 MAKE_STATE_1(State_ObjODtor_Called, int /*MYSIZE*/);
3.16 + MAKE_STATE_1(State_ObjAssignOp_Called, int /*MYSIZE*/);
3.17
3.18 template <int MYSIZE>
3.19 struct Object
3.20 @@ -82,6 +83,16 @@
3.21 ADD_STATE(State_ObjODtor_Called(MYSIZE));
3.22 }
3.23
3.24 + Object & operator = (const Object &other)
3.25 + {
3.26 + if (!g_Inside_LeafFunc)
3.27 + ADD_STATE(State_ObjAssignOp_Called(MYSIZE));
3.28 +
3.29 + memcpy(reinterpret_cast<void*>(x), reinterpret_cast<const void*>(other.x), MYSIZE);
3.30 +
3.31 + return *this;
3.32 + }
3.33 +
3.34 bool operator==(const Object<MYSIZE> &other)
3.35 {
3.36 return memcmp(reinterpret_cast<void*>(x), reinterpret_cast<const void*>(other.x), MYSIZE) == 0;
3.37 @@ -95,6 +106,51 @@
3.38 return os;
3.39 }
3.40
3.41 + // Because of some weird bug in MSVC < 1400
3.42 +#define MAKE_PODRET(size) \
3.43 + struct PodRet##size \
3.44 + { \
3.45 + POD<size> actPod; \
3.46 + bool operator==(const PodRet##size &other) { return actPod == other.actPod; } \
3.47 + bool operator==(char other) { return actPod == other; } \
3.48 + }; \
3.49 + std::ostream& operator <<(std::ostream &os, const PodRet##size &obj) \
3.50 + { \
3.51 + os << obj.actPod; \
3.52 + return os; \
3.53 + } \
3.54 + template <> struct MakeRet< PodRet##size > \
3.55 + { \
3.56 + static PodRet##size Do(int a) \
3.57 + { \
3.58 + PodRet##size x; \
3.59 + memset(reinterpret_cast<void*>(x.actPod.x), a, size); \
3.60 + return x; \
3.61 + } \
3.62 + };
3.63 +
3.64 +#define MAKE_OBJRET(size) \
3.65 + struct ObjRet##size \
3.66 + { \
3.67 + Object<size> actObj; \
3.68 + bool operator==(const ObjRet##size &other) { return actObj == other.actObj; } \
3.69 + bool operator==(char other) { return actObj == other; } \
3.70 + }; \
3.71 + std::ostream& operator <<(std::ostream &os, const ObjRet##size &obj) \
3.72 + { \
3.73 + os << obj.actObj; \
3.74 + return os; \
3.75 + } \
3.76 + template <> struct MakeRet< ObjRet##size > \
3.77 + { \
3.78 + static ObjRet##size Do(int a) \
3.79 + { \
3.80 + ObjRet##size x; \
3.81 + memset(reinterpret_cast<void*>(x.actObj.x), a, size); \
3.82 + return x; \
3.83 + } \
3.84 + };
3.85 +
3.86 #include "testhookmangen.h"
3.87
3.88 StateList g_States;
3.89 @@ -279,29 +335,43 @@
3.90 THGM_SETUP_RI(105, double, SourceHook::PassInfo::PassType_Float, SourceHook::PassInfo::PassFlag_ByVal);
3.91
3.92 // pod 1-13
3.93 - THGM_MAKE_TEST1(106, POD<1>, int);
3.94 + MAKE_PODRET(1);
3.95 + THGM_MAKE_TEST1(106, PodRet1, int);
3.96 THGM_SETUP_PI1(106,
3.97 int, SourceHook::PassInfo::PassType_Basic, SourceHook::PassInfo::PassFlag_ByVal
3.98 );
3.99 - THGM_SETUP_RI(106, POD<1>, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.100 + THGM_SETUP_RI(106, PodRet1, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.101
3.102 - THGM_MAKE_TEST1(107, POD<4>, int);
3.103 + MAKE_PODRET(4);
3.104 + THGM_MAKE_TEST1(107, PodRet4, int);
3.105 THGM_SETUP_PI1(107,
3.106 int, SourceHook::PassInfo::PassType_Basic, SourceHook::PassInfo::PassFlag_ByVal
3.107 );
3.108 - THGM_SETUP_RI(107, POD<4>, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.109 + THGM_SETUP_RI(107, PodRet4, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.110
3.111 - THGM_MAKE_TEST1(108, POD<8>, int);
3.112 + MAKE_PODRET(8);
3.113 + THGM_MAKE_TEST1(108, PodRet8, int);
3.114 THGM_SETUP_PI1(108,
3.115 int, SourceHook::PassInfo::PassType_Basic, SourceHook::PassInfo::PassFlag_ByVal
3.116 );
3.117 - THGM_SETUP_RI(108, POD<8>, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.118 + THGM_SETUP_RI(108, PodRet8, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.119
3.120 - THGM_MAKE_TEST1(109, POD<13>, int);
3.121 + MAKE_PODRET(13);
3.122 + THGM_MAKE_TEST1(109, PodRet13, int);
3.123 THGM_SETUP_PI1(109,
3.124 int, SourceHook::PassInfo::PassType_Basic, SourceHook::PassInfo::PassFlag_ByVal
3.125 );
3.126 - THGM_SETUP_RI(109, POD<13>, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.127 + THGM_SETUP_RI(109, PodRet13, SourceHook::PassInfo::PassType_Object, SourceHook::PassInfo::PassFlag_ByVal);
3.128 +
3.129 + MAKE_OBJRET(13);
3.130 + THGM_MAKE_TEST1(110, ObjRet13, int);
3.131 + THGM_SETUP_PI1(110,
3.132 + int, SourceHook::PassInfo::PassType_Basic, SourceHook::PassInfo::PassFlag_ByVal
3.133 + );
3.134 + THGM_SETUP_RI(110, ObjRet13, SourceHook::PassInfo::PassType_Object,
3.135 + SourceHook::PassInfo::PassFlag_ByVal | SourceHook::PassInfo::PassFlag_OCtor | SourceHook::PassInfo::PassFlag_ODtor |
3.136 + SourceHook::PassInfo::PassFlag_CCtor | SourceHook::PassInfo::PassFlag_AssignOp);
3.137 +
3.138 }
3.139
3.140 bool TestHookManGen(std::string &error)
3.141 @@ -502,11 +572,196 @@
3.142 THGM_DO_TEST(108, (5));
3.143 THGM_DO_TEST(109, (5));
3.144
3.145 + // Test110: Special: constructors/destructors on return
3.146 + PtrBuf_Clear();
3.147 + ObjRet13 obj13;
3.148 +
3.149 + CHECK_STATES((&g_States,
3.150 + new State_ObjOCtor_Called(13),
3.151 + NULL), "Test110 Part0");
3.152 +
3.153 + setuppi_110();
3.154 + setupri_110();
3.155 +
3.156 + g_Genc110 = new SourceHook::Impl::GenContext(&protoinfo_110, 0, 0, g_SHPtr);
3.157 + g_Genc_ad110.set(g_Genc110);
3.158 + SourceHook::HookManagerPubFunc myhookman110 = g_Genc110->Generate();
3.159 + int hook1_110, hook2_110, hook3_110, hook4_110;
3.160 +
3.161 + TestClass110 *pTest110 = new TestClass110;
3.162 + CAutoPtrDestruction<TestClass110> apd110(pTest110);
3.163 +
3.164 + /* no hooks - no hooks */
3.165 + PtrBuf_Clear();
3.166 + obj13 = pTest110->Func(5);
3.167 +
3.168 + g_Inside_LeafFunc = true;
3.169 + CHECK_STATES((&g_States,
3.170 + new State_Func110(pTest110, ParamState_m110 (5)),
3.171 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.172 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in our stack
3.173 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.174 +
3.175 + new State_ObjAssignOp_Called(13), // assign: obj13 = temporary object in our stack
3.176 + new State_ObjODtor_Called(13), // Func110: destruction of temporary object
3.177 + NULL), "Test" "110" " Part1");
3.178 + g_Inside_LeafFunc = false;
3.179 +
3.180 + /* hook1 - no hooks */
3.181 + THGM_ADD_HOOK(110, 1);
3.182 +
3.183 + PtrBuf_Clear();
3.184 + obj13 = pTest110->Func(5);
3.185 + g_Inside_LeafFunc = true;
3.186 + CHECK_STATES((&g_States,
3.187 + // HookFunc: construct orig_ret/override_ret/plugin_ret objects
3.188 + new State_ObjOCtor_Called(13),
3.189 + new State_ObjOCtor_Called(13),
3.190 + new State_ObjOCtor_Called(13),
3.191 +
3.192 + // Calling delegate
3.193 + new State_Deleg1_110(pTest110, 0, ParamState_m110 (5)),
3.194 +
3.195 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.196 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in HookFunc's stack
3.197 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.198 +
3.199 + // back in hookfunc
3.200 + new State_ObjAssignOp_Called(13), // assign: plugin_ret = temporary object in HookFunc's stack
3.201 + new State_ObjODtor_Called(13), // destruction of temporary object in HookFunc's stack
3.202 +
3.203 + // Calling orig function Func110
3.204 + new State_Func110(pTest110, ParamState_m110 (5)),
3.205 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.206 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in HookFunc's stack
3.207 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.208 +
3.209 + // back in hookfunc
3.210 + new State_ObjAssignOp_Called(13), // assign: orig_ret = temporary object in HookFunc's stack
3.211 + new State_ObjODtor_Called(13), // destruction of temporary object in HookFunc's stack
3.212 +
3.213 + // hookfunc is returning:
3.214 + new State_ObjCCtor_Called(13), // copy to temp object in our stack
3.215 +
3.216 + // hookfunc cleans up its stack -> destroys plugin_ret/override_ret/orig_ret
3.217 + new State_ObjODtor_Called(13),
3.218 + new State_ObjODtor_Called(13),
3.219 + new State_ObjODtor_Called(13),
3.220 +
3.221 + // we are in our function: assign
3.222 + new State_ObjAssignOp_Called(13), // assign: obj13 = temporary object in our stack
3.223 + new State_ObjODtor_Called(13), // Func110: destruction of temporary object
3.224 +
3.225 + NULL), "Test" "11" " Part2");
3.226 +
3.227 + CHECK_COND(obj13 == 0, "Test" "11" " Part 2.1");
3.228 + g_Inside_LeafFunc = false;
3.229 +
3.230 + THGM_REMOVE_HOOK(11, 1);
3.231 +
3.232 + /* hook1, hook2 - hook3, hook4 */
3.233 + THGM_ADD_HOOK(110, 1);
3.234 + THGM_ADD_HOOK(110, 2);
3.235 + THGM_ADD_HOOK(110, 3);
3.236 + THGM_ADD_HOOK(110, 4);
3.237 +
3.238 + PtrBuf_Clear();
3.239 + obj13 = pTest110->Func(5);
3.240 + g_Inside_LeafFunc = true;
3.241 + CHECK_STATES((&g_States,
3.242 + // HookFunc: construct orig_ret/override_ret/plugin_ret objects
3.243 + new State_ObjOCtor_Called(13),
3.244 + new State_ObjOCtor_Called(13),
3.245 + new State_ObjOCtor_Called(13),
3.246 +
3.247 + // Calling delegate1
3.248 + new State_Deleg1_110(pTest110, 0, ParamState_m110 (5)),
3.249 +
3.250 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.251 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in HookFunc's stack
3.252 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.253 +
3.254 + // back in hookfunc
3.255 + new State_ObjAssignOp_Called(13), // assign: plugin_ret = temporary object in HookFunc's stack
3.256 + new State_ObjODtor_Called(13), // destruction of temporary object in HookFunc's stack
3.257 +
3.258 +
3.259 + // Calling delegate2
3.260 + new State_Deleg2_110(pTest110, 1, ParamState_m110 (5)),
3.261 +
3.262 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.263 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in HookFunc's stack
3.264 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.265 +
3.266 + // back in hookfunc
3.267 + new State_ObjAssignOp_Called(13), // assign: plugin_ret = temporary object in HookFunc's stack
3.268 + new State_ObjODtor_Called(13), // destruction of temporary object in HookFunc's stack
3.269 +
3.270 + // hookfunc finds out that the hook wanted to SUPERCEDE --> copy to override_Ret
3.271 + new State_ObjAssignOp_Called(13),
3.272 +
3.273 + // SUPERCEDE -> orig function is not called
3.274 + // instead: orig_ret = override_ret
3.275 + new State_ObjAssignOp_Called(13),
3.276 +
3.277 + // Calling delegate3
3.278 + new State_Deleg3_110(pTest110, 2, ParamState_m110 (5)),
3.279 +
3.280 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.281 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in HookFunc's stack
3.282 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.283 +
3.284 + // back in hookfunc
3.285 + new State_ObjAssignOp_Called(13), // assign: plugin_ret = temporary object in HookFunc's stack
3.286 + new State_ObjODtor_Called(13), // destruction of temporary object in HookFunc's stack
3.287 +
3.288 + // Calling delegate4
3.289 + new State_Deleg4_110(pTest110, 3, ParamState_m110 (5)),
3.290 +
3.291 + new State_ObjOCtor_Called(13), // MakeRet: Construction of x
3.292 + new State_ObjCCtor_Called(13), // Return from MakeRet -> construct temporary object in HookFunc's stack
3.293 + new State_ObjODtor_Called(13), // MakeRet: Destruction of x
3.294 +
3.295 + // back in hookfunc
3.296 + new State_ObjAssignOp_Called(13), // assign: plugin_ret = temporary object in HookFunc's stack
3.297 + new State_ObjODtor_Called(13), // destruction of temporary object in HookFunc's stack
3.298 +
3.299 + // hookfunc finds out that the hook wanted to SUPERCEDE --> copy to override_Ret (yes really, we overwrite the old value!)
3.300 + new State_ObjAssignOp_Called(13),
3.301 +
3.302 + // hookfunc is returning:
3.303 + new State_ObjCCtor_Called(13), // copy to temp object in our stack
3.304 +
3.305 + // hookfunc cleans up its stack -> destroys plugin_ret/override_ret/orig_ret
3.306 + new State_ObjODtor_Called(13),
3.307 + new State_ObjODtor_Called(13),
3.308 + new State_ObjODtor_Called(13),
3.309 +
3.310 + // we are in our function: assign
3.311 + new State_ObjAssignOp_Called(13), // assign: obj13 = temporary object in our stack
3.312 + new State_ObjODtor_Called(13), // Func110: destruction of temporary object
3.313 +
3.314 + NULL), "Test" "11" " Part3");
3.315 +
3.316 + CHECK_COND(obj13 == 4, "Test" "11" " Part 3.1");
3.317 + g_Inside_LeafFunc = false;
3.318 +
3.319 + THGM_REMOVE_HOOK(110, 1);
3.320 + THGM_REMOVE_HOOK(110, 2);
3.321 + THGM_REMOVE_HOOK(110, 3);
3.322 + THGM_REMOVE_HOOK(110, 4);
3.323 +
3.324 // Shutdown now!
3.325 // If we don't SH will auto-shutdown _after_ genc's destructor is called
3.326 // -> crash
3.327
3.328 Test_CompleteShutdown(g_SHPtr);
3.329 +
3.330 + CHECK_COND(sizeof(PodRet1) == 1, "WTF!");
3.331 + CHECK_COND(sizeof(PodRet4) == 4, "WTF!");
3.332 + CHECK_COND(sizeof(PodRet8) == 8, "WTF!");
3.333 + CHECK_COND(sizeof(PodRet13) == 13, "WTF!");
3.334 +
3.335 return true;
3.336 }
3.337
4.1 --- a/sourcehook/test/testhookmangen.h Thu Nov 01 17:29:39 2007 +0000
4.2 +++ b/sourcehook/test/testhookmangen.h Fri Nov 02 00:53:32 2007 +0000
4.3 @@ -29,6 +29,11 @@
4.4 {
4.5 reinterpret_cast<T*>(this)->~T();
4.6 }
4.7 +
4.8 + const T& AssignOp(const T &other)
4.9 + {
4.10 + return (*reinterpret_cast<T*>(this) = other);
4.11 + }
4.12 };
4.13
4.14
4.15 @@ -90,7 +95,7 @@
4.16 {
4.17 static T Do(int a)
4.18 {
4.19 - return static_cast<T>(a);
4.20 + return a;
4.21 }
4.22 };
4.23
4.24 @@ -530,7 +535,7 @@
4.25 ADD_STATE(State_Func##id(this, ParamState_m##id())); \
4.26 g_Inside_LeafFunc = false; \
4.27 \
4.28 - return MakeRet<ret_type>::Do(0); \
4.29 + return MakeRet< ret_type >::Do(0); \
4.30 } \
4.31 \
4.32 struct Delegate1 : public MyDelegate \
4.33 @@ -543,10 +548,10 @@
4.34 if (ms_DoRecall) \
4.35 { \
4.36 \
4.37 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, ()); \
4.38 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, ()); \
4.39 } \
4.40 else \
4.41 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.42 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.43 } \
4.44 }; \
4.45 struct Delegate2 : public MyDelegate \
4.46 @@ -559,10 +564,10 @@
4.47 if (ms_DoRecall) \
4.48 { \
4.49 \
4.50 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, ()); \
4.51 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, ()); \
4.52 } \
4.53 else \
4.54 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.55 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.56 } \
4.57 }; \
4.58 struct Delegate3 : public MyDelegate \
4.59 @@ -575,10 +580,10 @@
4.60 if (ms_DoRecall) \
4.61 { \
4.62 \
4.63 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, ()); \
4.64 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, ()); \
4.65 } \
4.66 else \
4.67 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.68 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.69 } \
4.70 }; \
4.71 struct Delegate4 : public MyDelegate \
4.72 @@ -591,10 +596,10 @@
4.73 if (ms_DoRecall) \
4.74 { \
4.75 \
4.76 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, ()); \
4.77 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, ()); \
4.78 } \
4.79 else \
4.80 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.81 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.82 }; \
4.83 }; \
4.84 }; \
4.85 @@ -619,6 +624,7 @@
4.86 \
4.87 \
4.88 \
4.89 + \
4.90 }
4.91
4.92
4.93 @@ -739,7 +745,7 @@
4.94 ADD_STATE(State_Func##id(this, ParamState_m##id(p1))); \
4.95 g_Inside_LeafFunc = false; \
4.96 \
4.97 - return MakeRet<ret_type>::Do(0); \
4.98 + return MakeRet< ret_type >::Do(0); \
4.99 } \
4.100 \
4.101 struct Delegate1 : public MyDelegate \
4.102 @@ -752,10 +758,10 @@
4.103 if (ms_DoRecall) \
4.104 { \
4.105 Increment<StripRef< param1 >::type>::Incr(p1); \
4.106 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (p1)); \
4.107 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (p1)); \
4.108 } \
4.109 else \
4.110 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.111 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.112 } \
4.113 }; \
4.114 struct Delegate2 : public MyDelegate \
4.115 @@ -768,10 +774,10 @@
4.116 if (ms_DoRecall) \
4.117 { \
4.118 Increment<StripRef< param1 >::type>::Incr(p1); \
4.119 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (p1)); \
4.120 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (p1)); \
4.121 } \
4.122 else \
4.123 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.124 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.125 } \
4.126 }; \
4.127 struct Delegate3 : public MyDelegate \
4.128 @@ -784,10 +790,10 @@
4.129 if (ms_DoRecall) \
4.130 { \
4.131 Increment<StripRef< param1 >::type>::Incr(p1); \
4.132 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (p1)); \
4.133 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (p1)); \
4.134 } \
4.135 else \
4.136 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.137 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.138 } \
4.139 }; \
4.140 struct Delegate4 : public MyDelegate \
4.141 @@ -800,10 +806,10 @@
4.142 if (ms_DoRecall) \
4.143 { \
4.144 Increment<StripRef< param1 >::type>::Incr(p1); \
4.145 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (p1)); \
4.146 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (p1)); \
4.147 } \
4.148 else \
4.149 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.150 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.151 }; \
4.152 }; \
4.153 }; \
4.154 @@ -828,6 +834,7 @@
4.155 paraminfos2_##id[1].pNormalCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::NormalConstructor) : NULL; \
4.156 paraminfos2_##id[1].pCopyCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::CopyConstructor) : NULL; \
4.157 paraminfos2_##id[1].pDtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::Destructor) : NULL; \
4.158 + paraminfos2_##id[1].pAssignOperator = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::AssignOp) : NULL; \
4.159 }
4.160
4.161
4.162 @@ -948,7 +955,7 @@
4.163 ADD_STATE(State_Func##id(this, ParamState_m##id(p1, p2))); \
4.164 g_Inside_LeafFunc = false; \
4.165 \
4.166 - return MakeRet<ret_type>::Do(0); \
4.167 + return MakeRet< ret_type >::Do(0); \
4.168 } \
4.169 \
4.170 struct Delegate1 : public MyDelegate \
4.171 @@ -961,10 +968,10 @@
4.172 if (ms_DoRecall) \
4.173 { \
4.174 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2); \
4.175 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (p1, p2)); \
4.176 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (p1, p2)); \
4.177 } \
4.178 else \
4.179 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.180 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.181 } \
4.182 }; \
4.183 struct Delegate2 : public MyDelegate \
4.184 @@ -977,10 +984,10 @@
4.185 if (ms_DoRecall) \
4.186 { \
4.187 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2); \
4.188 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (p1, p2)); \
4.189 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (p1, p2)); \
4.190 } \
4.191 else \
4.192 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.193 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.194 } \
4.195 }; \
4.196 struct Delegate3 : public MyDelegate \
4.197 @@ -993,10 +1000,10 @@
4.198 if (ms_DoRecall) \
4.199 { \
4.200 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2); \
4.201 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (p1, p2)); \
4.202 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (p1, p2)); \
4.203 } \
4.204 else \
4.205 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.206 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.207 } \
4.208 }; \
4.209 struct Delegate4 : public MyDelegate \
4.210 @@ -1009,10 +1016,10 @@
4.211 if (ms_DoRecall) \
4.212 { \
4.213 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2); \
4.214 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (p1, p2)); \
4.215 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (p1, p2)); \
4.216 } \
4.217 else \
4.218 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.219 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.220 }; \
4.221 }; \
4.222 }; \
4.223 @@ -1037,6 +1044,7 @@
4.224 paraminfos2_##id[1].pNormalCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[2].pNormalCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::NormalConstructor) : NULL; \
4.225 paraminfos2_##id[1].pCopyCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[2].pCopyCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::CopyConstructor) : NULL; \
4.226 paraminfos2_##id[1].pDtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::Destructor) : NULL; paraminfos2_##id[2].pDtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::Destructor) : NULL; \
4.227 + paraminfos2_##id[1].pAssignOperator = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::AssignOp) : NULL; paraminfos2_##id[2].pAssignOperator = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::AssignOp) : NULL; \
4.228 }
4.229
4.230
4.231 @@ -1157,7 +1165,7 @@
4.232 ADD_STATE(State_Func##id(this, ParamState_m##id(p1, p2, p3))); \
4.233 g_Inside_LeafFunc = false; \
4.234 \
4.235 - return MakeRet<ret_type>::Do(0); \
4.236 + return MakeRet< ret_type >::Do(0); \
4.237 } \
4.238 \
4.239 struct Delegate1 : public MyDelegate \
4.240 @@ -1170,10 +1178,10 @@
4.241 if (ms_DoRecall) \
4.242 { \
4.243 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3); \
4.244 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (p1, p2, p3)); \
4.245 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (p1, p2, p3)); \
4.246 } \
4.247 else \
4.248 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.249 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.250 } \
4.251 }; \
4.252 struct Delegate2 : public MyDelegate \
4.253 @@ -1186,10 +1194,10 @@
4.254 if (ms_DoRecall) \
4.255 { \
4.256 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3); \
4.257 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (p1, p2, p3)); \
4.258 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (p1, p2, p3)); \
4.259 } \
4.260 else \
4.261 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.262 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.263 } \
4.264 }; \
4.265 struct Delegate3 : public MyDelegate \
4.266 @@ -1202,10 +1210,10 @@
4.267 if (ms_DoRecall) \
4.268 { \
4.269 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3); \
4.270 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (p1, p2, p3)); \
4.271 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (p1, p2, p3)); \
4.272 } \
4.273 else \
4.274 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.275 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.276 } \
4.277 }; \
4.278 struct Delegate4 : public MyDelegate \
4.279 @@ -1218,10 +1226,10 @@
4.280 if (ms_DoRecall) \
4.281 { \
4.282 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3); \
4.283 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (p1, p2, p3)); \
4.284 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (p1, p2, p3)); \
4.285 } \
4.286 else \
4.287 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.288 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.289 }; \
4.290 }; \
4.291 }; \
4.292 @@ -1246,6 +1254,7 @@
4.293 paraminfos2_##id[1].pNormalCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[2].pNormalCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[3].pNormalCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::NormalConstructor) : NULL; \
4.294 paraminfos2_##id[1].pCopyCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[2].pCopyCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[3].pCopyCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::CopyConstructor) : NULL; \
4.295 paraminfos2_##id[1].pDtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::Destructor) : NULL; paraminfos2_##id[2].pDtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::Destructor) : NULL; paraminfos2_##id[3].pDtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::Destructor) : NULL; \
4.296 + paraminfos2_##id[1].pAssignOperator = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::AssignOp) : NULL; paraminfos2_##id[2].pAssignOperator = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::AssignOp) : NULL; paraminfos2_##id[3].pAssignOperator = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::AssignOp) : NULL; \
4.297 }
4.298
4.299
4.300 @@ -1366,7 +1375,7 @@
4.301 ADD_STATE(State_Func##id(this, ParamState_m##id(p1, p2, p3, p4))); \
4.302 g_Inside_LeafFunc = false; \
4.303 \
4.304 - return MakeRet<ret_type>::Do(0); \
4.305 + return MakeRet< ret_type >::Do(0); \
4.306 } \
4.307 \
4.308 struct Delegate1 : public MyDelegate \
4.309 @@ -1379,10 +1388,10 @@
4.310 if (ms_DoRecall) \
4.311 { \
4.312 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4); \
4.313 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.314 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.315 } \
4.316 else \
4.317 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.318 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.319 } \
4.320 }; \
4.321 struct Delegate2 : public MyDelegate \
4.322 @@ -1395,10 +1404,10 @@
4.323 if (ms_DoRecall) \
4.324 { \
4.325 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4); \
4.326 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.327 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.328 } \
4.329 else \
4.330 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.331 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.332 } \
4.333 }; \
4.334 struct Delegate3 : public MyDelegate \
4.335 @@ -1411,10 +1420,10 @@
4.336 if (ms_DoRecall) \
4.337 { \
4.338 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4); \
4.339 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.340 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.341 } \
4.342 else \
4.343 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.344 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.345 } \
4.346 }; \
4.347 struct Delegate4 : public MyDelegate \
4.348 @@ -1427,10 +1436,10 @@
4.349 if (ms_DoRecall) \
4.350 { \
4.351 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4); \
4.352 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.353 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (p1, p2, p3, p4)); \
4.354 } \
4.355 else \
4.356 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.357 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.358 }; \
4.359 }; \
4.360 }; \
4.361 @@ -1455,6 +1464,7 @@
4.362 paraminfos2_##id[1].pNormalCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[2].pNormalCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[3].pNormalCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[4].pNormalCtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::NormalConstructor) : NULL; \
4.363 paraminfos2_##id[1].pCopyCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[2].pCopyCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[3].pCopyCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[4].pCopyCtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::CopyConstructor) : NULL; \
4.364 paraminfos2_##id[1].pDtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::Destructor) : NULL; paraminfos2_##id[2].pDtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::Destructor) : NULL; paraminfos2_##id[3].pDtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::Destructor) : NULL; paraminfos2_##id[4].pDtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::Destructor) : NULL; \
4.365 + paraminfos2_##id[1].pAssignOperator = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::AssignOp) : NULL; paraminfos2_##id[2].pAssignOperator = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::AssignOp) : NULL; paraminfos2_##id[3].pAssignOperator = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::AssignOp) : NULL; paraminfos2_##id[4].pAssignOperator = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::AssignOp) : NULL; \
4.366 }
4.367
4.368
4.369 @@ -1575,7 +1585,7 @@
4.370 ADD_STATE(State_Func##id(this, ParamState_m##id(p1, p2, p3, p4, p5))); \
4.371 g_Inside_LeafFunc = false; \
4.372 \
4.373 - return MakeRet<ret_type>::Do(0); \
4.374 + return MakeRet< ret_type >::Do(0); \
4.375 } \
4.376 \
4.377 struct Delegate1 : public MyDelegate \
4.378 @@ -1588,10 +1598,10 @@
4.379 if (ms_DoRecall) \
4.380 { \
4.381 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5); \
4.382 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.383 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.384 } \
4.385 else \
4.386 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.387 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.388 } \
4.389 }; \
4.390 struct Delegate2 : public MyDelegate \
4.391 @@ -1604,10 +1614,10 @@
4.392 if (ms_DoRecall) \
4.393 { \
4.394 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5); \
4.395 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.396 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.397 } \
4.398 else \
4.399 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.400 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.401 } \
4.402 }; \
4.403 struct Delegate3 : public MyDelegate \
4.404 @@ -1620,10 +1630,10 @@
4.405 if (ms_DoRecall) \
4.406 { \
4.407 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5); \
4.408 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.409 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.410 } \
4.411 else \
4.412 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.413 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.414 } \
4.415 }; \
4.416 struct Delegate4 : public MyDelegate \
4.417 @@ -1636,10 +1646,10 @@
4.418 if (ms_DoRecall) \
4.419 { \
4.420 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5); \
4.421 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.422 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (p1, p2, p3, p4, p5)); \
4.423 } \
4.424 else \
4.425 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.426 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.427 }; \
4.428 }; \
4.429 }; \
4.430 @@ -1664,6 +1674,7 @@
4.431 paraminfos2_##id[1].pNormalCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[2].pNormalCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[3].pNormalCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[4].pNormalCtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[5].pNormalCtor = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::NormalConstructor) : NULL; \
4.432 paraminfos2_##id[1].pCopyCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[2].pCopyCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[3].pCopyCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[4].pCopyCtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[5].pCopyCtor = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::CopyConstructor) : NULL; \
4.433 paraminfos2_##id[1].pDtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::Destructor) : NULL; paraminfos2_##id[2].pDtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::Destructor) : NULL; paraminfos2_##id[3].pDtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::Destructor) : NULL; paraminfos2_##id[4].pDtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::Destructor) : NULL; paraminfos2_##id[5].pDtor = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::Destructor) : NULL; \
4.434 + paraminfos2_##id[1].pAssignOperator = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::AssignOp) : NULL; paraminfos2_##id[2].pAssignOperator = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::AssignOp) : NULL; paraminfos2_##id[3].pAssignOperator = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::AssignOp) : NULL; paraminfos2_##id[4].pAssignOperator = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::AssignOp) : NULL; paraminfos2_##id[5].pAssignOperator = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::AssignOp) : NULL; \
4.435 }
4.436
4.437
4.438 @@ -1784,7 +1795,7 @@
4.439 ADD_STATE(State_Func##id(this, ParamState_m##id(p1, p2, p3, p4, p5, p6))); \
4.440 g_Inside_LeafFunc = false; \
4.441 \
4.442 - return MakeRet<ret_type>::Do(0); \
4.443 + return MakeRet< ret_type >::Do(0); \
4.444 } \
4.445 \
4.446 struct Delegate1 : public MyDelegate \
4.447 @@ -1797,10 +1808,10 @@
4.448 if (ms_DoRecall) \
4.449 { \
4.450 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5);Increment<StripRef< param6 >::type>::Incr(p6); \
4.451 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.452 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.453 } \
4.454 else \
4.455 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
4.456 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
4.457 } \
4.458 }; \
4.459 struct Delegate2 : public MyDelegate \
4.460 @@ -1813,10 +1824,10 @@
4.461 if (ms_DoRecall) \
4.462 { \
4.463 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5);Increment<StripRef< param6 >::type>::Incr(p6); \
4.464 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.465 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.466 } \
4.467 else \
4.468 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
4.469 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
4.470 } \
4.471 }; \
4.472 struct Delegate3 : public MyDelegate \
4.473 @@ -1829,10 +1840,10 @@
4.474 if (ms_DoRecall) \
4.475 { \
4.476 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5);Increment<StripRef< param6 >::type>::Incr(p6); \
4.477 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.478 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.479 } \
4.480 else \
4.481 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
4.482 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
4.483 } \
4.484 }; \
4.485 struct Delegate4 : public MyDelegate \
4.486 @@ -1845,10 +1856,10 @@
4.487 if (ms_DoRecall) \
4.488 { \
4.489 Increment<StripRef< param1 >::type>::Incr(p1);Increment<StripRef< param2 >::type>::Incr(p2);Increment<StripRef< param3 >::type>::Incr(p3);Increment<StripRef< param4 >::type>::Incr(p4);Increment<StripRef< param5 >::type>::Incr(p5);Increment<StripRef< param6 >::type>::Incr(p6); \
4.490 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.491 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (p1, p2, p3, p4, p5, p6)); \
4.492 } \
4.493 else \
4.494 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
4.495 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
4.496 }; \
4.497 }; \
4.498 }; \
4.499 @@ -1873,6 +1884,7 @@
4.500 paraminfos2_##id[1].pNormalCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[2].pNormalCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[3].pNormalCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[4].pNormalCtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[5].pNormalCtor = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::NormalConstructor) : NULL; paraminfos2_##id[6].pNormalCtor = (paraminfos_##id[6].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p6_type >::type>::NormalConstructor) : NULL; \
4.501 paraminfos2_##id[1].pCopyCtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[2].pCopyCtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[3].pCopyCtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[4].pCopyCtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[5].pCopyCtor = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::CopyConstructor) : NULL; paraminfos2_##id[6].pCopyCtor = (paraminfos_##id[6].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p6_type >::type>::CopyConstructor) : NULL; \
4.502 paraminfos2_##id[1].pDtor = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::Destructor) : NULL; paraminfos2_##id[2].pDtor = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::Destructor) : NULL; paraminfos2_##id[3].pDtor = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::Destructor) : NULL; paraminfos2_##id[4].pDtor = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::Destructor) : NULL; paraminfos2_##id[5].pDtor = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::Destructor) : NULL; paraminfos2_##id[6].pDtor = (paraminfos_##id[6].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p6_type >::type>::Destructor) : NULL; \
4.503 + paraminfos2_##id[1].pAssignOperator = (paraminfos_##id[1].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p1_type >::type>::AssignOp) : NULL; paraminfos2_##id[2].pAssignOperator = (paraminfos_##id[2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p2_type >::type>::AssignOp) : NULL; paraminfos2_##id[3].pAssignOperator = (paraminfos_##id[3].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p3_type >::type>::AssignOp) : NULL; paraminfos2_##id[4].pAssignOperator = (paraminfos_##id[4].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p4_type >::type>::AssignOp) : NULL; paraminfos2_##id[5].pAssignOperator = (paraminfos_##id[5].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p5_type >::type>::AssignOp) : NULL; paraminfos2_##id[6].pAssignOperator = (paraminfos_##id[6].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p6_type >::type>::AssignOp) : NULL; \
4.504 }
4.505
4.506
4.507 @@ -1887,6 +1899,7 @@
4.508 protoinfo_##id.retPassInfo2.pNormalCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::NormalConstructor) : NULL; \
4.509 protoinfo_##id.retPassInfo2.pCopyCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::CopyConstructor) : NULL; \
4.510 protoinfo_##id.retPassInfo2.pDtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::Destructor) : NULL; \
4.511 + protoinfo_##id.retPassInfo2.pAssignOperator = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::AssignOp) : NULL; \
4.512 }
4.513
4.514 #define THGM_ADD_HOOK(id, num) \
5.1 --- a/sourcehook/test/testhookmangen.hxx Thu Nov 01 17:29:39 2007 +0000
5.2 +++ b/sourcehook/test/testhookmangen.hxx Fri Nov 02 00:53:32 2007 +0000
5.3 @@ -29,6 +29,11 @@
5.4 {
5.5 reinterpret_cast<T*>(this)->~T();
5.6 }
5.7 +
5.8 + const T& AssignOp(const T &other)
5.9 + {
5.10 + return (*reinterpret_cast<T*>(this) = other);
5.11 + }
5.12 };
5.13
5.14
5.15 @@ -99,7 +104,7 @@
5.16 {
5.17 static POD<SIZE> Do(int a)
5.18 {
5.19 - POD x;
5.20 + POD<SIZE> x;
5.21 memset(reinterpret_cast<void*>(x.x), a, SIZE);
5.22 return x;
5.23 }
5.24 @@ -272,7 +277,7 @@
5.25 ADD_STATE(State_Func##id(this, ParamState_m##id(@[$2,1,$1|, :p$2@]))); \
5.26 g_Inside_LeafFunc = false; \
5.27 \
5.28 - return MakeRet<ret_type>::Do(0); \
5.29 + return MakeRet< ret_type >::Do(0); \
5.30 } \
5.31 \
5.32 struct Delegate1 : public MyDelegate \
5.33 @@ -285,10 +290,10 @@
5.34 if (ms_DoRecall) \
5.35 { \
5.36 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
5.37 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.38 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(1), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.39 } \
5.40 else \
5.41 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(1)); \
5.42 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(1)); \
5.43 } \
5.44 }; \
5.45 struct Delegate2 : public MyDelegate \
5.46 @@ -301,10 +306,10 @@
5.47 if (ms_DoRecall) \
5.48 { \
5.49 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
5.50 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.51 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.52 } \
5.53 else \
5.54 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(2)); \
5.55 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(2)); \
5.56 } \
5.57 }; \
5.58 struct Delegate3 : public MyDelegate \
5.59 @@ -317,10 +322,10 @@
5.60 if (ms_DoRecall) \
5.61 { \
5.62 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
5.63 - RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet<ret_type>::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.64 + RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, MakeRet< ret_type >::Do(3), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.65 } \
5.66 else \
5.67 - RETURN_META_VALUE(MRES_IGNORED, MakeRet<ret_type>::Do(3)); \
5.68 + RETURN_META_VALUE(MRES_IGNORED, MakeRet< ret_type >::Do(3)); \
5.69 } \
5.70 }; \
5.71 struct Delegate4 : public MyDelegate \
5.72 @@ -333,10 +338,10 @@
5.73 if (ms_DoRecall) \
5.74 { \
5.75 @[$2,1,$1:Increment<StripRef< param$2 >::type>::Incr(p$2);@] \
5.76 - RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.77 + RETURN_META_VALUE_NEWPARAMS(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4), &TestClass##id::Func, (@[$2,1,$1|, :p$2@])); \
5.78 } \
5.79 else \
5.80 - RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet<ret_type>::Do(4)); \
5.81 + RETURN_META_VALUE(MRES_SUPERCEDE, MakeRet< ret_type >::Do(4)); \
5.82 }; \
5.83 }; \
5.84 }; \
5.85 @@ -361,6 +366,7 @@
5.86 @[$2,1,$1: paraminfos2_##id[$2].pNormalCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::NormalConstructor) : NULL; @] \
5.87 @[$2,1,$1: paraminfos2_##id[$2].pCopyCtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::CopyConstructor) : NULL; @] \
5.88 @[$2,1,$1: paraminfos2_##id[$2].pDtor = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::Destructor) : NULL; @] \
5.89 + @[$2,1,$1: paraminfos2_##id[$2].pAssignOperator = (paraminfos_##id[$2].flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< p$2_type >::type>::AssignOp) : NULL; @] \
5.90 }
5.91
5.92 @]
5.93 @@ -375,6 +381,7 @@
5.94 protoinfo_##id.retPassInfo2.pNormalCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_OCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::NormalConstructor) : NULL; \
5.95 protoinfo_##id.retPassInfo2.pCopyCtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_CCtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::CopyConstructor) : NULL; \
5.96 protoinfo_##id.retPassInfo2.pDtor = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_ODtor) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::Destructor) : NULL; \
5.97 + protoinfo_##id.retPassInfo2.pAssignOperator = (protoinfo_##id.retPassInfo.flags & SourceHook::PassInfo::PassFlag_AssignOp) ? FindFuncAddr(&Ctor_Thunk<StripRef< ret_type >::type>::AssignOp) : NULL; \
5.98 }
5.99
5.100 #define THGM_ADD_HOOK(id, num) \