r355 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-11-13 18:05:00 -0500 (Sun, 13 Nov 2005)
New Revision: 355

Modified:
   trunk/code/qcommon/unzip.c
   trunk/code/qcommon/vm_ppc_new.c
Log:
* Quiet some warnings on OS X


Modified: trunk/code/qcommon/unzip.c
===================================================================
--- trunk/code/qcommon/unzip.c	2005-11-13 22:42:56 UTC (rev 354)
+++ trunk/code/qcommon/unzip.c	2005-11-13 23:05:00 UTC (rev 355)
@@ -2925,8 +2925,6 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-static const char inflate_copyright[] =
-   " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot

Modified: trunk/code/qcommon/vm_ppc_new.c
===================================================================
--- trunk/code/qcommon/vm_ppc_new.c	2005-11-13 22:42:56 UTC (rev 354)
+++ trunk/code/qcommon/vm_ppc_new.c	2005-11-13 23:05:00 UTC (rev 355)
@@ -24,8 +24,6 @@
 
 #include "vm_local.h"
 
-#pragma opt_pointer_analysis off
-
 #define DEBUG_VM 0
 
 #if DEBUG_VM
@@ -523,37 +521,6 @@
 static int instruction;
 static byte *jused;
 
-static void ltop() {
-//    if (rtopped == qfalse) {
-//	InstImm( PPC_LWZ, R_TOP, R_OPSTACK, 0 );		// get value from opstack
-//    }
-}
-
-static void ltopandsecond() {
-#if 0
-    if (pass>=0 && buf[compiledOfs-1] == (PPC_STWU |  R_TOP<<21 | R_OPSTACK<<16 | 4 ) && jused[instruction]==0 ) {
-	compiledOfs--;
-	if (!pass) {
-	    tvm->instructionPointers[instruction] = compiledOfs * 4;
-	}
-	InstImm( PPC_LWZ, R_SECOND, R_OPSTACK, 0 );	// get value from opstack
-	InstImm( PPC_ADDI, R_OPSTACK, R_OPSTACK, -4 );
-    } else if (pass>=0 && buf[compiledOfs-1] == (PPC_STW |  R_TOP<<21 | R_OPSTACK<<16 | 0 )  && jused[instruction]==0 ) {
-	compiledOfs--;
-	if (!pass) {
-	    tvm->instructionPointers[instruction] = compiledOfs * 4;
-	}
-	InstImm( PPC_LWZ, R_SECOND, R_OPSTACK, -4 );	// get value from opstack
-	InstImm( PPC_ADDI, R_OPSTACK, R_OPSTACK, -8 );
-    } else {
-	ltop();		// get value from opstack
-	InstImm( PPC_LWZ, R_SECOND, R_OPSTACK, -4 );	// get value from opstack
-	InstImm( PPC_ADDI, R_OPSTACK, R_OPSTACK, -8 );
-    }
-    rtopped = qfalse;
-#endif
-}
-
 static void spillOpStack(int depth)
 {
 	// Store out each register on the operand stack to it's correct location.
@@ -593,38 +560,6 @@
 	}	
 }
 
-static void makeInteger(int depth)
-{
-	// This should really never be necessary...
-	assert(opStackRegType[depth] == 1);
-	//assert(opStackRegType[depth] == 2);
-	if(opStackRegType[depth] == 2)
-	{
-		unsigned instruction;
-		assert(opStackLoadInstructionAddr[depth]);
-		
-		printf("patching float load at %p to int load\n",opStackLoadInstructionAddr[depth]);
-		// Repatch load instruction to use LFS instead of LWZ
-		instruction = *opStackLoadInstructionAddr[depth];
-		instruction &= ~PPC_LFSX;
-		instruction |=  PPC_LWZX;
-		*opStackLoadInstructionAddr[depth] = instruction;
-		opStackLoadInstructionAddr[depth] = 0;
-		opStackRegType[depth] = 1;
-		#if 0
-		InstImm( "stfs", PPC_STFS, opStackFloatRegisters[depth], R_OPSTACK, depth*4+4);
-		// For XXX make sure we force enough NOPs to get the load into
-		// another dispatch group to avoid pipeline flush.
-		Inst( "ori", PPC_ORI,  0, 0, 0 );
-		Inst( "ori", PPC_ORI,  0, 0, 0 );
-		Inst( "ori", PPC_ORI,  0, 0, 0 );
-		Inst( "ori", PPC_ORI,  0, 0, 0 );
-		InstImm( "lwz", PPC_LWZ, opStackIntRegisters[depth], R_OPSTACK, depth*4+4);
-		opStackRegType[depth] = 1;
-		#endif
-	}
-}
-
 static void makeFloat(int depth)
 {
 	//assert(opStackRegType[depth] == 1);