r110 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-09-26 09:47:59 -0400 (Mon, 26 Sep 2005)
New Revision: 110

Modified:
   trunk/code/qcommon/vm_x86.c
Log:
* Fix to broken win32 fix patch


Modified: trunk/code/qcommon/vm_x86.c
===================================================================
--- trunk/code/qcommon/vm_x86.c	2005-09-26 02:36:52 UTC (rev 109)
+++ trunk/code/qcommon/vm_x86.c	2005-09-26 13:47:59 UTC (rev 110)
@@ -79,8 +79,8 @@
 static	int		ftolPtr = (int)qftol0F7F;
 #endif // FTOL_PTR
 
-void AsmCall( void );
-static	int		asmCallPtr = (int)AsmCall;
+void doAsmCall( void );
+static	int		asmCallPtr = (int)doAsmCall;
 #endif // !_WIN32
 
 
@@ -197,8 +197,11 @@
  	currentVM = savedVM;
 }
 
+// Note the C space function AsmCall is never actually called, and is in fact
+// arbitarily named (though this is not true for the MSC version).  When a vm
+// makes a system call, control jumps straight to the doAsmCall label.
 void AsmCall( void ) {
-	asm( CMANG(AsmCall) ":				\n\t" \
+	asm( CMANG(doAsmCall) ":				\n\t" \
 		"	movl (%%edi),%%eax			\n\t" \
 		"	subl $4,%%edi				\n\t" \
 		"	orl %%eax,%%eax				\n\t" \