diff options
Diffstat (limited to 'code/qcommon')
| -rw-r--r-- | code/qcommon/vm.c | 4 | ||||
| -rw-r--r-- | code/qcommon/vm_interpreted.c | 2 | ||||
| -rw-r--r-- | code/qcommon/vm_local.h | 4 | ||||
| -rw-r--r-- | code/qcommon/vm_x86.c | 8 | 
4 files changed, 9 insertions, 9 deletions
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c index 3ec8221..2193e03 100644 --- a/code/qcommon/vm.c +++ b/code/qcommon/vm.c @@ -722,7 +722,7 @@ long	QDECL VM_Call( vm_t *vm, long callnum, ... ) {  #endif  	} else {  		struct { -			int callnum; +			long callnum;  			int args[16];  		} a;  		va_list ap; @@ -852,7 +852,7 @@ void VM_LogSyscalls( int *args ) {  		f = fopen("syscalls.log", "w" );  	}  	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] );  } diff --git a/code/qcommon/vm_interpreted.c b/code/qcommon/vm_interpreted.c index 0d0d90f..619ee67 100644 --- a/code/qcommon/vm_interpreted.c +++ b/code/qcommon/vm_interpreted.c @@ -310,7 +310,7 @@ locals from sp  #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		*opStack;  	int		programCounter; diff --git a/code/qcommon/vm_local.h b/code/qcommon/vm_local.h index f6fc043..7df5ec1 100644 --- a/code/qcommon/vm_local.h +++ b/code/qcommon/vm_local.h @@ -168,10 +168,10 @@ extern	vm_t	*currentVM;  extern	int		vm_debugLevel;  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 ); -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 );  int VM_SymbolToValue( vm_t *vm, const char *symbol ); diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c index a86e667..4f7bca0 100644 --- a/code/qcommon/vm_x86.c +++ b/code/qcommon/vm_x86.c @@ -81,7 +81,7 @@ static	int		ftolPtr = (int)qftol0F7F;  void doAsmCall( void );  static	int		asmCallPtr = (int)doAsmCall; -#endif // !_WIN32 +#endif  static	int		callMask = 0; // bk001213 - init @@ -192,13 +192,13 @@ void callAsmCall(void)  	currentVM->programStack = callProgramStack - 4;  	*(int *)((byte *)currentVM->dataBase + callProgramStack + 4) = callSyscallNum;  	//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;  }  // 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.  void AsmCall( void ) {  	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 -int	VM_CallCompiled( vm_t *vm, int *args ) { +int	VM_CallCompiled( vm_t *vm, long *args ) {  	int		stack[1024];  	int		programCounter;  	int		programStack;  | 
