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

Fixed VM threading in auto-advance mode.

Browse Source 
Now when a thread is started at least one advance is required to have valid execution state.
This commit is contained in:
jtuu 2019-11-21 15:22:47 +02:00
parent 8582a25bc3
commit b24afee12a
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/quest_editor/QuestRunner.ts
View File

@ -50,8 +50,7 @@ export class QuestRunner {
/**
* Have we executed since last advancing the instruction pointer?
*/
private executed_since_advance = false;
private first_frame = true;
private executed_since_advance = true;
constructor() {
this.vm = new VirtualMachine(this.create_vm_io());
@ -81,8 +80,7 @@ export class QuestRunner {
this._running.val = true;
this._paused.val = false;
this.executed_since_advance = false;
this.first_frame = true;
this.executed_since_advance = true;
this.schedule_frame();
}
@ -160,16 +158,14 @@ export class QuestRunner {
let need_emit_unpause = this.paused.val;
exec_loop: while (true) {
if (this.first_frame || this.executed_since_advance) {
if (!this.first_frame) {
this.vm.advance();
if (this.executed_since_advance) {
this.vm.advance();
this.executed_since_advance = false;
this.executed_since_advance = false;
if (this.vm.halted) {
this.stop();
break exec_loop;
}
if (this.vm.halted) {
this.stop();
break exec_loop;
}
const srcloc = this.vm.get_current_source_location();
@ -199,7 +195,6 @@ export class QuestRunner {
result = this.vm.execute(false);
this.executed_since_advance = true;
this.first_frame = false;
switch (result) {
case ExecutionResult.WaitingVsync:
@ -221,7 +216,6 @@ export class QuestRunner {
}
}
this.first_frame = false;
this._paused.val = true;
};

16
src/quest_editor/scripting/vm/index.ts
View File

@ -219,13 +219,11 @@ export class VirtualMachine {
);
}
const thread = new Thread(this.io, new ExecutionLocation(seg_idx!, 0), true);
const thread = new Thread(this.io, new ExecutionLocation(seg_idx!, -1), true);
this.thread.push(thread);
this._halted = false;
this.update_source_location(thread);
}
private dispose_thread(thread_idx: number): void {
@ -293,6 +291,14 @@ export class VirtualMachine {
return ExecutionResult.Halted;
}
if (auto_advance) {
this.advance();
}
if (this._halted) {
return ExecutionResult.Halted;
}
try {
const exec = this.thread[this.thread_idx];
const inst = this.get_next_instruction_from_thread(exec);
@ -733,9 +739,7 @@ export class VirtualMachine {
break;
}
if (auto_advance) {
this.advance();
}
if (this.thread_idx >= this.thread.length) return ExecutionResult.WaitingVsync;
return result;
}