zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the beginning of VM_Execute()

Browse source 
This also moves the loop control stuff into #ifndef CON_DIRECT_THREADING_DISPATCH blocks, since we don't actually need a loop anymore when using the computed goto stuff.

git-svn-id: https://svn.eduke32.com/eduke32@7646 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-05-19 03:54:08 +00:00 committed by Christoph Oelckers
parent db8bcba93a
commit 058c1a8060
1 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
source/duke3d/src/gameexec.cpp
View file

@ -1284,6 +1284,7 @@ void Screen_Play(void)
#else #else
# define vInstruction(KEYWORDID) case KEYWORDID # define vInstruction(KEYWORDID) case KEYWORDID
# define vmErrorCase default # define vmErrorCase default
# define dispatch_unconditionally(...) continue
# define dispatch(...) continue # define dispatch(...) continue
# define eval(INSTRUCTION) switch(INSTRUCTION) # define eval(INSTRUCTION) switch(INSTRUCTION)
# define abort_after_error(...) continue // non-threaded dispatch handles this in the loop condition in VM_Execute() # define abort_after_error(...) continue // non-threaded dispatch handles this in the loop condition in VM_Execute()
@ -1303,38 +1304,18 @@ GAMEEXEC_STATIC void VM_Execute(bool const loop /*= false*/)
{ {
native_t loopcnt = loop; native_t loopcnt = loop;
#ifndef CON_DIRECT_THREADING_DISPATCH
do do
{ {
#ifndef CON_DIRECT_THREADING_DISPATCH #else
next_instruction: static void* jumpTable[] = JUMP_TABLE_ARRAY_LITERAL;
#endif #endif
native_t tw = *insptr; native_t tw = *insptr;
g_errorLineNum = tw >> 12; g_errorLineNum = tw >> 12;
g_tw = tw &= VM_INSTMASK; g_tw = tw &= VM_INSTMASK;
#ifdef CON_DIRECT_THREADING_DISPATCH
static void* jumpTable[] = JUMP_TABLE_ARRAY_LITERAL;
#else
if (tw == CON_ELSE)
{
insptr = (intptr_t *)insptr[1];
goto next_instruction;
}
else if (tw == CON_LEFTBRACE)
{
insptr++, loopcnt++;
goto next_instruction;
}
else if (tw == CON_RIGHTBRACE)
{
insptr++, loopcnt--;
continue;
}
else
#endif
eval(tw) eval(tw)
{ {
#ifdef CON_DIRECT_THREADING_DISPATCH
vInstruction(CON_LEFTBRACE): vInstruction(CON_LEFTBRACE):
{ {
insptr++, loopcnt++; insptr++, loopcnt++;
@ -1352,15 +1333,15 @@ GAMEEXEC_STATIC void VM_Execute(bool const loop /*= false*/)
insptr = (intptr_t *)insptr[1]; insptr = (intptr_t *)insptr[1];
dispatch_unconditionally(); dispatch_unconditionally();
} }
#endif
vInstruction(CON_STATE): vInstruction(CON_STATE):
{ {
auto tempscrptr = &insptr[2]; auto tempscrptr = &insptr[2];
insptr = (intptr_t *)insptr[1]; insptr = (intptr_t *)insptr[1];
VM_Execute(true); VM_Execute(true);
insptr = tempscrptr; insptr = tempscrptr;
} }
dispatch(); dispatch();
#ifdef CON_DISCRETE_VAR_ACCESS #ifdef CON_DISCRETE_VAR_ACCESS
vInstruction(CON_IFVARE_GLOBAL): vInstruction(CON_IFVARE_GLOBAL):
@ -6232,11 +6213,14 @@ badindex:
"If you are a developer, please attach all of your script files\n" "If you are a developer, please attach all of your script files\n"
"along with instructions on how to reproduce this error.\n\n" "along with instructions on how to reproduce this error.\n\n"
"Thank you!"); "Thank you!");
#if !defined CON_DIRECT_THREADING_DISPATCH #ifndef CON_DIRECT_THREADING_DISPATCH
break; break;
#endif #endif
} }
} while (loopcnt && (vm.flags & (VM_RETURN|VM_KILL|VM_NOEXECUTE)) == 0); #ifndef CON_DIRECT_THREADING_DISPATCH
}
while (loopcnt && (vm.flags & (VM_RETURN|VM_KILL|VM_NOEXECUTE)) == 0);
#endif
} }
// NORECURSE // NORECURSE