mirror of
https://github.com/DaanVandenBosch/phantasmal-world.git
synced 2025-04-05 15:28:29 +08:00
Instruction is now structured cloning-safe.
This commit is contained in:
Daan Vanden Bosch
parent
431c0545f2
commit
fa76002d1c
@ -8,6 +8,7 @@ import {
|
||||
DataSegment,
|
||||
Instruction,
|
||||
InstructionSegment,
|
||||
new_instruction,
|
||||
Segment,
|
||||
SegmentType,
|
||||
StringSegment,
|
||||
@ -557,14 +558,14 @@ function parse_instructions_segment(
|
||||
// Parse the arguments.
|
||||
try {
|
||||
const args = parse_instruction_arguments(cursor, opcode);
|
||||
instructions.push(new Instruction(opcode, args));
|
||||
instructions.push(new_instruction(opcode, args));
|
||||
} catch (e) {
|
||||
if (lenient) {
|
||||
logger.error(
|
||||
`Exception occurred while parsing arguments for instruction ${opcode.mnemonic}.`,
|
||||
e,
|
||||
);
|
||||
instructions.push(new Instruction(opcode, []));
|
||||
instructions.push(new_instruction(opcode, []));
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
export function arrays_equal<T>(
|
||||
a: T[],
|
||||
b: T[],
|
||||
a: readonly T[],
|
||||
b: readonly T[],
|
||||
equal: (element_a: T, element_b: T) => boolean = (a, b) => a === b,
|
||||
): boolean {
|
||||
const len = a.length;
|
||||
|
||||
@ -16,8 +16,8 @@ import {
|
||||
import {
|
||||
Arg,
|
||||
DataSegment,
|
||||
Instruction,
|
||||
InstructionSegment,
|
||||
new_instruction,
|
||||
Segment,
|
||||
SegmentType,
|
||||
StringSegment,
|
||||
@ -194,7 +194,7 @@ class Assembler {
|
||||
this.segment = instruction_segment;
|
||||
this.object_code.push(instruction_segment);
|
||||
} else if (this.segment.type === SegmentType.Instructions) {
|
||||
this.segment.instructions.push(new Instruction(opcode, args));
|
||||
this.segment.instructions.push(new_instruction(opcode, args));
|
||||
} else {
|
||||
logger.error(`Line ${this.line_no}: Expected instructions segment.`);
|
||||
}
|
||||
@ -202,7 +202,7 @@ class Assembler {
|
||||
|
||||
private add_bytes(bytes: number[]): void {
|
||||
if (!this.segment) {
|
||||
// Unadressable data, technically valid.
|
||||
// Unaddressable data, technically valid.
|
||||
const data_segment: DataSegment = {
|
||||
labels: [],
|
||||
type: SegmentType.Data,
|
||||
|
||||
@ -6,7 +6,7 @@ import { BufferCursor } from "../../core/data_formats/cursor/BufferCursor";
|
||||
import { parse_bin, write_bin } from "../../core/data_formats/parsing/quest/bin";
|
||||
import { assemble } from "./assembly";
|
||||
import { disassemble } from "./disassembly";
|
||||
import { Instruction, object_code_equal, Segment, SegmentType } from "./instructions";
|
||||
import { new_instruction, segment_arrays_equal, Segment, SegmentType } from "./instructions";
|
||||
import { Opcode } from "./opcodes";
|
||||
|
||||
test("vararg instructions should be disassembled correctly", () => {
|
||||
@ -15,13 +15,13 @@ test("vararg instructions should be disassembled correctly", () => {
|
||||
type: SegmentType.Instructions,
|
||||
labels: [0],
|
||||
instructions: [
|
||||
new Instruction(Opcode.SWITCH_JMP, [
|
||||
new_instruction(Opcode.SWITCH_JMP, [
|
||||
{ value: 90, size: 1 },
|
||||
{ value: 100, size: 2 },
|
||||
{ value: 101, size: 2 },
|
||||
{ value: 102, size: 2 },
|
||||
]),
|
||||
new Instruction(Opcode.RET, []),
|
||||
new_instruction(Opcode.RET, []),
|
||||
],
|
||||
},
|
||||
]);
|
||||
@ -44,11 +44,11 @@ test("va list instructions should be disassembled correctly", () => {
|
||||
type: SegmentType.Instructions,
|
||||
labels: [0],
|
||||
instructions: [
|
||||
new Instruction(Opcode.VA_START, []),
|
||||
new Instruction(Opcode.ARG_PUSHW, [{ value: 1337, size: 2 }]),
|
||||
new Instruction(Opcode.VA_CALL, [{ value: 100, size: 2 }]),
|
||||
new Instruction(Opcode.VA_END, []),
|
||||
new Instruction(Opcode.RET, []),
|
||||
new_instruction(Opcode.VA_START, []),
|
||||
new_instruction(Opcode.ARG_PUSHW, [{ value: 1337, size: 2 }]),
|
||||
new_instruction(Opcode.VA_CALL, [{ value: 100, size: 2 }]),
|
||||
new_instruction(Opcode.VA_END, []),
|
||||
new_instruction(Opcode.RET, []),
|
||||
],
|
||||
},
|
||||
];
|
||||
@ -81,7 +81,7 @@ test("assembling disassembled object code with manual stack management should re
|
||||
expect(errors).toEqual([]);
|
||||
expect(warnings).toEqual([]);
|
||||
|
||||
expect(object_code_equal(object_code, bin.object_code)).toBe(true);
|
||||
expect(segment_arrays_equal(object_code, bin.object_code)).toBe(true);
|
||||
});
|
||||
|
||||
// Round-trip test.
|
||||
@ -95,7 +95,7 @@ test("assembling disassembled object code with automatic stack management should
|
||||
expect(errors).toEqual([]);
|
||||
expect(warnings).toEqual([]);
|
||||
|
||||
expect(object_code_equal(object_code, bin.object_code)).toBe(true);
|
||||
expect(segment_arrays_equal(object_code, bin.object_code)).toBe(true);
|
||||
});
|
||||
|
||||
// Round-trip test.
|
||||
|
||||
@ -133,7 +133,7 @@ export function disassemble(object_code: Segment[], manual_stack = false): strin
|
||||
return lines;
|
||||
}
|
||||
|
||||
function add_type_to_args(params: Param[], args: Arg[]): ArgWithType[] {
|
||||
function add_type_to_args(params: readonly Param[], args: readonly Arg[]): ArgWithType[] {
|
||||
const args_with_type: ArgWithType[] = [];
|
||||
const len = Math.min(params.length, args.length);
|
||||
|
||||
@ -158,7 +158,7 @@ function add_type_to_args(params: Param[], args: Arg[]): ArgWithType[] {
|
||||
return args_with_type;
|
||||
}
|
||||
|
||||
function args_to_strings(params: Param[], args: ArgWithType[], stack: boolean): string[] {
|
||||
function args_to_strings(params: readonly Param[], args: ArgWithType[], stack: boolean): string[] {
|
||||
const arg_strings: string[] = [];
|
||||
|
||||
for (let i = 0; i < params.length; i++) {
|
||||
|
||||
@ -4,11 +4,13 @@ import { array_buffers_equal, arrays_equal } from "../../core/util";
|
||||
/**
|
||||
* Instruction invocation.
|
||||
*/
|
||||
export class Instruction {
|
||||
export type Instruction = {
|
||||
readonly opcode: Opcode;
|
||||
readonly args: readonly Arg[];
|
||||
/**
|
||||
* Byte size of the argument list.
|
||||
*/
|
||||
readonly arg_size: number = 0;
|
||||
readonly arg_size: number;
|
||||
/**
|
||||
* Byte size of the entire instruction, i.e. the sum of the opcode size and all argument sizes.
|
||||
*/
|
||||
@ -16,36 +18,48 @@ export class Instruction {
|
||||
/**
|
||||
* Maps each parameter by index to its arguments.
|
||||
*/
|
||||
readonly param_to_args: Arg[][] = [];
|
||||
readonly param_to_args: readonly Arg[][];
|
||||
};
|
||||
|
||||
constructor(readonly opcode: Opcode, readonly args: Arg[]) {
|
||||
const len = Math.min(opcode.params.length, args.length);
|
||||
export function new_instruction(opcode: Opcode, args: Arg[]): Instruction {
|
||||
const len = Math.min(opcode.params.length, args.length);
|
||||
const param_to_args: Arg[][] = [];
|
||||
let arg_size = 0;
|
||||
|
||||
for (let i = 0; i < len; i++) {
|
||||
const type = opcode.params[i].type;
|
||||
const arg = args[i];
|
||||
this.param_to_args[i] = [];
|
||||
for (let i = 0; i < len; i++) {
|
||||
const type = opcode.params[i].type;
|
||||
const arg = args[i];
|
||||
param_to_args[i] = [];
|
||||
|
||||
switch (type.kind) {
|
||||
case Kind.ILabelVar:
|
||||
case Kind.RegRefVar:
|
||||
this.arg_size++;
|
||||
switch (type.kind) {
|
||||
case Kind.ILabelVar:
|
||||
case Kind.RegRefVar:
|
||||
arg_size++;
|
||||
|
||||
for (let j = i; j < args.length; j++) {
|
||||
this.param_to_args[i].push(args[j]);
|
||||
this.arg_size += args[j].size;
|
||||
}
|
||||
for (let j = i; j < args.length; j++) {
|
||||
param_to_args[i].push(args[j]);
|
||||
arg_size += args[j].size;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
this.arg_size += arg.size;
|
||||
this.param_to_args[i].push(arg);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
arg_size += arg.size;
|
||||
param_to_args[i].push(arg);
|
||||
break;
|
||||
}
|
||||
|
||||
this.size = opcode.size + this.arg_size;
|
||||
}
|
||||
|
||||
return {
|
||||
opcode,
|
||||
args,
|
||||
arg_size,
|
||||
size: opcode.size + arg_size,
|
||||
param_to_args,
|
||||
};
|
||||
}
|
||||
|
||||
function instructions_equal(a: Instruction, b: Instruction): boolean {
|
||||
return a.opcode.code === b.opcode.code && arrays_equal(a.args, b.args, args_equal);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -56,6 +70,10 @@ export type Arg = {
|
||||
size: number;
|
||||
};
|
||||
|
||||
function args_equal(a: Arg, b: Arg): boolean {
|
||||
return a.value === b.value && a.size === b.size;
|
||||
}
|
||||
|
||||
export enum SegmentType {
|
||||
Instructions,
|
||||
Data,
|
||||
@ -85,10 +103,6 @@ export type StringSegment = {
|
||||
value: string;
|
||||
};
|
||||
|
||||
export function object_code_equal(a: Segment[], b: Segment[]): boolean {
|
||||
return arrays_equal(a, b, segments_equal);
|
||||
}
|
||||
|
||||
function segments_equal(a: Segment, b: Segment): boolean {
|
||||
if (a.type !== b.type || !arrays_equal(a.labels, b.labels)) return false;
|
||||
|
||||
@ -108,10 +122,6 @@ function segments_equal(a: Segment, b: Segment): boolean {
|
||||
}
|
||||
}
|
||||
|
||||
function instructions_equal(a: Instruction, b: Instruction): boolean {
|
||||
return a.opcode.code === b.opcode.code && arrays_equal(a.args, b.args, args_equal);
|
||||
}
|
||||
|
||||
function args_equal(a: Arg, b: Arg): boolean {
|
||||
return a.value === b.value && a.size === b.size;
|
||||
export function segment_arrays_equal(a: Segment[], b: Segment[]): boolean {
|
||||
return arrays_equal(a, b, segments_equal);
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
import { Episode } from "../../core/data_formats/parsing/quest/Episode";
|
||||
import { QuestModel } from "../model/QuestModel";
|
||||
import { Instruction, SegmentType } from "../scripting/instructions";
|
||||
import { new_instruction, SegmentType } from "../scripting/instructions";
|
||||
import { ObjectType } from "../../core/data_formats/parsing/quest/object_types";
|
||||
import { NpcType } from "../../core/data_formats/parsing/quest/npc_types";
|
||||
import { Opcode } from "../scripting/opcodes";
|
||||
@ -28,52 +28,52 @@ export function create_new_quest(episode: Episode): QuestModel {
|
||||
labels: [0],
|
||||
type: SegmentType.Instructions,
|
||||
instructions: [
|
||||
new Instruction(Opcode.SET_EPISODE, [{ value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHL, [{ value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHW, [{ value: 150, size: 2 }]),
|
||||
new Instruction(Opcode.SET_FLOOR_HANDLER, []),
|
||||
new Instruction(Opcode.BB_MAP_DESIGNATE, [
|
||||
new_instruction(Opcode.SET_EPISODE, [{ value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHL, [{ value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHW, [{ value: 150, size: 2 }]),
|
||||
new_instruction(Opcode.SET_FLOOR_HANDLER, []),
|
||||
new_instruction(Opcode.BB_MAP_DESIGNATE, [
|
||||
{ value: 0, size: 1 },
|
||||
{ value: 0, size: 2 },
|
||||
{ value: 0, size: 1 },
|
||||
{ value: 0, size: 1 },
|
||||
]),
|
||||
new Instruction(Opcode.RET, []),
|
||||
new_instruction(Opcode.RET, []),
|
||||
],
|
||||
},
|
||||
{
|
||||
labels: [150],
|
||||
type: SegmentType.Instructions,
|
||||
instructions: [
|
||||
new Instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 237, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 333, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: -15, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHL, [{ value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new Instruction(Opcode.P_SETPOS, []),
|
||||
new Instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 255, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 338, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: -43, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHL, [{ value: 1, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new Instruction(Opcode.P_SETPOS, []),
|
||||
new Instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 222, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 322, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: 25, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHL, [{ value: 2, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new Instruction(Opcode.P_SETPOS, []),
|
||||
new Instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 248, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 323, size: 4 }]),
|
||||
new Instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: -20, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHL, [{ value: 3, size: 4 }]),
|
||||
new Instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new Instruction(Opcode.P_SETPOS, []),
|
||||
new Instruction(Opcode.RET, []),
|
||||
new_instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 237, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 333, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: -15, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHL, [{ value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new_instruction(Opcode.P_SETPOS, []),
|
||||
new_instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 255, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 338, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: -43, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHL, [{ value: 1, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new_instruction(Opcode.P_SETPOS, []),
|
||||
new_instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 222, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 322, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: 25, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHL, [{ value: 2, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new_instruction(Opcode.P_SETPOS, []),
|
||||
new_instruction(Opcode.LETI, [{ value: 60, size: 1 }, { value: 248, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 61, size: 1 }, { value: 0, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 62, size: 1 }, { value: 323, size: 4 }]),
|
||||
new_instruction(Opcode.LETI, [{ value: 63, size: 1 }, { value: -20, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHL, [{ value: 3, size: 4 }]),
|
||||
new_instruction(Opcode.ARG_PUSHR, [{ value: 60, size: 1 }]),
|
||||
new_instruction(Opcode.P_SETPOS, []),
|
||||
new_instruction(Opcode.RET, []),
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
Loading…
Reference in New Issue
Block a user