teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-23 04:12:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed some long/int warnings, hopefully this doesn't disrupt the MSVC and/or 64bit builds

Browse source
This commit is contained in:
Tim Angus 2005-09-26 16:13:14 +00:00
parent 429e59a53c
commit cde9e9e93c
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/qcommon/vm.c
View file

@ -722,7 +722,7 @@ long QDECL VM_Call( vm_t *vm, long callnum, ... ) {
#endif #endif
} else { } else {
struct { struct {
int callnum; long callnum;
int args[16]; int args[16];
} a; } a;
va_list ap; va_list ap;
@ -852,7 +852,7 @@ void VM_LogSyscalls( int *args ) {
f = fopen("syscalls.log", "w" ); f = fopen("syscalls.log", "w" );
} }
callnum++; callnum++;
fprintf(f, "%i: %li (%i) = %i %i %i %i\n", callnum, args - (int *)currentVM->dataBase, fprintf(f, "%i: %li (%i) = %i %i %i %i\n", callnum, (long)( args - (int *)currentVM->dataBase ),
args[0], args[1], args[2], args[3], args[4] ); args[0], args[1], args[2], args[3], args[4] );
} }

2
code/qcommon/vm_interpreted.c
View file

@ -310,7 +310,7 @@ locals from sp
#define DEBUGSTR va("%s%i", VM_Indent(vm), opStack-stack ) #define DEBUGSTR va("%s%i", VM_Indent(vm), opStack-stack )
int VM_CallInterpreted( vm_t *vm, int *args ) { int VM_CallInterpreted( vm_t *vm, long *args ) {
int stack[MAX_STACK]; int stack[MAX_STACK];
int *opStack; int *opStack;
int programCounter; int programCounter;

4
code/qcommon/vm_local.h
View file

@ -168,10 +168,10 @@ extern vm_t *currentVM;
extern int vm_debugLevel; extern int vm_debugLevel;
void VM_Compile( vm_t *vm, vmHeader_t *header ); void VM_Compile( vm_t *vm, vmHeader_t *header );
int VM_CallCompiled( vm_t *vm, int *args ); int VM_CallCompiled( vm_t *vm, long *args );
void VM_PrepareInterpreter( vm_t *vm, vmHeader_t *header ); void VM_PrepareInterpreter( vm_t *vm, vmHeader_t *header );
int VM_CallInterpreted( vm_t *vm, int *args ); int VM_CallInterpreted( vm_t *vm, long *args );
vmSymbol_t *VM_ValueToFunctionSymbol( vm_t *vm, int value ); vmSymbol_t *VM_ValueToFunctionSymbol( vm_t *vm, int value );
int VM_SymbolToValue( vm_t *vm, const char *symbol ); int VM_SymbolToValue( vm_t *vm, const char *symbol );

8
code/qcommon/vm_x86.c
View file

@ -81,7 +81,7 @@ static int ftolPtr = (int)qftol0F7F;
void doAsmCall( void ); void doAsmCall( void );
static int asmCallPtr = (int)doAsmCall; static int asmCallPtr = (int)doAsmCall;
#endif // !_WIN32 #endif
static int callMask = 0; // bk001213 - init static int callMask = 0; // bk001213 - init
@ -192,13 +192,13 @@ void callAsmCall(void)
currentVM->programStack = callProgramStack - 4; currentVM->programStack = callProgramStack - 4;
*(int *)((byte *)currentVM->dataBase + callProgramStack + 4) = callSyscallNum; *(int *)((byte *)currentVM->dataBase + callProgramStack + 4) = callSyscallNum;
//VM_LogSyscalls((int *)((byte *)currentVM->dataBase + callProgramStack + 4) ); //VM_LogSyscalls((int *)((byte *)currentVM->dataBase + callProgramStack + 4) );
*(callOpStack2+1) = currentVM->systemCall( (int *)((byte *)currentVM->dataBase + callProgramStack + 4) ); *(callOpStack2+1) = currentVM->systemCall( (long *)((byte *)currentVM->dataBase + callProgramStack + 4) );
currentVM = savedVM; currentVM = savedVM;
} }
// Note the C space function AsmCall is never actually called, and is in fact // 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 // arbitrarily named (though this is not true for the MSC version). When a vm
// makes a system call, control jumps straight to the doAsmCall label. // makes a system call, control jumps straight to the doAsmCall label.
void AsmCall( void ) { void AsmCall( void ) {
asm( CMANG(doAsmCall) ": \n\t" \ asm( CMANG(doAsmCall) ": \n\t" \
@ -1101,7 +1101,7 @@ This function is called directly by the generated code
============== ==============
*/ */
#ifndef DLL_ONLY // bk010215 - for DLL_ONLY dedicated servers/builds w/o VM #ifndef DLL_ONLY // bk010215 - for DLL_ONLY dedicated servers/builds w/o VM
int VM_CallCompiled( vm_t *vm, int *args ) { int VM_CallCompiled( vm_t *vm, long *args ) {
int stack[1024]; int stack[1024];
int programCounter; int programCounter;
int programStack; int programStack;