[GEN][ZH] Replacements for rest of asm code

Author: zzambers

Generals/Code/GameEngine/Source/Common/System/StackDump.cpp

@@ -76,6 +76,7 @@ void StackDump(void (*callback)(const char*))
 
 	DWORD myeip,myesp,myebp;
 
+#ifdef _MSC_VER
 _asm
 {
 MYEIP1:
@@ -86,6 +87,12 @@ _asm
  mov eax, ebp
  mov dword ptr [myebp] , eax
 }
+#else
+	RtlCaptureContext(&gsContext);
+	myeip = gsContext.Eip;
+	myesp = gsContext.Esp;
+	myebp = gsContext.Ebp;
+#endif
 
 
 	MakeStackTrace(myeip,myesp,myebp, 2, callback);
@@ -340,6 +347,7 @@ void FillStackAddresses(void**addresses, unsigned int count, unsigned int skip)
     gsContext.ContextFlags = CONTEXT_FULL;
 
 	DWORD myeip,myesp,myebp;
+#ifdef _MSC_VER
 _asm
 {
 MYEIP2:
@@ -351,6 +359,12 @@ _asm
  mov dword ptr [myebp] , eax
  xor eax,eax
 }
+#else
+	RtlCaptureContext(&gsContext);
+	myeip = gsContext.Eip;
+	myesp = gsContext.Esp;
+	myebp = gsContext.Ebp;
+#endif
 memset(&stack_frame, 0, sizeof(STACKFRAME));
 stack_frame.AddrPC.Mode = AddrModeFlat;
 stack_frame.AddrPC.Offset = myeip;
@@ -360,17 +374,6 @@ stack_frame.AddrFrame.Mode = AddrModeFlat;
 stack_frame.AddrFrame.Offset = myebp;
 
 {
-/*
-    if(GetThreadContext(thread, &gsContext))
-    {
-        memset(&stack_frame, 0, sizeof(STACKFRAME));
-        stack_frame.AddrPC.Mode = AddrModeFlat;
-        stack_frame.AddrPC.Offset = gsContext.Eip;
-        stack_frame.AddrStack.Mode = AddrModeFlat;
-        stack_frame.AddrStack.Offset = gsContext.Esp;
-        stack_frame.AddrFrame.Mode = AddrModeFlat;
-        stack_frame.AddrFrame.Offset = gsContext.Ebp;
-*/
 
 		Bool stillgoing = TRUE;
 //	unsigned int cd = count;

GeneralsMD/Code/GameEngine/Source/Common/System/StackDump.cpp

@@ -76,6 +76,7 @@ void StackDump(void (*callback)(const char*))
 
 	DWORD myeip,myesp,myebp;
 
+#ifdef _MSC_VER
 _asm
 {
 MYEIP1:
@@ -86,6 +87,12 @@ _asm
  mov eax, ebp
  mov dword ptr [myebp] , eax
 }
+#else
+	RtlCaptureContext(&gsContext);
+	myeip = gsContext.Eip;
+	myesp = gsContext.Esp;
+	myebp = gsContext.Ebp;
+#endif
 
 
 	MakeStackTrace(myeip,myesp,myebp, 2, callback);
@@ -340,6 +347,7 @@ void FillStackAddresses(void**addresses, unsigned int count, unsigned int skip)
     gsContext.ContextFlags = CONTEXT_FULL;
 
 	DWORD myeip,myesp,myebp;
+#ifdef _MSC_VER
 _asm
 {
 MYEIP2:
@@ -351,6 +359,12 @@ _asm
  mov dword ptr [myebp] , eax
  xor eax,eax
 }
+#else
+	RtlCaptureContext(&gsContext);
+	myeip = gsContext.Eip;
+	myesp = gsContext.Esp;
+	myebp = gsContext.Ebp;
+#endif
 memset(&stack_frame, 0, sizeof(STACKFRAME));
 stack_frame.AddrPC.Mode = AddrModeFlat;
 stack_frame.AddrPC.Offset = myeip;
@@ -360,17 +374,6 @@ stack_frame.AddrFrame.Mode = AddrModeFlat;
 stack_frame.AddrFrame.Offset = myebp;
 
 {
-/*
-    if(GetThreadContext(thread, &gsContext))
-    {
-        memset(&stack_frame, 0, sizeof(STACKFRAME));
-        stack_frame.AddrPC.Mode = AddrModeFlat;
-        stack_frame.AddrPC.Offset = gsContext.Eip;
-        stack_frame.AddrStack.Mode = AddrModeFlat;
-        stack_frame.AddrStack.Offset = gsContext.Esp;
-        stack_frame.AddrFrame.Mode = AddrModeFlat;
-        stack_frame.AddrFrame.Offset = gsContext.Ebp;
-*/
 
 		Bool stillgoing = TRUE;
 //	unsigned int cd = count;

GeneralsMD/Code/Libraries/Source/debug/debug_debug.cpp

@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <new>      // needed for placement new prototype
+#include <Utility/intrin_compat.h>
 
 // a little dummy variable that makes the linker actually include
 // us...
@@ -270,11 +271,15 @@ bool Debug::SkipNext(void)
   // do not implement this function inline, we do need
   // a valid frame pointer here!
   unsigned help;
+#ifdef _MSC_VER
   _asm 
   {
     mov eax,[ebp+4]   // return address
     mov help,eax
   };
+#else
+	help = (unsigned)_ReturnAddress();
+#endif
   curStackFrame=help;
 
   // do we know if to skip the following code?
@@ -386,7 +391,7 @@ bool Debug::AssertDone(void)
           }
           break;
         case IDRETRY:
-          _asm int 0x03
+          __debugbreak();
           break;
         default:
           ((void)0);
@@ -654,7 +659,7 @@ bool Debug::CrashDone(bool die)
             }
             break;
           case IDRETRY:
-            _asm int 0x03
+            __debugbreak();
             break;
           default:
             ((void)0);

GeneralsMD/Code/Libraries/Source/debug/debug_except.cpp

@@ -173,12 +173,18 @@ void DebugExceptionhandler::LogFPURegisters(Debug &dbg, struct _EXCEPTION_POINTE
     double fpVal;
 
     // convert from temporary real (10 byte) to double
+#ifdef _MSC_VER
     _asm
     {
       mov eax,value
       fld tbyte ptr [eax]
       fstp qword ptr [fpVal]
     }
+#else
+    __float80 fp80val;
+    memcpy(&fp80val, value, 10);
+    fpVal = (double) fp80val;
+#endif
 
     dbg << " " << fpVal << "\n";
   }

GeneralsMD/Code/Libraries/Source/debug/debug_stack.cpp

@@ -363,6 +363,7 @@ int DebugStackwalk::StackWalk(Signature &sig, struct _CONTEXT *ctx)
   {
     // walk stack back using current call chain
 	  unsigned long reg_eip, reg_ebp, reg_esp;
+#ifdef _MSC_VER
 	  __asm 
     {
     here:
@@ -371,6 +372,13 @@ int DebugStackwalk::StackWalk(Signature &sig, struct _CONTEXT *ctx)
 		  mov	reg_ebp,ebp
 		  mov	reg_esp,esp
 	  };
+#else
+	CONTEXT ctx2;
+	RtlCaptureContext(&ctx2);
+	reg_eip = ctx2.Eip;
+	reg_ebp = ctx2.Ebp;
+	reg_esp = ctx2.Esp;
+#endif
 	  stackFrame.AddrPC.Offset = reg_eip;
 	  stackFrame.AddrStack.Offset = reg_esp;
 	  stackFrame.AddrFrame.Offset = reg_ebp;