sourcehook/sourcehook_hookmangen.cpp
branchhookman_autogen
changeset 447 4dce98820544
parent 442 07575ad47137
child 448 742b470c0e5c
     1.1 --- a/sourcehook/sourcehook_hookmangen.cpp	Tue Nov 06 22:04:38 2007 +0000
     1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp	Wed Nov 07 15:15:05 2007 +0000
     1.3 @@ -19,6 +19,14 @@
     1.4  #include "sourcehook_hookmangen_x86.h"
     1.5  #include "sh_memory.h"
     1.6  
     1.7 +#if SH_COMP == SH_COMP_MSVC
     1.8 +# define GCC_ONLY(x)
     1.9 +# define MSVC_ONLY(x) x
    1.10 +#elif SH_COMP == SH_COMP_GCC
    1.11 +# define GCC_ONLY(x) x
    1.12 +# define MSVC_ONLY(x)
    1.13 +#endif
    1.14 +
    1.15  // :TODO: test BIG vtable indices
    1.16  
    1.17  namespace SourceHook
    1.18 @@ -293,12 +301,10 @@
    1.19  				IA32_Lea_Reg_DispRegMultImm8(&m_HookFunc, REG_ECX, REG_NOIDX, REG_ESP, NOSCALE, 4);
    1.20  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EAX, REG_EBP, param_offset);
    1.21  				IA32_Push_Reg(&m_HookFunc, REG_EAX);
    1.22 -#if SH_COMP == SH_COMP_GCC
    1.23 -				IA32_Push_Reg(&m_HookFunc, REG_ECX);
    1.24 -#endif
    1.25 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
    1.26  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EDX, DownCastPtr(pi.pCopyCtor));
    1.27  				IA32_Call_Reg(&m_HookFunc, REG_EDX);
    1.28 -
    1.29 +				GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
    1.30  				IA32_Pop_Reg(&m_HookFunc, REG_EAX);
    1.31  			}
    1.32  			else
    1.33 @@ -408,19 +414,19 @@
    1.34  					{
    1.35  						// lea edx, [ebp + v_place_for_memret]  <-- src addr
    1.36  						// lea ecx, [ebp + v_where]				<-- dest addr
    1.37 +						// push edx
    1.38  						// gcc: push ecx
    1.39 -						// push edx
    1.40  						// call it
    1.41 +						// gcc: clean up
    1.42  
    1.43  						IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_place_for_memret);
    1.44  						IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_where);
    1.45 -#if SH_COMP == SH_COMP_GCC
    1.46 -						IA32_Push_Reg(&m_HookFunc, REG_ECX);
    1.47 -#endif
    1.48  						IA32_Push_Reg(&m_HookFunc, REG_EDX);
    1.49 +						GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
    1.50  
    1.51  						IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
    1.52  						IA32_Call_Reg(&m_HookFunc, REG_EAX);
    1.53 +						GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
    1.54  					}
    1.55  					else
    1.56  					{
    1.57 @@ -441,13 +447,13 @@
    1.58  						//lea ecx, [ebp+v_place_for_memret]
    1.59  						//gcc: push ecx
    1.60  						//call it
    1.61 +						//gcc: clean up
    1.62  
    1.63  						IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_place_for_memret);
    1.64 -#if SH_COMP == SH_COMP_GCC
    1.65 -						IA32_Push_Reg(&m_HookFunc, REG_ECX);
    1.66 -#endif
    1.67 +						GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
    1.68  						IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
    1.69  						IA32_Call_Reg(&m_HookFunc, REG_EAX);
    1.70 +						GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
    1.71  					}
    1.72  				}
    1.73  				else
    1.74 @@ -554,15 +560,15 @@
    1.75  			//   eax = [ecx]
    1.76  			//   eax = [eax + 4]
    1.77  			//   call eax
    1.78 +			//   gcc: clean up
    1.79  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_pContext);
    1.80 -#if SH_COMP == SH_COMP_GCC
    1.81 -			IA32_Push_Reg(&m_HookFunc, REG_ECX);
    1.82 -#endif
    1.83 +			GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
    1.84  
    1.85  			// vtbloffs=0, vtblidx=1
    1.86  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
    1.87  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EAX, 4);
    1.88  			IA32_Call_Reg(&m_HookFunc, REG_EAX);
    1.89 +			GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
    1.90  
    1.91  
    1.92  			// *eax = plugin_ret
    1.93 @@ -578,21 +584,23 @@
    1.94  				if (m_Proto.GetRet().pAssignOperator)
    1.95  				{
    1.96  					// lea edx, [ebp + v_plugin_ret]
    1.97 +					// push edx					<-- src addr
    1.98  					// msvc: ecx = eax				<-- dest addr
    1.99  					// gcc: push eax				<-- dest addr
   1.100 -					// push edx					<-- src addr
   1.101  					// call it
   1.102 +					// gcc: clean up
   1.103  
   1.104  					IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_plugin_ret);
   1.105 +					IA32_Push_Reg(&m_HookFunc, REG_EDX);
   1.106  #if SH_COMP == SH_COMP_MSVC
   1.107  					IA32_Mov_Reg_Rm(&m_HookFunc, REG_ECX, REG_EAX, MOD_REG);
   1.108  #elif SH_COMP == SH_COMP_GCC
   1.109  					IA32_Push_Reg(&m_HookFunc, REG_EAX);
   1.110  #endif
   1.111 -					IA32_Push_Reg(&m_HookFunc, REG_EDX);
   1.112  
   1.113  					IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
   1.114  					IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.115 +					GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
   1.116  				}
   1.117  				else
   1.118  				{
   1.119 @@ -642,11 +650,10 @@
   1.120  			//   mov edx, [edx]
   1.121  
   1.122  			//   call edx
   1.123 +			// gcc: clean up
   1.124  
   1.125  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_pContext);
   1.126 -#if SH_COMP == SH_COMP_GCC
   1.127 -			IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.128 -#endif
   1.129 +			GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.130  			IA32_Xor_Reg_Rm(&m_HookFunc, REG_EAX, REG_EAX, MOD_REG);
   1.131  			IA32_Cmp_Rm_Disp8_Imm8(&m_HookFunc, REG_EBP, v_status, MRES_OVERRIDE);
   1.132  			IA32_SetCC_Rm8(&m_HookFunc, REG_EAX, CC_L);
   1.133 @@ -658,6 +665,7 @@
   1.134  
   1.135  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_EDX, REG_EDX, MOD_MEM_REG);
   1.136  			IA32_Call_Reg(&m_HookFunc, REG_EDX);
   1.137 +			GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.138  
   1.139  			IA32_Mov_Rm_Reg_DispAuto(&m_HookFunc, REG_EBP, REG_EAX, v_retptr);
   1.140  		}
   1.141 @@ -721,22 +729,24 @@
   1.142  				if (m_Proto.GetRet().pCopyCtor)
   1.143  				{
   1.144  					// mov edx, ecx				<-- src	( we set ecx to [ebp+v_retptr] before )
   1.145 +					// push edx					<-- src addr
   1.146  					// msvc: ecx = [ebp + v_memret_outaddr]				<-- dest addr
   1.147  					// gcc: push [ebp + v_memret_outaddr]				<-- dest addr
   1.148 -					// push edx					<-- src addr
   1.149  					// call it
   1.150 +					// gcc: clean up
   1.151  
   1.152  					IA32_Mov_Reg_Rm(&m_HookFunc, REG_EDX, REG_ECX, MOD_REG);
   1.153 +					IA32_Push_Reg(&m_HookFunc, REG_EDX);
   1.154  
   1.155  #if SH_COMP == SH_COMP_MSVC
   1.156  					IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_memret_outaddr);
   1.157  #elif SH_COMP == SH_COMP_GCC
   1.158  					IA32_Push_Rm_DispAuto(&m_HookFunc, REG_EBP, v_memret_outaddr);
   1.159  #endif
   1.160 -					IA32_Push_Reg(&m_HookFunc, REG_EDX);
   1.161  
   1.162  					IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pCopyCtor));
   1.163  					IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.164 +					GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
   1.165  				}
   1.166  				else
   1.167  				{
   1.168 @@ -776,15 +786,15 @@
   1.169  			//   eax = [ecx]
   1.170  			//   eax = [eax]
   1.171  			//   call eax
   1.172 +			// gcc: clean up
   1.173  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_pContext);
   1.174 -#if SH_COMP == SH_COMP_GCC
   1.175 -			IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.176 -#endif
   1.177 +			GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.178  
   1.179  			// vtbloffs=0, vtblidx=0
   1.180  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
   1.181  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_EAX, MOD_MEM_REG);
   1.182  			IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.183 +			GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.184  
   1.185  			// quit on zero
   1.186  			//  test eax, eax
   1.187 @@ -803,12 +813,12 @@
   1.188  			//   eax = [ecx]
   1.189  			//   eax = [eax+2*SIZE_PTR]
   1.190  			//   call eax
   1.191 +			//   gcc: clean up 
   1.192 +
   1.193  			jit_int32_t gcc_clean_bytes = PushParams(base_param_offset, v_plugin_ret, v_place_for_memret);
   1.194  
   1.195  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_ECX, REG_EAX, MOD_REG);
   1.196 -#if SH_COMP == SH_COMP_GCC
   1.197 -			IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.198 -#endif
   1.199 +			GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.200  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
   1.201  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_EAX, 2*SIZE_PTR);
   1.202  			IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.203 @@ -816,10 +826,8 @@
   1.204  			SaveRetVal(v_plugin_ret, v_place_for_memret);
   1.205  
   1.206  			// cleanup
   1.207 -#if SH_COMP == SH_COMP_GCC
   1.208  			// params + thisptr
   1.209 -			IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, gcc_clean_bytes + SIZE_PTR, MOD_REG);
   1.210 -#endif
   1.211 +			GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, gcc_clean_bytes + SIZE_PTR, MOD_REG));
   1.212  
   1.213  			// process meta return:
   1.214  			//  prev_res = cur_res
   1.215 @@ -914,15 +922,15 @@
   1.216  			//   eax = [ecx]
   1.217  			//   eax = [eax + 3*PTR_SIZE]
   1.218  			//   call eax
   1.219 +			// gcc: clean up
   1.220  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_pContext);
   1.221 -#if SH_COMP == SH_COMP_GCC
   1.222 -			IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.223 -#endif
   1.224 +			GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.225  
   1.226  			// vtbloffs=0, vtblidx=3
   1.227  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
   1.228  			IA32_Mov_Reg_Rm_Disp8(&m_HookFunc, REG_EAX, REG_EAX, 3*SIZE_PTR);
   1.229  			IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.230 +			GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.231  
   1.232  			IA32_Test_Rm_Reg8(&m_HookFunc, REG_EAX, REG_EAX, MOD_REG);
   1.233  			tmppos2 = IA32_Jump_Cond_Imm32(&m_HookFunc, CC_Z, 0);
   1.234 @@ -979,19 +987,19 @@
   1.235  				{
   1.236  					// lea edx, [ebp + v_override_ret]			<-- src addr
   1.237  					// lea ecx, [ebp + v_orig_ret]				<-- dest addr
   1.238 +					// push edx					<-- src addr
   1.239  					// gcc: push ecx
   1.240 -					// push edx					<-- src addr
   1.241  					// call it
   1.242 +					// gcc: clean up
   1.243  
   1.244  					IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_override_ret);
   1.245  					IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
   1.246 -#if SH_COMP == SH_COMP_GCC
   1.247 -					IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.248 -#endif
   1.249  					IA32_Push_Reg(&m_HookFunc, REG_EDX);
   1.250 +					GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.251  
   1.252  					IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
   1.253  					IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.254 +					GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2*SIZE_PTR, MOD_REG));
   1.255  				}
   1.256  				else
   1.257  				{
   1.258 @@ -1067,7 +1075,7 @@
   1.259  			// set up thisptr
   1.260  #if SH_COMP == SH_COMP_GCC
   1.261  			//  on gcc/mingw, this is the first parameter
   1.262 -			IA32_Push_Imm32(&m_HookFunc, DownCastPtr(m_SHPtr));
   1.263 +			GCC_ONLY(IA32_Push_Imm32(&m_HookFunc, DownCastPtr(m_SHPtr)));
   1.264  #elif SH_COMP == SH_COMP_MSVC
   1.265  			//  on msvc, it's ecx
   1.266  			IA32_Mov_Reg_Imm32(&m_HookFunc, REG_ECX, DownCastPtr(m_SHPtr));
   1.267 @@ -1081,10 +1089,8 @@
   1.268  			IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.269  
   1.270  			// on gcc/mingw, we have to clean up after the call
   1.271 -#if SH_COMP == SH_COMP_GCC
   1.272  			// 9 params + hidden thisptr param
   1.273 -			IA32_Add_Rm_Imm8(&m_HookFunc, REG_ESP, 10*SIZE_PTR, MOD_REG);
   1.274 -#endif
   1.275 +			GCC_ONLY(IA32_Add_Rm_Imm8(&m_HookFunc, REG_ESP, 10*SIZE_PTR, MOD_REG));
   1.276  
   1.277  			// store return value
   1.278  			IA32_Mov_Rm_Reg_Disp8(&m_HookFunc, REG_EBP, REG_EAX, v_pContext);
   1.279 @@ -1113,10 +1119,8 @@
   1.280  			IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.281  
   1.282  			// on gcc/mingw, we have to clean up after the call
   1.283 -#if SH_COMP == SH_COMP_GCC
   1.284  			// 1 param + hidden thisptr param
   1.285 -			IA32_Add_Rm_Imm8(&m_HookFunc, REG_ESP, 2*SIZE_PTR, MOD_REG);
   1.286 -#endif
   1.287 +			GCC_ONLY(IA32_Add_Rm_Imm8(&m_HookFunc, REG_ESP, 2*SIZE_PTR, MOD_REG));
   1.288  		}
   1.289  
   1.290  		void * GenContext::GenerateHookFunc()
   1.291 @@ -1132,7 +1136,7 @@
   1.292  			const int addstackoffset = -4;
   1.293  			IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.294  #elif SH_COMP == SH_COMP_GCC
   1.295 -			const jit_int8_t v_this = 8;		// first param
   1.296 +			const jit_int8_t v_this = 12;		// first param
   1.297  			const int addstackoffset = 0;
   1.298  #endif
   1.299  
   1.300 @@ -1212,18 +1216,24 @@
   1.301  
   1.302  				// orig_reg
   1.303  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
   1.304 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.305  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
   1.306  				IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.307 +				GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.308  
   1.309  				// override_reg
   1.310  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_override_ret);
   1.311 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.312  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
   1.313  				IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.314 +				GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.315  
   1.316  				// plugin_ret
   1.317  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
   1.318 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.319  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pNormalCtor));
   1.320  				IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.321 +				GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.322  
   1.323  				// _don't_ call a constructor for v_place_for_memret !
   1.324  			}
   1.325 @@ -1276,25 +1286,22 @@
   1.326  				IA32_Push_Reg(&m_HookFunc, REG_EDX);
   1.327  
   1.328  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
   1.329 -#if SH_COMP == SH_COMP_GCC
   1.330 -				IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.331 -#endif
   1.332 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.333  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
   1.334  				IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.335 +				GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.336  
   1.337  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_override_ret);
   1.338 -#if SH_COMP == SH_COMP_GCC
   1.339 -				IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.340 -#endif
   1.341 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.342  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
   1.343  				IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.344 +				GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.345  
   1.346  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_orig_ret);
   1.347 -#if SH_COMP == SH_COMP_GCC
   1.348 -				IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.349 -#endif
   1.350 +				GCC_ONLY(IA32_Push_Reg(&m_HookFunc, REG_ECX));
   1.351  				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pDtor));
   1.352  				IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.353 +				GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
   1.354  
   1.355  				IA32_Pop_Reg(&m_HookFunc, REG_EDX);
   1.356  				IA32_Pop_Reg(&m_HookFunc, REG_EAX);
   1.357 @@ -1304,7 +1311,8 @@
   1.358  			IA32_Mov_Reg_Rm(&m_HookFunc, REG_ESP, REG_EBP, MOD_REG);
   1.359  			IA32_Pop_Reg(&m_HookFunc, REG_EBX);
   1.360  			IA32_Pop_Reg(&m_HookFunc, REG_EBP);
   1.361 -			IA32_Return_Popstack(&m_HookFunc, GetParamsStackSize());
   1.362 +			MSVC_ONLY(IA32_Return_Popstack(&m_HookFunc, GetParamsStackSize()));
   1.363 +			GCC_ONLY(IA32_Return(&m_HookFunc));   // :TODO: ?? Memory return? Should I pop 4 bytes then?
   1.364  
   1.365  			// Store pointer for later use
   1.366  			// m_HookfuncVfnPtr is a pointer to a void* because SH expects a pointer
   1.367 @@ -1487,6 +1495,23 @@
   1.368  			}
   1.369  		}
   1.370  
   1.371 +		void GenContext::AutoDetectParamFlags()
   1.372 +		{
   1.373 +#if SH_COMP == SH_COMP_GCC
   1.374 +			// On GCC, all objects are passed by reference if they have a destructor
   1.375 +			for (int i = 0; i < m_Proto.GetNumOfParams(); ++i)
   1.376 +			{
   1.377 +				IntPassInfo &pi = m_Proto.GetParam(i);
   1.378 +				if (pi.type == PassInfo::PassType_Object &&
   1.379 +					(pi.flags & PassInfo::PassFlag_ODtor))
   1.380 +				{
   1.381 +					pi.flags &= ~PassInfo::PassFlag_ByVal;
   1.382 +					pi.flags |= PassInfo::PassFlag_ByRef;
   1.383 +				}
   1.384 +			}
   1.385 +#endif
   1.386 +		}
   1.387 +
   1.388  		HookManagerPubFunc GenContext::Generate()
   1.389  		{
   1.390  			Clear();
   1.391 @@ -1504,6 +1529,7 @@
   1.392  			}
   1.393  
   1.394  			AutoDetectRetType();
   1.395 +			AutoDetectParamFlags();
   1.396  
   1.397  			if (m_Proto.GetConvention() != ProtoInfo::CallConv_Cdecl &&
   1.398  				m_Proto.GetConvention() != ProtoInfo::CallConv_ThisCall)