ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Potential fix to https://bugzilla.icculus.org/show_bug.cgi?id=2486

This commit is contained in:
Tim Angus 2005-11-15 17:02:45 +00:00
parent 0163f77f4e
commit 25785fe0e6
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
code/tools/asm/q3asm.c
View File

@ -24,11 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "mathlib.h" #include "mathlib.h"
#include "../../qcommon/qfiles.h" #include "../../qcommon/qfiles.h"
/* MSVC-ism fix. */
#ifdef _WIN32
#define atoi(s) strtoul(s,NULL,10)
#endif
/* 19079 total symbols in FI, 2002 Jan 23 */ /* 19079 total symbols in FI, 2002 Jan 23 */
#define DEFAULT_HASHTABLE_SIZE 2048 #define DEFAULT_HASHTABLE_SIZE 2048
@ -425,32 +420,33 @@ sort_symbols ()
} }
#ifdef _MSC_VER
#define INT64 __int64
#define atoi64 _atoi64
#else
#define INT64 long long int
#define atoi64 atoll
#endif
/* /*
Problem: Problem:
BYTE values are specified as signed decimal string. BYTE values are specified as signed decimal string. A properly functional
A properly functional atoi() will cap large signed values at 0x7FFFFFFF. atoip() will cap large signed values at 0x7FFFFFFF. Negative word values are
Negative word values are often specified as very large decimal values by lcc. often specified as very large decimal values by lcc. Therefore, values that
Therefore, values that should be between 0x7FFFFFFF and 0xFFFFFFFF come out as 0x7FFFFFFF when using atoi(). should be between 0x7FFFFFFF and 0xFFFFFFFF come out as 0x7FFFFFFF when using
Bad. atoi(). Bad.
This function is one big evil hack to work around this problem. This function is one big evil hack to work around this problem.
*/ */
/* FIXME: Find out maximum token length for VC++ -PH */ int atoiNoCap (const char *s)
int
ThingToConvertDecimalIntoSigned32SoThatAtoiDoesntCapAt7FFFFFFF (const char *s)
{ {
/* Variable `l' should be an integer variant larger than 32 bits. INT64 l;
On gnu-x86, "long long" is 64 bits. -PH
*/
long long int l;
union { union {
unsigned int u; unsigned int u;
signed int i; signed int i;
} retval; } retval;
l = atoll(s); l = atoi64(s);
/* Now smash to signed 32 bits accordingly. */ /* Now smash to signed 32 bits accordingly. */
if (l < 0) { if (l < 0) {
retval.i = (int)l; retval.i = (int)l;
@ -460,11 +456,6 @@ ThingToConvertDecimalIntoSigned32SoThatAtoiDoesntCapAt7FFFFFFF (const char *s)
return retval.i; /* <- union hackage. I feel dirty with this. -PH */ return retval.i; /* <- union hackage. I feel dirty with this. -PH */
} }
/* Programmer Attribute #1: laziness */
#ifndef _WIN32
#define atoi ThingToConvertDecimalIntoSigned32SoThatAtoiDoesntCapAt7FFFFFFF
#endif
/* /*
@ -734,7 +725,7 @@ ParseValue
*/ */
int ParseValue( void ) { int ParseValue( void ) {
Parse(); Parse();
return atoi( token ); return atoiNoCap( token );
} }
@ -764,7 +755,7 @@ int ParseExpression(void) {
case '-': case '-':
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': case '5': case '6': case '7': case '8': case '9':
v = atoi(sym); v = atoiNoCap(sym);
break; break;
default: default:
v = LookupSymbol(sym); v = LookupSymbol(sym);
@ -784,10 +775,10 @@ int ParseExpression(void) {
switch (token[i]) { switch (token[i]) {
case '+': case '+':
v += atoi(sym); v += atoiNoCap(sym);
break; break;
case '-': case '-':
v -= atoi(sym); v -= atoiNoCap(sym);
break; break;
} }
@ -1087,7 +1078,7 @@ STAT("EQU");
Parse(); Parse();
strcpy( name, token ); strcpy( name, token );
Parse(); Parse();
DefineSymbol( name, atoi(token) ); DefineSymbol( name, atoiNoCap(token) );
return 1; return 1;
} }
return 0; return 0;
@ -1580,7 +1571,7 @@ Assemble LCC bytecode assembly to Q3VM bytecode.\n\
Error("-b requires an argument"); Error("-b requires an argument");
} }
i++; i++;
symtablelen = atoi(argv[i]); symtablelen = atoiNoCap(argv[i]);
continue; continue;
} }