SilentPatchVC: Add GCC/Clang-specific inline assembly statements

This also includes a small wrapper to call a C++ function from inline ASM (From III: This change also matches the MSVC statements more closely to the GCC/Clang ones)
SilentPatchIII: Add GCC/Clang-specific inline assembly statements
2025-01-04 10:13:02 +05:00 · 2024-11-13 21:17:52 +02:00 · 2024-11-13 21:17:49 +02:00 · 2024-11-13 21:09:26 +02:00 · 2024-11-13 21:09:26 +02:00 · 2024-11-13 21:09:26 +02:00
2 changed files with 101 additions and 100 deletions
--- a/SilentPatchIII/SilentPatchIII.cpp
+++ b/SilentPatchIII/SilentPatchIII.cpp
@ -199,13 +199,13 @@ void __declspec(naked) M16StatsFix()
 #ifdef _MSC_VER
 	_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
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"add 	eax, 0x34\n"
@ -224,22 +224,22 @@ void __declspec(naked) HeadlightsFix()
 #ifdef _MSC_VER
 	_asm
 	{
-		fld		[esp+708h-690h]
+		fld		dword ptr [esp+0x708-0x690]
 		fcomp	fMinusOne
 		fnstsw	ax
 		and		ah, 5
 		cmp		ah, 1
 		jnz		HeadlightsFix_DontLimit
 		fld		fMinusOne
-		fstp	[esp+708h-690h]
+		fstp	dword ptr [esp+0x708-0x690]
 HeadlightsFix_DontLimit:
-		fld		[esp+708h-690h]
+		fld		dword ptr [esp+0x708-0x690]
 		fabs
 		fld		st
-		jmp		[HeadlightsFix_JumpBack]
+		jmp		HeadlightsFix_JumpBack
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"fld	dword ptr [esp+0x708-0x690]\n"
@ -353,11 +353,11 @@ void __declspec(naked) SubtitlesShadowFix()
 	{
 		push	eax
 		call	Recalculate
-		fadd	[esp+50h+8]
+		fadd	dword ptr [esp+0x50+8]
-		fadd	[fShadowYSize]
+		fadd	fShadowYSize
 		jmp		SubtitlesShadowFix_JumpBack
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"push	eax\n"
@ -377,16 +377,16 @@ void __declspec(naked) III_SensResetFix()
 #ifdef _MSC_VER
 	_asm
 	{
-		mov     ecx, 3A76h
+		mov     ecx, 0x3A76
 		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
-		fstp	dword ptr [ebp+198h]
+		fstp	dword ptr [ebp+0x198]
-		fstp	dword ptr [ebp+194h]
+		fstp	dword ptr [ebp+0x194]
-		retn
+		ret
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"mov	ecx, 0x3A76\n"
@ -408,7 +408,7 @@ void __declspec(naked) RadarBoundsCheckCoordBlip()
 #ifdef _MSC_VER
 	_asm
 	{
-		mov		edx, dword ptr [RadarBoundsCheckCoordBlip_Count]
+		mov		edx, RadarBoundsCheckCoordBlip_Count
 		cmp		cl, byte ptr [edx]
 		jnb		OutOfBounds
 		mov     edx, ecx
@ -418,9 +418,9 @@ void __declspec(naked) RadarBoundsCheckCoordBlip()
 OutOfBounds:
 		or		eax, -1
 		fcompp
-		retn
+		ret
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"mov	edx, %[RadarBoundsCheckCoordBlip_Count]\n"
@ -446,7 +446,7 @@ void __declspec(naked) RadarBoundsCheckEntityBlip()
 #ifdef _MSC_VER
 	_asm
 	{
-		mov		edx, dword ptr [RadarBoundsCheckCoordBlip_Count]
+		mov		edx, RadarBoundsCheckCoordBlip_Count
 		cmp		cl, byte ptr [edx]
 		jnb		OutOfBounds
 		mov     edx, ecx
@ -455,9 +455,9 @@ void __declspec(naked) RadarBoundsCheckEntityBlip()
 		OutOfBounds:
 		or		eax, -1
-		retn
+		ret
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"mov	edx, %[RadarBoundsCheckCoordBlip_Count]\n"
@ -514,8 +514,8 @@ void __declspec(naked) AutoPilotTimerFix_III()
 {
 #ifdef _MSC_VER
 	_asm {
-		push    dword ptr[esp + 0x4]
+		push    dword ptr [esp + 0x4]
-		push    dword ptr[ebx + 0x10]
+		push    dword ptr [ebx + 0x10]
 		push    eax
 		call    AutoPilotTimerCalculation_III
 		add     esp, 0xC
@ -524,9 +524,9 @@ void __declspec(naked) AutoPilotTimerFix_III()
 		pop     ebp
 		pop     esi
 		pop     ebx
-		retn    4
+		ret     4
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"push	dword ptr [esp + 0x4]\n"
@ -700,18 +700,18 @@ namespace RemoveDriverStatusFix
 #ifdef _MSC_VER
 		_asm
 		{
-			mov		ah, [ecx+50h]
+			mov		ah, [ecx+0x50]
 			mov		al, ah
-			and		ah, 0F8h
+			and		ah, 0xF8
-			cmp		ah, 28h
+			cmp		ah, 0x28
 			je		DontSetStatus
 			and     al, 7
-			or      al, 20h
+			or      al, 0x20
 		DontSetStatus:
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	ah, [ecx+0x50]\n"
@ -761,15 +761,15 @@ namespace EvasiveDiveFix
 #ifdef _MSC_VER
 		_asm
 		{
-			push    dword ptr [esi+7Ch]
+			push    dword ptr [esi+0x7C]
-			push	dword ptr [esi+78h]
+			push	dword ptr [esi+0x78]
 			call	CalculateAngle
 			add		esp, 8
 			mov     ecx, ebp
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"push	dword ptr [esi+0x7C]\n"
@ -799,9 +799,9 @@ namespace NullTerminatedLines
 		{
 			mov		eax, [esp+4]
 			mov		byte ptr [eax+ecx], 0
-			jmp		[orgSscanf_LoadPath]
+			jmp		orgSscanf_LoadPath
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	eax, [esp+4]\n"
@ -820,9 +820,9 @@ namespace NullTerminatedLines
 		{
 			mov		eax, [esp+4]
 			mov		byte ptr [eax+ecx], 0
-			jmp		[orgSscanf1]
+			jmp		orgSscanf1
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	eax, [esp+4]\n"
@ -838,14 +838,14 @@ namespace NullTerminatedLines
 #ifdef _MSC_VER
 		_asm
 		{
-			mov		ecx, [gString]
+			mov		ecx, gString
 			mov		byte ptr [ecx+edx], 0
 			mov     ecx, [esi]
 			inc     ebp
-			add     ecx, [esp+0ACh-98h]
+			add     ecx, [esp+0xAC-0x98]
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	ecx, %[gString]\n"
@ -886,16 +886,16 @@ namespace DodoKeyboardControls
 #ifdef _MSC_VER
 		_asm
 		{
-			call	[orgFindPlayerVehicle]
+			call	orgFindPlayerVehicle
-			mov		ecx, [bAllDodosCheat]
+			mov		ecx, bAllDodosCheat
 			cmp		byte ptr [ecx], 0
 			je		CheatDisabled
-			mov		byte ptr [esp+1Ch-14h], 1
+			mov		byte ptr [esp+0x1C-0x14], 1
 		CheatDisabled:
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"call	%[orgFindPlayerVehicle]\n"
@ -969,7 +969,7 @@ namespace GenerateNewPickup_ReuseObjectFix
 #ifdef _MSC_VER
 		_asm
 		{
-			mov		eax, [pPickupObject]
+			mov		eax, pPickupObject
 			add		eax, ebp
 			mov		eax, [eax]
 			test	eax, eax
@ -978,7 +978,7 @@ namespace GenerateNewPickup_ReuseObjectFix
 			mov		edi, eax
 			push	edi
-			call	[WorldRemove]
+			call	WorldRemove
 			add		esp, 4
 			// Call dtor
@ -990,9 +990,9 @@ namespace GenerateNewPickup_ReuseObjectFix
 			pop		edi
 		NoPickup:
-			jmp		[orgGiveUsAPickUpObject]
+			jmp		orgGiveUsAPickUpObject
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	eax, %[pPickupObject]\n"
--- a/SilentPatchVC/SilentPatchVC.cpp
+++ b/SilentPatchVC/SilentPatchVC.cpp
@ -675,7 +675,7 @@ void __declspec(naked) SubtitlesShadowFix()
 	_asm
 	{
 		mov		[esp], eax
-		fild	[esp]
+		fild	dword ptr [esp]
 		push	eax
 		lea		eax, [esp+20h-18h]
 		push	eax
@ -684,7 +684,7 @@ void __declspec(naked) SubtitlesShadowFix()
 		call	Recalculate
 		jmp		SubtitlesShadowFix_JumpBack
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"mov	[esp], eax\n"
@ -716,9 +716,9 @@ void __declspec(naked) CreateInstance_BikeFix()
 		push	eax
 		mov		ecx, ebp
 		call	CVehicleModelInfo::GetExtrasFrame
-		retn
+		ret
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"push	eax\n"
@ -768,9 +768,10 @@ unsigned int __cdecl AutoPilotTimerCalculation_VC(unsigned int nTimer, int nScal
 void __declspec(naked) AutoPilotTimerFix_VC()
 {
 #ifdef MSC_VER
-	_asm {
+	_asm
-		push	dword ptr[esp + 0xC]
+	{
-		push	dword ptr[ebx + 0x10]
+		push	dword ptr [esp + 0xC]
 		push	dword ptr [ebx + 0x10]
 		push	eax
 		call	AutoPilotTimerCalculation_VC
 		add 	esp, 0xC
@ -778,9 +779,9 @@ void __declspec(naked) AutoPilotTimerFix_VC()
 		add     esp, 0x30
 		pop     ebp
 		pop     ebx
-		retn    4
+		ret     4
 	}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 	__asm__ volatile
 	(
 		"push	dword ptr [esp + 0xC]\n"
@ -919,21 +920,21 @@ namespace SirenSwitchingFix
 #ifdef MSC_VER
 		_asm
 		{
-			mov     dword ptr [esi+1Ch], 1Ch
+			mov     dword ptr [esi+0x1C], 0x1C
 			// al = 0 - high pitched siren
 			// al = 1 - normal siren
-			cmp     dword ptr [ebp+14h], 90		// fbiranch
+			cmp     dword ptr [ebp+0x14], 90	// fbiranch
 			je      IsFBIRanchOrFBICar_HighPitchSiren
-			cmp     dword ptr [ebp+14h], 17		// fbicar
+			cmp     dword ptr [ebp+0x14], 17	// fbicar
 			setne   al
-			retn
+			ret
 		IsFBIRanchOrFBICar_HighPitchSiren:
 			xor     al, al
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov    dword ptr [esi+0x1C], 0x1C\n"
@ -1022,18 +1023,18 @@ namespace RemoveDriverStatusFix
 #ifdef MSC_VER
 		_asm
 		{
-			mov		cl, [ebx+50h]
+			mov		cl, [ebx+0x50]
 			mov		al, cl
-			and		cl, 0F8h
+			and		cl, 0xF8
-			cmp		cl, 28h
+			cmp		cl, 0x28
 			je		DontSetStatus
 			and     al, 7
-			or      al, 20h
+			or      al, 0x20
 		DontSetStatus:
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	cl, [ebx+0x50]\n"
@ -1125,9 +1126,9 @@ namespace NullTerminatedLines
 		{
 			mov		eax, [esp+4]
 			mov		byte ptr [eax+ecx], 0
-			jmp		[orgSscanf_LoadPath]
+			jmp		orgSscanf_LoadPath
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	eax, [esp+4]\n"
@ -1163,11 +1164,11 @@ namespace PickupEffectsFixes
 #ifdef MSC_VER
 		_asm
 		{
-			mov		byte ptr [esp+184h-170h], 0
+			mov		byte ptr [esp+0x184-0x170], 0
-			mov		dword ptr [esp+184h-174h], 37
+			mov		dword ptr [esp+0x184-0x174], 37
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"mov	byte ptr [esp+0x184-0x170], 0\n"
@ -1184,7 +1185,7 @@ namespace PickupEffectsFixes
 		{
 			cmp		ecx, 294	// minigun2
 			jnz		NotMinigun2
-			mov		byte ptr [esp+184h-170h], 0
+			mov		byte ptr [esp+0x184-0x170], 0
 			xor		eax, eax
 			jmp		Return
@ -1193,9 +1194,9 @@ namespace PickupEffectsFixes
 		Return:
 			mov     ebx, ecx
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"cmp	ecx, 294\n"	// minigun2
@ -1233,23 +1234,23 @@ namespace IsPlayerTargettingCharFix
 		{
 			test	bl, bl
 			jnz		ReturnToUpdateCompareFlag
-			mov		eax, [bUseMouse3rdPerson]
+			mov		eax, bUseMouse3rdPerson
 			cmp		byte ptr [eax], 0
 			jne		CmpAndReturn
-			mov		ecx, [TheCamera]
+			mov		ecx, TheCamera
-			call	[Using1stPersonWeaponMode]
+			call	Using1stPersonWeaponMode
 			test	al, al
 			jz		ReturnToUpdateCompareFlag
 		CmpAndReturn:
-			cmp     byte ptr [esp+11Ch-10Ch], 0
+			cmp     byte ptr [esp+0x11C-0x10C], 0
-			retn
+			ret
 		ReturnToUpdateCompareFlag:
 			xor		al, al
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"test	bl, bl\n"
@ -1364,10 +1365,10 @@ namespace SelectableBackfaceCulling
 		{
 			push    ebx
 			mov     ebx, ecx
-			cmp     dword ptr [ebx+4Ch], 0
+			cmp     dword ptr [ebx+0x4C], 0
-			jmp		[EntityRender_Prologue_JumpBack]
+			jmp		EntityRender_Prologue_JumpBack
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"push   ebx\n"
@ -1559,9 +1560,9 @@ namespace TommyFistShakeWithWeapons
 			call	WeaponProhibitsFistShake
 			add		esp, 4
 			test	al, al
-			retn
+			ret
 		}
-#else
+#elif defined(__GNUC__) || defined(__clang__)
 		__asm__ volatile
 		(
 			"push	dword ptr [eax]\n"
Author	SHA1	Message	Date
Echo J	870e3d63a1	SilentPatchVC: Add GCC/Clang-specific inline assembly statements This also includes a small wrapper to call a C++ function from inline ASM (From III: This change also matches the MSVC statements more closely to the GCC/Clang ones)	2024-11-13 21:17:52 +02:00
Echo J	3f26e0045e	SilentPatchIII: Add GCC/Clang-specific inline assembly statements This also matches the MSVC statements more closely to the GCC/Clang ones	2024-11-13 21:17:49 +02:00
Echo J	b7a08843be	SilentPatchIII: Add a missing functional header include MinGW GCC doesn't implicitly include it either	2024-11-13 21:09:26 +02:00
Echo J	fd395f3c6a	SilentPatch: Add missing cmath header include It's required for the modf() function (and it isn't implicitly included on MinGW GCC)	2024-11-13 21:09:26 +02:00
Echo J	d9c3561d7b	SilentPatch: Move a header include in SVF This makes sure the fixed-width integer types are included in SVF.h	2024-11-13 21:09:26 +02:00
Echo J	8a930e6e4b	SilentPatch: Define a replacement for _stricmp() on non-MSVC MinGW GCC doesn't have this MSVC-specific function	2024-11-13 21:09:26 +02:00
Echo J	90e5ba15ab	SilentPatch: Move RwEngineInstance definition to headers MinGW GCC can't locate it in some files otherwise	2024-11-13 21:09:26 +02:00
Echo J	f9adddf0e1	SilentPatch: Simplify RwIm2DRenderLine function pointer declaration MinGW GCC doesn't seem to unwind the layers of the macro define properly (which causes it to not find the declaration type)	2024-11-13 21:09:26 +02:00
Echo J	d49e03e372	SilentPatch: Don't define certain Rw* functions if not needed Redefining them can cause strange compile errors with MinGW GCC	2024-11-13 21:09:26 +02:00
Echo J	4445c9e24a	DDraw: Cast the memcpy() source argument This works around the MinGW GCC type strictness	2024-11-13 21:09:26 +02:00