core/sourcehook/sourcehook_hookmangen.cpp
changeset 685 522727461c0d
parent 539 db914129ae01
child 733 2365240861a2
     1.1 --- a/core/sourcehook/sourcehook_hookmangen.cpp	Tue Nov 24 07:19:57 2009 -0600
     1.2 +++ b/core/sourcehook/sourcehook_hookmangen.cpp	Tue Nov 24 07:33:52 2009 -0600
     1.3 @@ -1,5 +1,5 @@
     1.4  /* ======== SourceHook ========
     1.5 -* Copyright (C) 2004-2008 Metamod:Source Development Team
     1.6 +* Copyright (C) 2004-2009 Metamod:Source Development Team
     1.7  * No warranties of any kind
     1.8  *
     1.9  * License: zlib/libpng
    1.10 @@ -873,7 +873,7 @@
    1.11  					// mov eax, [ecx]
    1.12  					// mov edx, [ecx+4]
    1.13  					IA32_Mov_Reg_Rm(&m_HookFunc, REG_EAX, REG_ECX, MOD_MEM_REG);
    1.14 -					IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EAX, REG_ECX, 4);
    1.15 +					IA32_Mov_Reg_Rm_DispAuto(&m_HookFunc, REG_EDX, REG_ECX, 4);
    1.16  				}
    1.17  				else
    1.18  				{
    1.19 @@ -1869,8 +1869,18 @@
    1.20  						// MSVC seems to return _all_ structs, classes, unions in memory
    1.21  						pi.flags |= PassInfo::PassFlag_RetMem;
    1.22  #elif SH_COMP == SH_COMP_GCC
    1.23 -						// Same goes for GCC :)
    1.24 -						pi.flags |= PassInfo::PassFlag_RetMem;
    1.25 +#if SH_SYS == SH_SYS_APPLE
    1.26 +						// Apple GCC returns in memory if size isn't a power of 2 or > 8
    1.27 +						if ((pi.size & (pi.size - 1)) == 0 && pi.size <= 8)
    1.28 +						{
    1.29 +							pi.flags |= PassInfo::PassFlag_RetReg;
    1.30 +						}
    1.31 +						else
    1.32 +#endif
    1.33 +						{
    1.34 +							// GCC on Linux does same thing as MSVC
    1.35 +							pi.flags |= PassInfo::PassFlag_RetMem;
    1.36 +						}
    1.37  #endif
    1.38  					}
    1.39  				}