jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2024-12-29 15:23:02 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

SilentPatchIII: Add GCC/Clang-specific inline assembly statements

Browse source 
This also matches the MSVC statements more closely to the GCC/Clang
ones
This commit is contained in:
Echo J 2024-11-04 17:14:10 +02:00
parent b7a08843be
commit 3f26e0045e
1 changed files with 272 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

317
SilentPatchIII/SilentPatchIII.cpp
View file

@ -196,36 +196,70 @@ void ResetMousePos()
void __declspec(naked) M16StatsFix() void __declspec(naked) M16StatsFix()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
add eax, 34h add eax, 0x34
add ebx, 34h add ebx, 0x34
mov ecx, [InstantHitsFiredByPlayer] mov ecx, InstantHitsFiredByPlayer
inc [ecx] inc dword ptr [ecx]
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"add eax, 0x34\n"
"add ebx, 0x34\n"
"mov ecx, %[InstantHitsFiredByPlayer]\n"
"inc dword ptr [ecx]\n"
"ret"
:: [InstantHitsFiredByPlayer] "m" (InstantHitsFiredByPlayer)
);
#endif
} }
static const float fMinusOne = -1.0f;
void __declspec(naked) HeadlightsFix() void __declspec(naked) HeadlightsFix()
{ {
static const float fMinusOne = -1.0f; #ifdef _MSC_VER
_asm _asm
{ {
fld [esp+708h-690h] fld dword ptr [esp+0x708-0x690]
fcomp fMinusOne fcomp fMinusOne
fnstsw ax fnstsw ax
and ah, 5 and ah, 5
cmp ah, 1 cmp ah, 1
jnz HeadlightsFix_DontLimit jnz HeadlightsFix_DontLimit
fld fMinusOne fld fMinusOne
fstp [esp+708h-690h] fstp dword ptr [esp+0x708-0x690]
HeadlightsFix_DontLimit: HeadlightsFix_DontLimit:
fld [esp+708h-690h] fld dword ptr [esp+0x708-0x690]
fabs fabs
fld st fld st
jmp [HeadlightsFix_JumpBack] jmp HeadlightsFix_JumpBack
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"fld dword ptr [esp+0x708-0x690]\n"
"fcomp %[fMinusOne]\n"
"fnstsw ax\n"
"and ah, 5\n"
"cmp ah, 1\n"
"jnz HeadlightsFix_DontLimit\n"
"fld %[fMinusOne]\n"
"fstp dword ptr [esp+0x708-0x690]\n"
"HeadlightsFix_DontLimit:\n"
"fld dword ptr [esp+0x708-0x690]\n"
"fabs\n"
"fld st\n"
"jmp %[HeadlightsFix_JumpBack]"
:: [fMinusOne] "f" (fMinusOne),
[HeadlightsFix_JumpBack] "m" (HeadlightsFix_JumpBack)
);
#endif
} }
static float fShadowXSize, fShadowYSize; static float fShadowXSize, fShadowYSize;
@ -314,38 +348,67 @@ float FixedRefValue()
void __declspec(naked) SubtitlesShadowFix() void __declspec(naked) SubtitlesShadowFix()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
push eax push eax
call Recalculate call Recalculate
fadd [esp+50h+8] fadd dword ptr [esp+0x50+8]
fadd [fShadowYSize] fadd fShadowYSize
jmp SubtitlesShadowFix_JumpBack jmp SubtitlesShadowFix_JumpBack
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"push eax\n"
"call %[Recalculate]\n"
"fadd dword ptr [esp+0x50+8]\n"
"fadd %[fShadowYSize]\n"
"jmp %[SubtitlesShadowFix_JumpBack]"
:: [Recalculate] "i" (Recalculate),
[fShadowYSize] "m" (fShadowYSize),
[SubtitlesShadowFix_JumpBack] "m" (SubtitlesShadowFix_JumpBack)
);
#endif
} }
void __declspec(naked) III_SensResetFix() void __declspec(naked) III_SensResetFix()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov ecx, 3A76h mov ecx, 0x3A76
mov edi, ebp mov edi, ebp
fld dword ptr [ebp+194h] fld dword ptr [ebp+0x194]
fld dword ptr [ebp+198h] fld dword ptr [ebp+0x198]
rep stosd rep stosd
fstp dword ptr [ebp+198h] fstp dword ptr [ebp+0x198]
fstp dword ptr [ebp+194h] fstp dword ptr [ebp+0x194]
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov ecx, 0x3A76\n"
"mov edi, ebp\n"
"fld dword ptr [ebp+0x194]\n"
"fld dword ptr [ebp+0x198]\n"
"rep stosd\n"
"fstp dword ptr [ebp+0x198]\n"
"fstp dword ptr [ebp+0x194]\n"
"ret"
);
#endif
} }
static void* RadarBoundsCheckCoordBlip_JumpBack = AddressByVersion<void*>(0x4A55B8, 0x4A56A8, 0x4A5638); static void* RadarBoundsCheckCoordBlip_JumpBack = AddressByVersion<void*>(0x4A55B8, 0x4A56A8, 0x4A5638);
static void* RadarBoundsCheckCoordBlip_Count = AddressByVersion<void*>(0x4A55AF, 0x4A569F, 0x4A562F); static void* RadarBoundsCheckCoordBlip_Count = AddressByVersion<void*>(0x4A55AF, 0x4A569F, 0x4A562F);
void __declspec(naked) RadarBoundsCheckCoordBlip() void __declspec(naked) RadarBoundsCheckCoordBlip()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov edx, dword ptr [RadarBoundsCheckCoordBlip_Count] mov edx, RadarBoundsCheckCoordBlip_Count
cmp cl, byte ptr [edx] cmp cl, byte ptr [edx]
jnb OutOfBounds jnb OutOfBounds
mov edx, ecx mov edx, ecx
@ -355,16 +418,35 @@ void __declspec(naked) RadarBoundsCheckCoordBlip()
OutOfBounds: OutOfBounds:
or eax, -1 or eax, -1
fcompp fcompp
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov edx, %[RadarBoundsCheckCoordBlip_Count]\n"
"cmp cl, byte ptr [edx]\n"
"jnb OutOfBounds\n"
"mov edx, ecx\n"
"mov eax, [esp+4]\n"
"jmp %[RadarBoundsCheckCoordBlip_JumpBack]\n"
"OutOfBounds:\n"
"or eax, -1\n"
"fcompp\n"
"ret"
:: [RadarBoundsCheckCoordBlip_Count] "m" (RadarBoundsCheckCoordBlip_Count),
[RadarBoundsCheckCoordBlip_JumpBack] "m" (RadarBoundsCheckCoordBlip_JumpBack)
);
#endif
} }
static void* RadarBoundsCheckEntityBlip_JumpBack = AddressByVersion<void*>(0x4A565E, 0x4A574E, 0x4A56DE); static void* RadarBoundsCheckEntityBlip_JumpBack = AddressByVersion<void*>(0x4A565E, 0x4A574E, 0x4A56DE);
void __declspec(naked) RadarBoundsCheckEntityBlip() void __declspec(naked) RadarBoundsCheckEntityBlip()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov edx, dword ptr [RadarBoundsCheckCoordBlip_Count] mov edx, RadarBoundsCheckCoordBlip_Count
cmp cl, byte ptr [edx] cmp cl, byte ptr [edx]
jnb OutOfBounds jnb OutOfBounds
mov edx, ecx mov edx, ecx
@ -373,8 +455,25 @@ void __declspec(naked) RadarBoundsCheckEntityBlip()
OutOfBounds: OutOfBounds:
or eax, -1 or eax, -1
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov edx, %[RadarBoundsCheckCoordBlip_Count]\n"
"cmp cl, byte ptr [edx]\n"
"jnb OutOfBounds2\n"
"mov edx, ecx\n"
"mov eax, [esp+4]\n"
"jmp %[RadarBoundsCheckEntityBlip_JumpBack]\n"
"OutOfBounds2:\n"
"or eax, -1\n"
"ret"
:: [RadarBoundsCheckCoordBlip_Count] "m" (RadarBoundsCheckCoordBlip_Count),
[RadarBoundsCheckEntityBlip_JumpBack] "m" (RadarBoundsCheckEntityBlip_JumpBack)
);
#endif
} }
char** ppUserFilesDir = AddressByVersion<char**>(0x580C16, 0x580F66, 0x580E66); char** ppUserFilesDir = AddressByVersion<char**>(0x580C16, 0x580F66, 0x580E66);
@ -413,9 +512,10 @@ unsigned int __cdecl AutoPilotTimerCalculation_III(unsigned int nTimer, int nSca
void __declspec(naked) AutoPilotTimerFix_III() void __declspec(naked) AutoPilotTimerFix_III()
{ {
#ifdef _MSC_VER
_asm { _asm {
push dword ptr[esp + 0x4] push dword ptr [esp + 0x4]
push dword ptr[ebx + 0x10] push dword ptr [ebx + 0x10]
push eax push eax
call AutoPilotTimerCalculation_III call AutoPilotTimerCalculation_III
add esp, 0xC add esp, 0xC
@ -424,8 +524,25 @@ void __declspec(naked) AutoPilotTimerFix_III()
pop ebp pop ebp
pop esi pop esi
pop ebx pop ebx
retn 4 ret 4
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"push dword ptr [esp + 0x4]\n"
"push dword ptr [ebx + 0x10]\n"
"push eax\n"
"call %[AutoPilotTimerCalculation_III]\n"
"add esp, 0xC\n"
"mov [ebx + 0xC], eax\n"
"add esp, 0x28\n"
"pop ebp\n"
"pop esi\n"
"pop ebx\n"
"ret 4"
:: [AutoPilotTimerCalculation_III] "i" (AutoPilotTimerCalculation_III)
);
#endif
} }
namespace ZeroAmmoFix namespace ZeroAmmoFix
@ -580,19 +697,35 @@ namespace RemoveDriverStatusFix
{ {
// if (m_nStatus != STATUS_WRECKED) // if (m_nStatus != STATUS_WRECKED)
// m_nStatus = STATUS_ABANDONED; // m_nStatus = STATUS_ABANDONED;
#ifdef _MSC_VER
_asm _asm
{ {
mov ah, [ecx+50h] mov ah, [ecx+0x50]
mov al, ah mov al, ah
and ah, 0F8h and ah, 0xF8
cmp ah, 28h cmp ah, 0x28
je DontSetStatus je DontSetStatus
and al, 7 and al, 7
or al, 20h or al, 0x20
DontSetStatus: DontSetStatus:
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov ah, [ecx+0x50]\n"
"mov al, ah\n"
"and ah, 0xF8\n"
"cmp ah, 0x28\n"
"je DontSetStatus\n"
"and al, 7\n"
"or al, 0x20\n"
"DontSetStatus:\n"
"ret"
);
#endif
} }
} }
@ -625,16 +758,30 @@ namespace EvasiveDiveFix
__declspec(naked) void CalculateAngle_Hook() __declspec(naked) void CalculateAngle_Hook()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
push dword ptr [esi+7Ch] push dword ptr [esi+0x7C]
push dword ptr [esi+78h] push dword ptr [esi+0x78]
call CalculateAngle call CalculateAngle
add esp, 8 add esp, 8
mov ecx, ebp mov ecx, ebp
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"push dword ptr [esi+0x7C]\n"
"push dword ptr [esi+0x78]\n"
"call %[CalculateAngle]\n"
"add esp, 8\n"
"mov ecx, ebp\n"
"ret"
:: [CalculateAngle] "i" (CalculateAngle)
);
#endif
} }
} }
@ -647,36 +794,69 @@ namespace NullTerminatedLines
static void* orgSscanf_LoadPath; static void* orgSscanf_LoadPath;
__declspec(naked) static void sscanf1_LoadPath_Terminate() __declspec(naked) static void sscanf1_LoadPath_Terminate()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov eax, [esp+4] mov eax, [esp+4]
mov byte ptr [eax+ecx], 0 mov byte ptr [eax+ecx], 0
jmp [orgSscanf_LoadPath] jmp orgSscanf_LoadPath
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov eax, [esp+4]\n"
"mov byte ptr [eax+ecx], 0\n"
"jmp %[orgSscanf_LoadPath]"
:: [orgSscanf_LoadPath] "m" (orgSscanf_LoadPath)
);
#endif
} }
static void* orgSscanf1; static void* orgSscanf1;
__declspec(naked) static void sscanf1_Terminate() __declspec(naked) static void sscanf1_Terminate()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov eax, [esp+4] mov eax, [esp+4]
mov byte ptr [eax+ecx], 0 mov byte ptr [eax+ecx], 0
jmp [orgSscanf1] jmp orgSscanf1
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov eax, [esp+4]\n"
"mov byte ptr [eax+ecx], 0\n"
"jmp %[orgSscanf1]"
:: [orgSscanf1] "m" (orgSscanf1)
);
#endif
} }
__declspec(naked) static void ReadTrackFile_Terminate() __declspec(naked) static void ReadTrackFile_Terminate()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov ecx, [gString] mov ecx, gString
mov byte ptr [ecx+edx], 0 mov byte ptr [ecx+edx], 0
mov ecx, [esi] mov ecx, [esi]
inc ebp inc ebp
add ecx, [esp+0ACh-98h] add ecx, [esp+0xAC-0x98]
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov ecx, %[gString]\n"
"mov byte ptr [ecx+edx], 0\n"
"mov ecx, [esi]\n"
"inc ebp\n"
"add ecx, [esp+0xAC-0x98]\n"
"ret"
:: [gString] "m" (gString)
);
#endif
} }
} }
@ -703,17 +883,33 @@ namespace DodoKeyboardControls
static void* (*orgFindPlayerVehicle)(); static void* (*orgFindPlayerVehicle)();
__declspec(naked) static void FindPlayerVehicle_DodoCheck() __declspec(naked) static void FindPlayerVehicle_DodoCheck()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
call [orgFindPlayerVehicle] call orgFindPlayerVehicle
mov ecx, [bAllDodosCheat] mov ecx, bAllDodosCheat
cmp byte ptr [ecx], 0 cmp byte ptr [ecx], 0
je CheatDisabled je CheatDisabled
mov byte ptr [esp+1Ch-14h], 1 mov byte ptr [esp+0x1C-0x14], 1
CheatDisabled: CheatDisabled:
retn ret
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"call %[orgFindPlayerVehicle]\n"
"mov ecx, %[bAllDodosCheat]\n"
"cmp byte ptr [ecx], 0\n"
"je CheatDisabled\n"
"mov byte ptr [esp+0x1C-0x14], 1\n"
"CheatDisabled:\n"
"ret"
:: [orgFindPlayerVehicle] "m" (orgFindPlayerVehicle),
[bAllDodosCheat] "m" (bAllDodosCheat)
);
#endif
} }
} }
@ -770,9 +966,10 @@ namespace GenerateNewPickup_ReuseObjectFix
__declspec(naked) void GiveUsAPickUpObject_CleanUpObject() __declspec(naked) void GiveUsAPickUpObject_CleanUpObject()
{ {
#ifdef _MSC_VER
_asm _asm
{ {
mov eax, [pPickupObject] mov eax, pPickupObject
add eax, ebp add eax, ebp
mov eax, [eax] mov eax, [eax]
test eax, eax test eax, eax
@ -781,7 +978,7 @@ namespace GenerateNewPickup_ReuseObjectFix
mov edi, eax mov edi, eax
push edi push edi
call [WorldRemove] call WorldRemove
add esp, 4 add esp, 4
// Call dtor // Call dtor
@ -793,8 +990,38 @@ namespace GenerateNewPickup_ReuseObjectFix
pop edi pop edi
NoPickup: NoPickup:
jmp [orgGiveUsAPickUpObject] jmp orgGiveUsAPickUpObject
} }
#elif defined(__GNUC__) || defined(__clang__)
__asm__ volatile
(
"mov eax, %[pPickupObject]\n"
"add eax, ebp\n"
"mov eax, [eax]\n"
"test eax, eax\n"
"jz NoPickup\n"
"push edi\n"
"mov edi, eax\n"
"push edi\n"
"call offset %[WorldRemove]\n"
"add esp, 4\n"
// Call dtor
"mov ecx, edi\n"
"mov eax, [edi]\n"
"push 1\n"
"call dword ptr [eax]\n"
"pop edi\n"
"NoPickup:\n"
"jmp %[orgGiveUsAPickUpObject]"
:: [pPickupObject] "m" (pPickupObject),
[WorldRemove] "m" (WorldRemove),
[orgGiveUsAPickUpObject] "m" (orgGiveUsAPickUpObject)
);
#endif
} }
} }