sourcehook/sourcehook_hookmangen.cpp
branchhookman_autogen
changeset 470 862a6376a785
parent 468 88027ecc83c4
child 471 793d778812fa
     1.1 --- a/sourcehook/sourcehook_hookmangen.cpp	Fri Nov 23 15:08:44 2007 +0000
     1.2 +++ b/sourcehook/sourcehook_hookmangen.cpp	Fri Nov 23 15:09:36 2007 +0000
     1.3 @@ -126,21 +126,25 @@
     1.4  
     1.5  		jit_int32_t GenContext::GetRealSize(const IntPassInfo &info)
     1.6  		{
     1.7 -			if (info.flags & PassInfo::PassFlag_ByRef)
     1.8 +			if (info.flags & (PassInfo::PassFlag_ByRef | PassFlag_ForcedByRef))
     1.9  			{
    1.10  				return SIZE_PTR;
    1.11  			}
    1.12  			return static_cast<jit_int32_t>(info.size);
    1.13  		}
    1.14  
    1.15 +		jit_int32_t GenContext::AlignSize(jit_int32_t x, jit_int32_t boundary)
    1.16 +		{
    1.17 +			if (x % boundary != 0)
    1.18 +				x = (x & ~(boundary-1)) + boundary;
    1.19 +			return x;
    1.20 +		}
    1.21 +		
    1.22  		// Computes size on the stack
    1.23 -		jit_int32_t GenContext::GetStackSize(const IntPassInfo &info)
    1.24 +		jit_int32_t GenContext::GetParamStackSize(const IntPassInfo &info)
    1.25  		{
    1.26  			// Align up to 4 byte boundaries
    1.27 -			jit_int32_t rs = GetRealSize(info);
    1.28 -			if (rs % 4 != 0)
    1.29 -				rs = (rs & ~(3)) + 4;
    1.30 -			return rs;
    1.31 +			return AlignSize(GetRealSize(info), 4);
    1.32  		}
    1.33  
    1.34  		jit_int8_t GenContext::NextRegEBX_ECX_EDX()
    1.35 @@ -199,12 +203,12 @@
    1.36  			IA32_Pop_Reg(&m_HookFunc, REG_EDI);
    1.37  		}
    1.38  
    1.39 -		short GenContext::GetParamsStackSize()
    1.40 +		short GenContext::GetParamsTotalStackSize()
    1.41  		{
    1.42  			short acc = 0;
    1.43  			for (int i = 0; i < m_Proto.GetNumOfParams(); ++i)
    1.44  			{
    1.45 -				acc += GetStackSize(m_Proto.GetParam(i));
    1.46 +				acc += GetParamStackSize(m_Proto.GetParam(i));
    1.47  			}
    1.48  
    1.49  			return acc;
    1.50 @@ -216,7 +220,7 @@
    1.51  			for (int i = 0; i < p; ++i)
    1.52  			{
    1.53  				if (m_Proto.GetParam(i).flags & PassFlag_ForcedByRef)
    1.54 -					off += GetStackSize(m_Proto.GetParam(i));
    1.55 +					off += AlignSize(m_Proto.GetParam(i).size, 4);
    1.56  			}
    1.57  			return off;
    1.58  		}
    1.59 @@ -318,7 +322,7 @@
    1.60  			{
    1.61  				// make room on the stack
    1.62  				// sub esp, <size>
    1.63 -				IA32_Sub_Rm_ImmAuto(&m_HookFunc, REG_ESP, GetStackSize(pi), MOD_REG);
    1.64 +				IA32_Sub_Rm_ImmAuto(&m_HookFunc, REG_ESP, GetParamStackSize(pi), MOD_REG);
    1.65  			}
    1.66  
    1.67  			// if there is a copy constructor..
    1.68 @@ -404,14 +408,14 @@
    1.69  			jit_int32_t cur_offset = param_base_offset;
    1.70  			for (int i = 0; i < m_Proto.GetNumOfParams(); ++i)
    1.71  			{
    1.72 -				cur_offset += GetStackSize(m_Proto.GetParam(i));
    1.73 +				cur_offset += GetParamStackSize(m_Proto.GetParam(i));
    1.74  			}
    1.75  
    1.76  			// push parameters in reverse order
    1.77  			for (int i = m_Proto.GetNumOfParams() - 1; i >= 0; --i)
    1.78  			{
    1.79  				const IntPassInfo &pi = m_Proto.GetParam(i);
    1.80 -				cur_offset -= GetStackSize(pi);
    1.81 +				cur_offset -= GetParamStackSize(pi);
    1.82  				if (pi.flags & PassInfo::PassFlag_ByVal)
    1.83  				{
    1.84  					switch (pi.type)
    1.85 @@ -1351,15 +1355,15 @@
    1.86  			if (m_Proto.GetRet().size != 0)
    1.87  			{
    1.88  				v_ret_ptr =				AddVarToFrame(SIZE_PTR);
    1.89 -				v_orig_ret =			AddVarToFrame(GetStackSize(m_Proto.GetRet()));
    1.90 -				v_override_ret =		AddVarToFrame(GetStackSize(m_Proto.GetRet()));
    1.91 -				v_plugin_ret =			AddVarToFrame(GetStackSize(m_Proto.GetRet()));
    1.92 +				v_orig_ret =			AddVarToFrame(GetParamStackSize(m_Proto.GetRet()));
    1.93 +				v_override_ret =		AddVarToFrame(GetParamStackSize(m_Proto.GetRet()));
    1.94 +				v_plugin_ret =			AddVarToFrame(GetParamStackSize(m_Proto.GetRet()));
    1.95  			}
    1.96  
    1.97  			jit_int32_t v_place_for_memret = 0;
    1.98  			if (MemRetWithTempObj())
    1.99  			{
   1.100 -				v_place_for_memret = 	AddVarToFrame(GetStackSize(m_Proto.GetRet()));
   1.101 +				v_place_for_memret = 	AddVarToFrame(GetParamStackSize(m_Proto.GetRet()));
   1.102  			}
   1.103  
   1.104  			jit_int32_t v_place_fbrr_base  = 0;
   1.105 @@ -1393,7 +1397,7 @@
   1.106  				// lea eax, [ebp + param_base_offs + paramssize]
   1.107  				// mov argptr, eax
   1.108  
   1.109 -				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EAX, REG_EBP, param_base_offs + GetParamsStackSize() + SIZE_PTR);	// +SIZE_PTR: last const char * is not in protoinfo
   1.110 +				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_EAX, REG_EBP, param_base_offs + GetParamsTotalStackSize() + SIZE_PTR);	// +SIZE_PTR: last const char * is not in protoinfo
   1.111  				IA32_Mov_Rm_Reg_DispAuto(&m_HookFunc, REG_EBP, REG_EAX, v_va_argptr);
   1.112  			}
   1.113  			if (m_Proto.GetConvention() & ProtoInfo::CallConv_HasVafmt)
   1.114 @@ -1402,7 +1406,7 @@
   1.115  				
   1.116  				// push valist, fmt param, maxsize, buffer
   1.117  				IA32_Push_Reg(&m_HookFunc, REG_EAX);
   1.118 -				IA32_Push_Rm_DispAuto(&m_HookFunc, REG_EBP, param_base_offs + GetParamsStackSize());		// last given param (+4-4, see above)
   1.119 +				IA32_Push_Rm_DispAuto(&m_HookFunc, REG_EBP, param_base_offs + GetParamsTotalStackSize());		// last given param (+4-4, see above)
   1.120  				IA32_Push_Imm32(&m_HookFunc, SourceHook::STRBUF_LEN - 1);
   1.121  				IA32_Lea_DispRegImmAuto(&m_HookFunc, REG_ECX, REG_EBP, v_va_buf);
   1.122  				IA32_Push_Reg(&m_HookFunc, REG_ECX);
   1.123 @@ -1482,7 +1486,7 @@
   1.124  					IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(pi.pDtor));
   1.125  					IA32_Call_Reg(&m_HookFunc, REG_EAX);
   1.126  				}
   1.127 -				cur_param_pos += GetStackSize(pi);
   1.128 +				cur_param_pos += GetParamStackSize(pi);
   1.129  			}
   1.130  
   1.131  			DoReturn(v_ret_ptr, v_memret_addr);
   1.132 @@ -1527,7 +1531,7 @@
   1.133  				// msvc without varargs:
   1.134  				//  callee cleans the stack
   1.135  
   1.136 -				short cleansize = GetParamsStackSize();
   1.137 +				short cleansize = GetParamsTotalStackSize();
   1.138  				// Memory return: address is first param
   1.139  				if (m_Proto.GetRet().flags & PassInfo::PassFlag_RetMem)
   1.140  					cleansize += SIZE_PTR;