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

use vm->callLevel to count recursive calls to VM_Call

Browse source 
Throw an error if vm->callLevel is set and VM_Free is called.
This commit is contained in:
Ludwig Nussel 2008-03-24 21:20:55 +00:00
parent 6c5211c0d3
commit 7a5243a3b2
4 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
code/qcommon/vm_interpreted.c
View file

@ -376,8 +376,6 @@ int VM_CallInterpreted( vm_t *vm, int *args ) {
*(int *)&image[ programStack + 4 ] = 0; // return stack
*(int *)&image[ programStack ] = -1; // will terminate the loop on return
vm->callLevel = 0;
VM_Debug(0);
// vm_debugLevel=2;
@ -516,7 +514,7 @@ nextInstruction2:
if ( programCounter < 0 ) {
// system call
int r;
int temp;
// int temp;
#ifdef DEBUG_VM
int stomped;
@ -525,7 +523,7 @@ nextInstruction2:
}
#endif
// save the stack to allow recursive VM entry
temp = vm->callLevel;
// temp = vm->callLevel;
vm->programStack = programStack - 4;
#ifdef DEBUG_VM
stomped = *(int *)&image[ programStack + 4 ];
@ -558,7 +556,7 @@ nextInstruction2:
opStack++;
*opStack = r;
programCounter = *(int *)&image[ programStack ];
vm->callLevel = temp;
// vm->callLevel = temp;
#ifdef DEBUG_VM
if ( vm_debugLevel ) {
Com_Printf( "%s<--- %s\n", DEBUGSTR, VM_ValueToSymbol( vm, programCounter ) );
@ -599,7 +597,7 @@ nextInstruction2:
// vm_debugLevel = 2;
// VM_StackTrace( vm, programCounter, programStack );
}
vm->callLevel++;
// vm->callLevel++;
}
#endif
goto nextInstruction;
@ -614,7 +612,7 @@ nextInstruction2:
#ifdef DEBUG_VM
profileSymbol = VM_ValueToFunctionSymbol( vm, programCounter );
if ( vm_debugLevel ) {
vm->callLevel--;
// vm->callLevel--;
Com_Printf( "%s<--- %s\n", DEBUGSTR, VM_ValueToSymbol( vm, programCounter ) );
}
#endif