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

[VM] Changed how mapping labels to segment indices works slightly.

Browse Source
This commit is contained in:
jtuu 2019-11-14 19:46:53 +02:00
parent 5c6dc50b4e
commit 69f044ead1
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,12 +205,8 @@ export class VirtualMachine {
* Schedules concurrent execution of the code at the given label. * Schedules concurrent execution of the code at the given label.
*/ */
start_thread(label: number): void { start_thread(label: number): void {
const seg_idx = this.label_to_seg_idx.get(label); const seg_idx = this.get_segment_index_by_label(label);
const segment = seg_idx == undefined ? undefined : this.object_code[seg_idx]; const segment = this.object_code[seg_idx];
if (segment == undefined) {
throw new Error(`Unknown label ${label}.`);
}
if (segment.type !== SegmentType.Instructions) { if (segment.type !== SegmentType.Instructions) {
throw new Error( throw new Error(
@ -243,7 +239,7 @@ export class VirtualMachine {
if (this.thread.length === 0) { if (this.thread.length === 0) {
this.cur_srcloc = undefined; this.cur_srcloc = undefined;
return ExecutionResult.Halted return ExecutionResult.Halted;
} }
try { try {
@ -661,7 +657,11 @@ export class VirtualMachine {
this.set_episode_called = true; this.set_episode_called = true;
if (this.get_current_execution_location().seg_idx !== ENTRY_SEGMENT) { if (
!this.object_code[
this.get_current_execution_location().seg_idx
].labels.includes(ENTRY_SEGMENT)
) {
this.io.warning( this.io.warning(
`Calling set_episode outside of segment ${ENTRY_SEGMENT} is not supported.`, `Calling set_episode outside of segment ${ENTRY_SEGMENT} is not supported.`,
srcloc, srcloc,
@ -811,22 +811,17 @@ export class VirtualMachine {
} }
private push_call_stack(exec: Thread, label: number): void { private push_call_stack(exec: Thread, label: number): void {
const seg_idx = this.label_to_seg_idx.get(label); const seg_idx = this.get_segment_index_by_label(label);
const segment = this.object_code[seg_idx];
if (seg_idx == undefined) { if (segment.type !== SegmentType.Instructions) {
throw new Error(`Invalid label called: ${label}.`); throw new Error(
`Label ${label} points to a ${SegmentType[segment.type]} segment, expecting ${
SegmentType[SegmentType.Instructions]
}.`,
);
} else { } else {
const segment = this.object_code[seg_idx]; exec.call_stack.push(new ExecutionLocation(seg_idx, -1));
if (segment.type !== SegmentType.Instructions) {
throw new Error(
`Label ${label} points to a ${SegmentType[segment.type]} segment, expecting ${
SegmentType[SegmentType.Instructions]
}.`,
);
} else {
exec.call_stack.push(new ExecutionLocation(seg_idx, -1));
}
} }
} }
@ -850,14 +845,10 @@ export class VirtualMachine {
private jump_to_label(exec: Thread, label: number): void { private jump_to_label(exec: Thread, label: number): void {
const top = exec.call_stack_top(); const top = exec.call_stack_top();
const seg_idx = this.label_to_seg_idx.get(label); const seg_idx = this.get_segment_index_by_label(label);
if (seg_idx == undefined) { top.seg_idx = seg_idx;
throw new Error(`Invalid jump label: ${label}.`); top.inst_idx = -1;
} else {
top.seg_idx = seg_idx;
top.inst_idx = -1;
}
} }
private signed_conditional_jump_with_register( private signed_conditional_jump_with_register(
@ -1152,6 +1143,14 @@ export class VirtualMachine {
public get_current_source_location(): AsmToken | undefined { public get_current_source_location(): AsmToken | undefined {
return this.cur_srcloc; return this.cur_srcloc;
} }
public get_segment_index_by_label(label: number): number {
if (!this.label_to_seg_idx.has(label)) {
throw new Error(`Invalid argument: No such label ${label}.`);
}
return this.label_to_seg_idx.get(label)!;
}
} }
export class ExecutionLocation { export class ExecutionLocation {