From 3a730b3c3c5e9c36ca7df1971ee0b9cccd50cab0 Mon Sep 17 00:00:00 2001
From: "Ben \"root\" Anderson" <roothorick@gmail.com>
Date: Fri, 25 Oct 2013 18:05:56 -0500
Subject: [PATCH] Introducing SM_ASM_X86, a compiler-agnostic inline assembly
 macro

---
 src/archutils/Win32/Crash.cpp    | 10 +++++-----
 src/archutils/Win32/arch_setup.h | 17 +++++++----------
 src/global.cpp                   |  6 +-----
 src/global.h                     | 13 ++++++++++++-
 4 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/archutils/Win32/Crash.cpp b/src/archutils/Win32/Crash.cpp
index 262bee460e..025bbdf8f5 100644
--- a/src/archutils/Win32/Crash.cpp
+++ b/src/archutils/Win32/Crash.cpp
@@ -364,7 +364,7 @@ long __stdcall CrashHandler::ExceptionHandler( EXCEPTION_POINTERS *pExc )
 	int iSize = 1024*32;
 	char *pStack = (char *) VirtualAlloc( NULL, iSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE );
 	pStack += iSize;
-	_asm mov esp, pStack;
+	SM_ASM_X86(mov esp, pStack);
 
 	return MainExceptionHandler( pExc );
 }
@@ -532,10 +532,10 @@ void CrashHandler::do_backtrace( const void **buf, size_t size,
 static void NORETURN debug_crash()
 {
 	__try {
-		__asm xor ebx,ebx
-		__asm mov eax,dword ptr [ebx]
-//		__asm mov dword ptr [ebx],eax
-//		__asm lock add dword ptr cs:[00000000h], 12345678h
+		SM_ASM_X86(xor ebx,ebx);
+		SM_ASM_X86(mov eax,dword ptr [ebx]);
+//		SM_ASM_X86(mov dword ptr [ebx],eax);
+//		SM_ASM_X86(lock add dword ptr cs:[00000000h], 12345678h);
 	} __except( CrashHandler::ExceptionHandler((EXCEPTION_POINTERS*)_exception_info()) ) {
 	}
 }
diff --git a/src/archutils/Win32/arch_setup.h b/src/archutils/Win32/arch_setup.h
index 0d6f018ab1..2e3c9c5d89 100644
--- a/src/archutils/Win32/arch_setup.h
+++ b/src/archutils/Win32/arch_setup.h
@@ -145,8 +145,8 @@ inline long int lrintf( float f )
 {
 	int retval;
 
-	_asm fld f;
-	_asm fistp retval;
+	SM_ASM_X86(fld f);
+	SM_ASM_X86(fistp retval);
 
 	return retval;
 }
@@ -175,21 +175,19 @@ inline long int lrintf( float f )
 
 inline uint32_t ArchSwap32( uint32_t n )
 {
-	__asm
-	{
+	SM_ASM_X86(
 		mov eax, n
 		xchg al, ah
 		ror eax, 16
 		xchg al, ah
 		mov n, eax
-	};
+	);
 	return n;
 }
 
 inline uint32_t ArchSwap24( uint32_t n )
 {
-	__asm
-	{
+	SM_ASM_X86(
 		mov eax, n
 		xchg al, ah
 		ror eax, 16
@@ -202,12 +200,11 @@ inline uint32_t ArchSwap24( uint32_t n )
 
 inline uint16_t ArchSwap16( uint16_t n )
 {
-	__asm
-	{
+	SM_ASM_X86(
 		mov ax, n
 		xchg al, ah
 		mov n, ax
-	};
+	);
 	return n;
 }
 #endif
diff --git a/src/global.cpp b/src/global.cpp
index be38a84929..60103b683a 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -42,11 +42,7 @@ void NORETURN sm_crash( const char *reason )
 #if defined(_WINDOWS)
 	/* Do something after the above, so the call/return isn't optimized to a jmp; that
 	 * way, this function will appear in backtrace stack traces. */
-#if defined(_MSC_VER)
-	_asm nop;
-#elif defined(__GNUC__) // MinGW or similar
-	asm("nop");
-#endif
+SM_ASM_X86(nop)
 #else
 	_exit( 1 );
 #endif
diff --git a/src/global.h b/src/global.h
index 25b7d3f40c..f2c2766d1a 100644
--- a/src/global.h
+++ b/src/global.h
@@ -240,9 +240,20 @@ float roundf( float f ) { if( f < 0.0f ) return truncf( f-0.5f ); return truncf(
 inline float strtof( const char *s, char **se ) { return (float) strtod( s, se ); }
 #endif
 
+// Compiler-agnostic macro for inline x86 assembly
+#if defined(CPU_X86) || defined(CPU_X86_64)
+#if defined(_MSC_VER)
+// TESTME: is a single instruction legal for this syntax?
+#define SM_ASM_X86(x) __asm { x }
+#elif defined(__GNUC__)
+#define SM_ASM_X86(x) __asm__("x")
+#else
+#error Inline assembly not implemented for your compiler.
+#endif
+
 /* Don't include our own headers here, since they tend to change often. */
 
-#endif
+#endif // GLOBAL_H
 
 /**
  * @file