Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 15:28:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved clarity of code regarding pause ignoring in the VM.

Browse Source
This commit is contained in:
jtuu 2020-05-01 07:16:02 +03:00
parent 9d6ccb5267
commit 0f25781857
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/quest_editor/scripting/vm/VirtualMachine.ts
View File

@ -303,6 +303,12 @@ export class VirtualMachine {
// This thread is the one currently selected for debugging? // This thread is the one currently selected for debugging?
const debugging_current_thread = thread.id === this.debugging_thread_id; const debugging_current_thread = thread.id === this.debugging_thread_id;
const allow_pausing = debugging_current_thread
? // Debugging current thread: Allow pausing if not ignoring pauses.
this.ignore_pauses_until_after_line === undefined
: // Not debugging current thread: Only allow pausing on breakpoints.
thread.step_mode === StepMode.BreakPoint;
// Get current instruction. // Get current instruction.
const frame = thread.current_stack_frame()!; const frame = thread.current_stack_frame()!;
inst_ptr = frame.instruction_pointer; inst_ptr = frame.instruction_pointer;
@ -310,25 +316,21 @@ export class VirtualMachine {
// Check whether the VM needs to pause only if it's not already paused. In that case // Check whether the VM needs to pause only if it's not already paused. In that case
// it's resuming. // it's resuming.
if (!this.paused) { if (allow_pausing && !this.paused) {
switch (thread.step_mode) { switch (thread.step_mode) {
// Always pause on breakpoints regardless of selected thread.
case StepMode.BreakPoint: case StepMode.BreakPoint:
if (this.breakpoints.findIndex(bp => bp.equals(inst_ptr!)) !== -1) { if (this.breakpoints.findIndex(bp => bp.equals(inst_ptr!)) !== -1) {
this.paused = true; this.paused = true;
this.debugging_thread_id = thread.id;
// A breakpoint should interrupt the pause ignoring process // A breakpoint should interrupt the pause ignoring process
// since we are now probably in a different execution location. // since we are now in a different execution location.
this.debugging_thread_id = thread.id;
this.ignore_pauses_until_after_line = undefined; this.ignore_pauses_until_after_line = undefined;
return ExecutionResult.Paused; return ExecutionResult.Paused;
} }
break; break;
// Only pause on steps if we are in the currently selected thread.
case StepMode.Over: case StepMode.Over:
if ( if (
debugging_current_thread &&
this.ignore_pauses_until_after_line === undefined &&
thread.step_frame && thread.step_frame &&
frame.idx <= thread.step_frame.idx && frame.idx <= thread.step_frame.idx &&
inst.asm?.mnemonic inst.asm?.mnemonic
@ -339,11 +341,7 @@ export class VirtualMachine {
break; break;
case StepMode.In: case StepMode.In:
if ( if (inst.asm?.mnemonic) {
debugging_current_thread &&
this.ignore_pauses_until_after_line === undefined &&
inst.asm?.mnemonic
) {
this.paused = true; this.paused = true;
return ExecutionResult.Paused; return ExecutionResult.Paused;
} }
@ -351,8 +349,6 @@ export class VirtualMachine {
case StepMode.Out: case StepMode.Out:
if ( if (
debugging_current_thread &&
this.ignore_pauses_until_after_line === undefined &&
thread.step_frame && thread.step_frame &&
frame.idx < thread.step_frame.idx && frame.idx < thread.step_frame.idx &&
inst.asm?.mnemonic inst.asm?.mnemonic
@ -362,14 +358,13 @@ export class VirtualMachine {
} }
break; break;
} }
}
// Check if we can stop ignoring pauses.
if (debugging_current_thread && this.ignore_pauses_until_after_line !== undefined) {
const line = inst.asm?.mnemonic?.line_no;
// Reached line, allow pausing again. // Reached line, allow pausing again.
if ( if (this.ignore_pauses_until_after_line === line) {
debugging_current_thread &&
this.ignore_pauses_until_after_line ===
this.get_instruction_pointer(this.debugging_thread_id)?.source_location
?.line_no
) {
this.ignore_pauses_until_after_line = undefined; this.ignore_pauses_until_after_line = undefined;
} }
} }