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

Fixed a disassembler bug: va list arg_push* instructions would not be output when in automatic stack management mode.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-10-01 22:47:01 +02:00
parent df2bb7a6ab
commit 825f14dc90
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/quest_editor/scripting/disassembly.test.ts
View File

@ -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, SegmentType } from "./instructions";
import { Instruction, object_code_equal, Segment, SegmentType } from "./instructions";
import { Opcode } from "./opcodes";
test("vararg instructions should be disassembled correctly", () => {
@ -36,6 +36,40 @@ test("vararg instructions should be disassembled correctly", () => {
);
});
// arg_push* instructions should always be output when in a va list whether manual stack management
// is on or off.
test("va list instructions should be disassembled correctly", () => {
const ir: Segment[] = [
{
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, []),
],
},
];
for (const manual_stack of [true, false]) {
const asm = disassemble(ir, manual_stack);
expect(asm).toEqual(
`.code
0:
va_start
arg_pushw 1337
va_call 100
va_end
ret
`.split("\n"),
);
}
});
// Round-trip test.
test("assembling disassembled object code with manual stack management should result in the same IR", () => {
const orig_buffer = readFileSync("test/resources/quest27_e.bin");
@ -62,7 +96,6 @@ test("assembling disassembled object code with automatic stack management should
expect(warnings).toEqual([]);
expect(object_code_equal(object_code, bin.object_code)).toBe(true);
// expect(object_code).toBe(bin.object_code);
});
// Round-trip test.

17
src/quest_editor/scripting/disassembly.ts
View File

@ -1,6 +1,6 @@
import { reinterpret_i32_as_f32 } from "../../core/primitive_conversion";
import { Arg, Segment, SegmentType } from "./instructions";
import { AnyType, Kind, Param, StackInteraction } from "./opcodes";
import { AnyType, Kind, Opcode, Param, StackInteraction } from "./opcodes";
import Logger from "js-logger";
const logger = Logger.get("quest_editor/scripting/disassembly");
@ -76,8 +76,21 @@ export function disassemble(object_code: Segment[], manual_stack = false): strin
} else if (segment.type === SegmentType.String) {
lines.push(" " + JSON.stringify(segment.value));
} else {
// SegmentType.Instructions
let in_va_list = false;
for (const instruction of segment.instructions) {
if (!manual_stack && instruction.opcode.stack === StackInteraction.Push) {
if (instruction.opcode.code === Opcode.VA_START.code) {
in_va_list = true;
} else if (instruction.opcode.code === Opcode.VA_END.code) {
in_va_list = false;
}
if (
!manual_stack &&
!in_va_list &&
instruction.opcode.stack === StackInteraction.Push
) {
stack.push(...add_type_to_args(instruction.opcode.params, instruction.args));
} else {
let args: string[] = [];