r791 - in trunk: . code/qcommon

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2006-05-28 23:02:54 -0400 (Sun, 28 May 2006)
New Revision: 791

Modified:
   trunk/Makefile
   trunk/code/qcommon/vm_ppc_new.c
Log:
Correction in PowerPC JIT code. Fixes crash in server browser, etc, on Mac OS X
 and probably PowerPC Linux, too...fixes Bugzilla #2519.


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-05-28 14:36:37 UTC (rev 790)
+++ trunk/Makefile	2006-05-29 03:02:54 UTC (rev 791)
@@ -264,7 +264,7 @@
   CC=gcc
 
   # !!! FIXME: calling conventions are still broken! See Bugzilla #2519
-  #VM_PPC=vm_ppc_new
+  VM_PPC=vm_ppc_new
 
   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
   BASE_CFLAGS += -DMACOS_X -fno-common -pipe

Modified: trunk/code/qcommon/vm_ppc_new.c
===================================================================
--- trunk/code/qcommon/vm_ppc_new.c	2006-05-28 14:36:37 UTC (rev 790)
+++ trunk/code/qcommon/vm_ppc_new.c	2006-05-29 03:02:54 UTC (rev 791)
@@ -1106,7 +1106,7 @@
 		#endif
 		assertInteger(opStackDepth-1);
 		assertInteger(opStackDepth-2);
-                Inst( "cmp", PPC_CMP, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
+                Inst( "cmpl", PPC_CMPL, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
 		opStackRegType[opStackDepth-1] = 0;
 		opStackRegType[opStackDepth-2] = 0;
 		opStackLoadInstructionAddr[opStackDepth-1] = 0;
@@ -1130,7 +1130,7 @@
 		#endif
 		assertInteger(opStackDepth-1);
 		assertInteger(opStackDepth-2);
-                Inst( "cmp", PPC_CMP, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
+                Inst( "cmpl", PPC_CMPL, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
 		opStackRegType[opStackDepth-1] = 0;
 		opStackRegType[opStackDepth-2] = 0;
 		opStackLoadInstructionAddr[opStackDepth-1] = 0;
@@ -1154,7 +1154,7 @@
 		#endif
 		assertInteger(opStackDepth-1);
 		assertInteger(opStackDepth-2);
-                Inst( "cmp", PPC_CMP, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
+                Inst( "cmpl", PPC_CMPL, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
 		opStackRegType[opStackDepth-1] = 0;
 		opStackRegType[opStackDepth-2] = 0;
 		opStackLoadInstructionAddr[opStackDepth-1] = 0;
@@ -1178,7 +1178,7 @@
 		#endif
 		assertInteger(opStackDepth-1);
 		assertInteger(opStackDepth-2);
-                Inst( "cmp", PPC_CMP, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
+                Inst( "cmpl", PPC_CMPL, 0, opStackIntRegisters[opStackDepth-2], opStackIntRegisters[opStackDepth-1] );
 		opStackRegType[opStackDepth-1] = 0;
 		opStackRegType[opStackDepth-2] = 0;
 		opStackLoadInstructionAddr[opStackDepth-1] = 0;