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

revert int->long change as it breaks on 64bit. Actually only 

VM_CallInterpreted hurts as VM_CallCompiled is only used on 32bit. Use
same arg types for consistency nevertheless.
This commit is contained in:
Ludwig Nussel 2005-09-26 22:23:46 +00:00
parent 534da92fc0
commit d5fbff3f44
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/qcommon/vm.c
View File

@ -718,11 +718,12 @@ long QDECL VM_Call( vm_t *vm, long callnum, ... ) {
args[12], args[13], args[14], args[15]);
#if defined(HAVE_VM_COMPILED)
} else if ( vm->compiled ) {
r = VM_CallCompiled( vm, &callnum );
// only used on 32bit machines so this cast is fine
r = VM_CallCompiled( vm, (int*)&callnum );
#endif
} else {
struct {
long callnum;
int callnum;
int args[16];
} a;
va_list ap;
@ -852,7 +853,7 @@ void VM_LogSyscalls( int *args ) {
f = fopen("syscalls.log", "w" );
}
callnum++;
fprintf(f, "%i: %li (%i) = %i %i %i %i\n", callnum, (long)( 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] );
}

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 )
int VM_CallInterpreted( vm_t *vm, long *args ) {
int VM_CallInterpreted( vm_t *vm, int *args ) {
int stack[MAX_STACK];
int *opStack;
int programCounter;

4
code/qcommon/vm_local.h
View File

@ -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, long *args );
int VM_CallCompiled( vm_t *vm, int *args );
void VM_PrepareInterpreter( vm_t *vm, vmHeader_t *header );
int VM_CallInterpreted( vm_t *vm, long *args );
int VM_CallInterpreted( vm_t *vm, int *args );
vmSymbol_t *VM_ValueToFunctionSymbol( vm_t *vm, int value );
int VM_SymbolToValue( vm_t *vm, const char *symbol );

2
code/qcommon/vm_none.c
View File

@ -1,6 +1,6 @@
#include "vm_local.h"
int VM_CallCompiled( vm_t *vm, long *args ) {
int VM_CallCompiled( vm_t *vm, int *args ) {
exit(99);
return 0;
}

2
code/qcommon/vm_ppc.c
View File

@ -1161,7 +1161,7 @@ VM_CallCompiled
This function is called directly by the generated code
==============
*/
int VM_CallCompiled( vm_t *vm, long *args ) {
int VM_CallCompiled( vm_t *vm, int *args ) {
int stack[1024];
int programStack;
int stackOnEntry;

2
code/qcommon/vm_x86.c
View File

@ -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, long *args ) {
int VM_CallCompiled( vm_t *vm, int *args ) {
int stack[1024];
int programCounter;
int programStack;