okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- load qvm file by default again to avoid 'unpure' error

Browse source 
- fix loading qvms in 64bit q3
This commit is contained in:
Ludwig Nussel 2005-08-30 21:25:54 +00:00
parent 770c6808d0
commit 54d65a0ead
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
code/qcommon/vm_interpreted.c
View file

@ -518,7 +518,20 @@ nextInstruction2:
*(int *)&image[ programStack + 4 ] = -1 - programCounter;
//VM_LogSyscalls( (int *)&image[ programStack + 4 ] );
r = vm->systemCall( (int *)&image[ programStack + 4 ] );
{
long* argptr = (long *)&image[ programStack + 4 ];
#if __WORDSIZE == 64
// the vm has ints on the stack, we expect
// longs so we have to convert it
long argarr[16];
int i;
for (i = 0; i < 16; ++i) {
argarr[i] = *(int*)&image[ programStack + 4 + 4*i ];
argptr = argarr;
}
#endif
r = vm->systemCall( argptr );
}
#ifdef DEBUG_VM
// this is just our stack frame pointer, only needed