sourcehook/sourcehook_hookmangen.cpp
branchhookman_autogen
changeset 438 bafcc3c3538f
parent 437 89cf494f6088
child 439 30d2be004032
     1.1 --- a/sourcehook/sourcehook_hookmangen.cpp	Fri Nov 02 00:53:32 2007 +0000
     1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp	Fri Nov 02 11:59:57 2007 +0000
     1.3 @@ -380,13 +380,22 @@
     1.4  
     1.5  		void GenContext::SaveRetVal(int v_where, int v_place_for_memret)
     1.6  		{
     1.7 -			size_t size = m_Proto.GetRet().size;
     1.8 +			size_t size = GetRealSize(m_Proto.GetRet());
     1.9  			if (size == 0)
    1.10  			{
    1.11  				// No return value -> nothing
    1.12  				return;
    1.13  			}
    1.14  
    1.15 +			if (m_Proto.GetRet().flags & PassInfo::PassFlag_ByRef)
    1.16 +			{
    1.17 +				// mov [ebp + v_plugin_ret], eax
    1.18 +				IA32_Mov_Rm_Reg_DispAuto(&m_HookFunc, REG_EBP, REG_EAX, v_where);
    1.19 +				return;
    1.20 +			}
    1.21 +			// else: ByVal
    1.22 +
    1.23 +
    1.24  			// Memory return:
    1.25  			if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
    1.26  			{
    1.27 @@ -557,36 +566,46 @@
    1.28  
    1.29  
    1.30  			// *eax = plugin_ret
    1.31 -			if (m_Proto.GetRet().pAssignOperator)
    1.32 +			if (m_Proto.GetRet().flags & PassInfo::PassFlag_ByRef)
    1.33  			{
    1.34 -				// lea edx, [ebp + v_plugin_ret]
    1.35 -				// msvc: ecx = eax				<-- dest addr
    1.36 -				// gcc: push eax				<-- dest addr
    1.37 -				// push edx					<-- src addr
    1.38 -				// call it
    1.39 -
    1.40 -				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_plugin_ret);
    1.41 -#if SH_COMP == SH_COMP_MSVC
    1.42 -				IA32_Mov_Reg_Rm(&m_HookFunc, REG_ECX, REG_EAX, MOD_REG);
    1.43 -#elif SH_COMP == SH_COMP_GCC
    1.44 -				IA32_Push_Reg(&m_HookFunc, REG_EAX);
    1.45 -#endif
    1.46 -				IA32_Push_Reg(&m_HookFunc, REG_EDX);
    1.47 -
    1.48 -				IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
    1.49 -				IA32_Call_Reg(&m_HookFunc, REG_EAX);
    1.50 +				// mov ecx, [ebp+v_plugin_ret]
    1.51 +				// mov [eax], ecx
    1.52 +				IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_plugin_ret);
    1.53 +				IA32_Mov_Rm_Reg(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
    1.54  			}
    1.55  			else
    1.56  			{
    1.57 -				// bitwise copy
    1.58 -				BitwiseCopy_Setup();
    1.59 +				if (m_Proto.GetRet().pAssignOperator)
    1.60 +				{
    1.61 +					// lea edx, [ebp + v_plugin_ret]
    1.62 +					// msvc: ecx = eax				<-- dest addr
    1.63 +					// gcc: push eax				<-- dest addr
    1.64 +					// push edx					<-- src addr
    1.65 +					// call it
    1.66 +
    1.67 +					IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EDX, REG_EBP, v_plugin_ret);
    1.68 +#if SH_COMP == SH_COMP_MSVC
    1.69 +					IA32_Mov_Reg_Rm(&m_HookFunc, REG_ECX, REG_EAX, MOD_REG);
    1.70 +#elif SH_COMP == SH_COMP_GCC
    1.71 +					IA32_Push_Reg(&m_HookFunc, REG_EAX);
    1.72 +#endif
    1.73 +					IA32_Push_Reg(&m_HookFunc, REG_EDX);
    1.74  
    1.75 -				//mov edi, eax					<-- destination
    1.76 -				//lea esi, [ebp+v_plugin_ret]	<-- src
    1.77 -				IA32_Mov_Reg_Rm(&m_HookFunc, REG_EDI, REG_EAX, MOD_REG);
    1.78 -				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_plugin_ret);
    1.79 +					IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
    1.80 +					IA32_Call_Reg(&m_HookFunc, REG_EAX);
    1.81 +				}
    1.82 +				else
    1.83 +				{
    1.84 +					// bitwise copy
    1.85 +					BitwiseCopy_Setup();
    1.86  
    1.87 -				BitwiseCopy_Do(m_Proto.GetRet().size);
    1.88 +					//mov edi, eax					<-- destination
    1.89 +					//lea esi, [ebp+v_plugin_ret]	<-- src
    1.90 +					IA32_Mov_Reg_Rm(&m_HookFunc, REG_EDI, REG_EAX, MOD_REG);
    1.91 +					IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ESI, REG_EBP, v_plugin_ret);
    1.92 +
    1.93 +					BitwiseCopy_Do(m_Proto.GetRet().size);
    1.94 +				}
    1.95  			}
    1.96  
    1.97  			m_HookFunc.end_count(counter);
    1.98 @@ -649,12 +668,18 @@
    1.99  			if (!size)
   1.100  				return;
   1.101  
   1.102 -			// :TODO: memory return support
   1.103 -
   1.104  			// Get real ret pointer into ecx
   1.105  			// mov ecx, [ebp + v_ret_ptr]
   1.106  			IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_ECX, REG_EBP, v_retptr);
   1.107  
   1.108 +			if (m_Proto.GetRet().flags & PassInfo::PassFlag_ByRef)
   1.109 +			{
   1.110 +				// mov eax, [ecx]
   1.111 +				IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
   1.112 +				return;
   1.113 +			}
   1.114 +			// else: byval
   1.115 +
   1.116  			if (m_Proto.GetRet().type == PassInfo::PassType_Float)
   1.117  			{
   1.118  				if (size == 4)
   1.119 @@ -1441,6 +1466,12 @@
   1.120  					}
   1.121  				}
   1.122  			}
   1.123 +			else
   1.124 +			{
   1.125 +				// byref: make sure that the flag is _not_ set
   1.126 +				pi.flags &= ~PassInfo::PassFlag_RetMem;
   1.127 +				pi.flags |= PassInfo::PassFlag_RetReg;
   1.128 +			}
   1.129  		}
   1.130  
   1.131  		HookManagerPubFunc GenContext::Generate()