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 some warnings into errors and added source locations to warnings.

Browse Source
This commit is contained in:
jtuu 2019-10-17 14:39:41 +03:00
parent f3c26f9eda
commit 416e15e68e
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,7 +496,7 @@ export class VirtualMachine {
break; break;
case OP_WINDOW_MSG.code: case OP_WINDOW_MSG.code:
if (!this.window_msg_open) { if (!this.window_msg_open) {
const args = exec.fetch_args(inst.opcode.params); const args = exec.fetch_args(inst);
const str = this.deref_string(args[0]); const str = this.deref_string(args[0]);
this.window_msg_open = true; this.window_msg_open = true;
@ -505,7 +505,7 @@ export class VirtualMachine {
break; break;
case OP_ADD_MSG.code: case OP_ADD_MSG.code:
if (this.window_msg_open) { if (this.window_msg_open) {
const args = exec.fetch_args(inst.opcode.params); const args = exec.fetch_args(inst);
const str = this.deref_string(args[0]); const str = this.deref_string(args[0]);
this.io.add_msg(str); this.io.add_msg(str);
@ -600,12 +600,12 @@ export class VirtualMachine {
const seg_idx = this.label_to_seg_idx.get(label); const seg_idx = this.label_to_seg_idx.get(label);
if (seg_idx == undefined) { if (seg_idx == undefined) {
this.io.warning(`Invalid label called: ${label}.`); throw new Error(`Invalid label called: ${label}.`);
} else { } else {
const segment = this.object_code[seg_idx]; const segment = this.object_code[seg_idx];
if (segment.type !== SegmentType.Instructions) { if (segment.type !== SegmentType.Instructions) {
this.io.warning( throw new Error(
`Label ${label} points to a ${SegmentType[segment.type]} segment, expecting ${ `Label ${label} points to a ${SegmentType[segment.type]} segment, expecting ${
SegmentType[SegmentType.Instructions] SegmentType[SegmentType.Instructions]
}.`, }.`,
@ -639,7 +639,7 @@ export class VirtualMachine {
const seg_idx = this.label_to_seg_idx.get(label); const seg_idx = this.label_to_seg_idx.get(label);
if (seg_idx == undefined) { if (seg_idx == undefined) {
this.io.warning(`Invalid jump label: ${label}.`); throw new Error(`Invalid jump label: ${label}.`);
} else { } else {
top.seg_idx = seg_idx; top.seg_idx = seg_idx;
top.inst_idx = -1; top.inst_idx = -1;
@ -830,18 +830,19 @@ class Thread {
this.arg_stack_counter++; this.arg_stack_counter++;
} }
public fetch_args(params: readonly Param[]): number[] { public fetch_args(inst: Instruction): number[] {
const args: number[] = []; const args: number[] = [];
const srcloc: AsmToken | undefined = inst.asm && inst.asm.mnemonic;
if (params.length !== this.arg_stack_counter) { if (inst.opcode.params.length !== this.arg_stack_counter) {
this.io.warning("Argument stack: Argument count mismatch"); this.io.warning("Argument stack: Argument count mismatch", srcloc);
} }
for (let i = 0; i < params.length; i++) { for (let i = 0; i < inst.opcode.params.length; i++) {
const param = params[i]; const param = inst.opcode.params[i];
if (param.type.kind !== this.arg_stack_types[i]) { if (param.type.kind !== this.arg_stack_types[i]) {
this.io.warning("Argument stack: Argument type mismatch"); this.io.warning("Argument stack: Argument type mismatch", srcloc);
} }
switch (param.type.kind) { switch (param.type.kind) {
@ -856,7 +857,9 @@ class Thread {
args.push(this.arg_stack.u32_at(i * ARG_STACK_SLOT_SIZE)); args.push(this.arg_stack.u32_at(i * ARG_STACK_SLOT_SIZE));
break; break;
default: default:
throw new Error(`Argument stack: Unhandled param kind: Kind.${Kind[param.type.kind]}`); throw new Error(
`Argument stack: Unhandled param kind: Kind.${Kind[param.type.kind]}`,
);
} }
} }