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

Minor VM_Execute() maintenance

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7631 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-05-19 03:53:03 +00:00 committed by Christoph Oelckers
parent 3db7512c69
commit 92174a0cf9
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ int32_t g_structVarIDs = -1;
uint32_t g_eventCalls[MAXEVENTS], g_actorCalls[MAXTILES]; uint32_t g_eventCalls[MAXEVENTS], g_actorCalls[MAXTILES];
double g_eventTotalMs[MAXEVENTS], g_actorTotalMs[MAXTILES], g_actorMinMs[MAXTILES], g_actorMaxMs[MAXTILES]; double g_eventTotalMs[MAXEVENTS], g_actorTotalMs[MAXTILES], g_actorMinMs[MAXTILES], g_actorMaxMs[MAXTILES];
GAMEEXEC_STATIC void VM_Execute(native_t loop); GAMEEXEC_STATIC void VM_Execute(bool const loop = false);
# include "gamestructures.cpp" # include "gamestructures.cpp"
#endif #endif
@ -182,7 +182,7 @@ static FORCE_INLINE int32_t VM_EventCommon__(int const &eventNum, int const &spr
if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers)) if (EDUKE32_PREDICT_FALSE((unsigned)playerNum >= (unsigned)g_mostConcurrentPlayers))
vm.pPlayer = g_player[0].ps; vm.pPlayer = g_player[0].ps;
VM_Execute(1); VM_Execute(true);
if (vm.flags & VM_KILL) if (vm.flags & VM_KILL)
VM_DeleteSprite(vm.spriteNum, vm.playerNum); VM_DeleteSprite(vm.spriteNum, vm.playerNum);
@ -1264,7 +1264,7 @@ void Screen_Play(void)
if ((xxx) || ((insptr = (intptr_t *)insptr[1]) && ((*insptr & VM_INSTMASK) == CON_ELSE))) \ if ((xxx) || ((insptr = (intptr_t *)insptr[1]) && ((*insptr & VM_INSTMASK) == CON_ELSE))) \
{ \ { \
insptr += 2; \ insptr += 2; \
VM_Execute(0); \ VM_Execute(); \
} \ } \
} }
@ -1274,25 +1274,25 @@ void Screen_Play(void)
#ifdef CON_DIRECT_THREADING_DISPATCH #ifdef CON_DIRECT_THREADING_DISPATCH
# define vInstruction(KEYWORDID) VINST_ ## KEYWORDID # define vInstruction(KEYWORDID) VINST_ ## KEYWORDID
# define eval(INSTRUCTION) {if ((unsigned)INSTRUCTION <= CON_OPCODE_END) {goto *jumpTable[INSTRUCTION];} goto VINST_CON_OPCODE_END;} # define vmErrorCase VINST_CON_OPCODE_END
# define eval(INSTRUCTION) { if ((unsigned)INSTRUCTION < CON_OPCODE_END) goto *jumpTable[INSTRUCTION]; else goto vmErrorCase; }
# define dispatch_unconditionally(...) { tw = *insptr; g_errorLineNum = tw >> 12; g_tw = tw &= VM_INSTMASK; eval(tw) } # define dispatch_unconditionally(...) { tw = *insptr; g_errorLineNum = tw >> 12; g_tw = tw &= VM_INSTMASK; eval(tw) }
# define dispatch(...) { if (loop && (vm.flags & (VM_RETURN|VM_KILL|VM_NOEXECUTE)) == 0) dispatch_unconditionally(...); return; } # define dispatch(...) { if (loopcnt && (vm.flags & (VM_RETURN|VM_KILL|VM_NOEXECUTE)) == 0) dispatch_unconditionally(__VA_ARGS__); return; }
# define abort_after_error(...) return # define abort_after_error(...) return
# define vInstructionPointer(KEYWORDID) &&VINST_ ## KEYWORDID # define vInstructionPointer(KEYWORDID) &&VINST_ ## KEYWORDID
# define COMMA , # define COMMA ,
# define JUMP_TABLE_ARRAY_LITERAL { TRANSFORM_SCRIPT_KEYWORDS_LIST(vInstructionPointer, COMMA) } # define JUMP_TABLE_ARRAY_LITERAL { TRANSFORM_SCRIPT_KEYWORDS_LIST(vInstructionPointer, COMMA) }
# define vmErrorCase VINST_CON_OPCODE_END
#else #else
# define vInstruction(KEYWORDID) case KEYWORDID # define vInstruction(KEYWORDID) case KEYWORDID
# define vmErrorCase default
# 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()
# define vmErrorCase default
#endif #endif
GAMEEXEC_STATIC void VM_Execute(native_t const poop) GAMEEXEC_STATIC void VM_Execute(bool const loop /*= false*/)
{ {
native_t loop = poop; native_t loopcnt = loop;
do do
{ {
@ -1313,12 +1313,12 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
} }
else if (tw == CON_LEFTBRACE) else if (tw == CON_LEFTBRACE)
{ {
insptr++, loop++; insptr++, loopcnt++;
goto next_instruction; goto next_instruction;
} }
else if (tw == CON_RIGHTBRACE) else if (tw == CON_RIGHTBRACE)
{ {
insptr++, loop--; insptr++, loopcnt--;
continue; continue;
} }
else else
@ -1328,13 +1328,13 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
#ifdef CON_DIRECT_THREADING_DISPATCH #ifdef CON_DIRECT_THREADING_DISPATCH
vInstruction(CON_LEFTBRACE): vInstruction(CON_LEFTBRACE):
{ {
insptr++, loop++; insptr++, loopcnt++;
dispatch_unconditionally(); dispatch_unconditionally();
} }
vInstruction(CON_RIGHTBRACE): vInstruction(CON_RIGHTBRACE):
{ {
insptr++, loop--; insptr++, loopcnt--;
dispatch(); dispatch();
} }
@ -1348,7 +1348,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
auto tempscrptr = &insptr[2]; auto tempscrptr = &insptr[2];
insptr = (intptr_t *)insptr[1]; insptr = (intptr_t *)insptr[1];
VM_Execute(1); VM_Execute(true);
insptr = tempscrptr; insptr = tempscrptr;
} }
dispatch(); dispatch();
@ -2650,7 +2650,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
// fake a 2-d Array // fake a 2-d Array
insptr = (intptr_t *)(lpCases[(lCheckCase << 1) + 1] + &apScript[0]); insptr = (intptr_t *)(lpCases[(lCheckCase << 1) + 1] + &apScript[0]);
VM_Execute(1); VM_Execute(true);
goto matched; goto matched;
} }
@ -2661,7 +2661,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
if (*lpDefault) if (*lpDefault)
{ {
insptr = (intptr_t *)(*lpDefault + &apScript[0]); insptr = (intptr_t *)(*lpDefault + &apScript[0]);
VM_Execute(1); VM_Execute(true);
} }
matched: matched:
@ -2690,7 +2690,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
break; break;
case ITER_ALLSPRITESBYSTAT: case ITER_ALLSPRITESBYSTAT:
@ -2701,7 +2701,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
int const kk = nextspritestat[jj]; int const kk = nextspritestat[jj];
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
jj = kk; jj = kk;
} }
} }
@ -2714,7 +2714,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
int const kk = nextspritesect[jj]; int const kk = nextspritesect[jj];
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
jj = kk; jj = kk;
} }
} }
@ -2724,7 +2724,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
break; break;
case ITER_ALLWALLS: case ITER_ALLWALLS:
@ -2732,7 +2732,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
break; break;
case ITER_ACTIVELIGHTS: case ITER_ACTIVELIGHTS:
@ -2744,7 +2744,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
#endif #endif
break; break;
@ -2755,7 +2755,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
Gv_SetVarX(returnVar, ii); Gv_SetVarX(returnVar, ii);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
break; break;
} }
@ -2768,7 +2768,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
int const kk = nextspritesect[jj]; int const kk = nextspritesect[jj];
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
jj = kk; jj = kk;
} }
break; break;
@ -2780,7 +2780,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
int const kk = nextspritestat[jj]; int const kk = nextspritestat[jj];
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
jj = kk; jj = kk;
} }
break; break;
@ -2791,7 +2791,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
break; break;
case ITER_LOOPOFWALL: case ITER_LOOPOFWALL:
@ -2803,7 +2803,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
jj = wall[jj].point2; jj = wall[jj].point2;
} while (jj != nIndex); } while (jj != nIndex);
} }
@ -2813,7 +2813,7 @@ GAMEEXEC_STATIC void VM_Execute(native_t const poop)
{ {
Gv_SetVarX(returnVar, jj); Gv_SetVarX(returnVar, jj);
insptr = pNext; insptr = pNext;
VM_Execute(0); VM_Execute();
} }
break; break;
badindex: badindex:
@ -6456,7 +6456,7 @@ badindex:
break; break;
#endif #endif
} }
} while (loop && (vm.flags & (VM_RETURN|VM_KILL|VM_NOEXECUTE)) == 0); } while (loopcnt && (vm.flags & (VM_RETURN|VM_KILL|VM_NOEXECUTE)) == 0);
} }
// NORECURSE // NORECURSE
@ -6483,7 +6483,7 @@ void A_LoadActor(int32_t spriteNum)
} }
insptr = g_tile[vm.pSprite->picnum].loadPtr; insptr = g_tile[vm.pSprite->picnum].loadPtr;
VM_Execute(1); VM_Execute(true);
insptr = NULL; insptr = NULL;
if (vm.flags & VM_KILL) if (vm.flags & VM_KILL)
@ -6567,7 +6567,7 @@ void A_Execute(int spriteNum, int playerNum, int playerDist)
#else #else
int const picnum = vm.pSprite->picnum; int const picnum = vm.pSprite->picnum;
insptr = 4 + (g_tile[vm.pSprite->picnum].execPtr); insptr = 4 + (g_tile[vm.pSprite->picnum].execPtr);
VM_Execute(1); VM_Execute(true);
insptr = NULL; insptr = NULL;
#endif #endif