mirror of
https://github.com/DaanVandenBosch/phantasmal-world.git
synced 2025-04-04 22:58:29 +08:00
Opcode code is now generated from yaml definitions.
This commit is contained in:
Daan Vanden Bosch
parent
e1d1cf564f
commit
7aefdb688c
@ -4,6 +4,11 @@
|
||||
export const RESOURCE_DIR = "./assets_generation/resources";
|
||||
|
||||
/**
|
||||
* Static assets directory used by production code.
|
||||
* Static assets directory used by runtime code.
|
||||
*/
|
||||
export const ASSETS_DIR = "./assets";
|
||||
|
||||
/**
|
||||
* Source directory of runtime code.
|
||||
*/
|
||||
export const SRC_DIR = "./src";
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
import { readFileSync, writeFileSync } from "fs";
|
||||
import Logger from "js-logger";
|
||||
import { ASSETS_DIR, RESOURCE_DIR } from ".";
|
||||
import { ASSETS_DIR, RESOURCE_DIR, SRC_DIR } from ".";
|
||||
import { Endianness } from "../src/data_formats";
|
||||
import { BufferCursor } from "../src/data_formats/cursor/BufferCursor";
|
||||
import { parse_rlc } from "../src/data_formats/parsing/rlc";
|
||||
import YAML from "yaml";
|
||||
|
||||
const logger = Logger.get("assets_generation/update_generic_data");
|
||||
|
||||
@ -14,6 +15,13 @@ update();
|
||||
function update(): void {
|
||||
logger.info("Updating generic static data.");
|
||||
|
||||
update_opcodes();
|
||||
extract_player_animations();
|
||||
|
||||
logger.info("Done updating generic static data.");
|
||||
}
|
||||
|
||||
function extract_player_animations(): void {
|
||||
logger.info("Extracting player animations.");
|
||||
|
||||
const buf = readFileSync(`${RESOURCE_DIR}/plymotiondata.rlc`);
|
||||
@ -26,5 +34,180 @@ function update(): void {
|
||||
);
|
||||
}
|
||||
|
||||
logger.info("Done updating generic static data.");
|
||||
logger.info("Done extracting player animations.");
|
||||
}
|
||||
|
||||
function update_opcodes(): void {
|
||||
logger.info("Generating opcodes.");
|
||||
|
||||
// Add manual code.
|
||||
const opcodes_src = readFileSync(`${SRC_DIR}/scripting/opcodes.ts`, { encoding: "UTF-8" });
|
||||
const file_lines: string[] = [];
|
||||
let in_manual_code = true;
|
||||
let generated_lines_insert_point = 0;
|
||||
|
||||
opcodes_src.split("\n").forEach((line, i) => {
|
||||
if (in_manual_code) {
|
||||
if (line.includes("!!! GENERATED_CODE_START !!!")) {
|
||||
in_manual_code = false;
|
||||
generated_lines_insert_point = i + 1;
|
||||
}
|
||||
|
||||
file_lines.push(line);
|
||||
} else {
|
||||
if (line.includes("!!! GENERATED_CODE_END !!!")) {
|
||||
in_manual_code = true;
|
||||
file_lines.push(line);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Add generated code.
|
||||
const yml = readFileSync(`${RESOURCE_DIR}/scripting/opcodes.yml`, { encoding: "UTF-8" });
|
||||
const input = YAML.parse(yml);
|
||||
const generated_lines: string[] = [];
|
||||
let i = 0;
|
||||
|
||||
for (let code = 0; code <= 0xff; code++) {
|
||||
const opcode = input.opcodes[i];
|
||||
|
||||
if (opcode && opcode.code === code) {
|
||||
opcode_to_code(generated_lines, code, opcode);
|
||||
i++;
|
||||
} else {
|
||||
opcode_to_code(generated_lines, code);
|
||||
}
|
||||
}
|
||||
|
||||
for (let code = 0xf800; code <= 0xf9ff; code++) {
|
||||
const opcode = input.opcodes[i];
|
||||
|
||||
if (opcode && opcode.code === code) {
|
||||
opcode_to_code(generated_lines, code, opcode);
|
||||
i++;
|
||||
} else {
|
||||
opcode_to_code(generated_lines, code);
|
||||
}
|
||||
}
|
||||
|
||||
// Write final file.
|
||||
file_lines.splice(generated_lines_insert_point, 0, ...generated_lines);
|
||||
writeFileSync(`${SRC_DIR}/scripting/opcodes.ts`, file_lines.join("\n"));
|
||||
|
||||
logger.info("Done generating opcodes.");
|
||||
}
|
||||
|
||||
function opcode_to_code(output: string[], code: number, opcode?: any): void {
|
||||
const code_str = code.toString(16).padStart(code < 256 ? 2 : 4, "0");
|
||||
const mnemonic: string = (opcode && opcode.mnemonic) || `unknown_${code_str}`;
|
||||
const var_name = mnemonic
|
||||
.replace("!=", "ne")
|
||||
.replace("<=", "le")
|
||||
.replace(">=", "ge")
|
||||
.replace("<", "l")
|
||||
.replace(">", "g")
|
||||
.replace("=", "e")
|
||||
.toUpperCase();
|
||||
|
||||
if (opcode) {
|
||||
const stack_interaction =
|
||||
opcode.stack === "push"
|
||||
? "StackInteraction.Push"
|
||||
: opcode.stack === "pop"
|
||||
? "StackInteraction.Pop"
|
||||
: "undefined";
|
||||
|
||||
const params = params_to_code(opcode.params);
|
||||
|
||||
output.push(` static readonly ${var_name} = (OPCODES[0x${code_str}] = new Opcode(
|
||||
0x${code_str},
|
||||
"${mnemonic}",
|
||||
${(opcode.doc && JSON.stringify(opcode.doc)) || "undefined"},
|
||||
[${params}],
|
||||
${stack_interaction}
|
||||
));`);
|
||||
} else {
|
||||
output.push(` static readonly ${var_name} = (OPCODES[0x${code_str}] = new Opcode(
|
||||
0x${code_str},
|
||||
"${mnemonic}",
|
||||
undefined,
|
||||
[],
|
||||
undefined
|
||||
));`);
|
||||
}
|
||||
}
|
||||
|
||||
function params_to_code(params: any[]) {
|
||||
return params
|
||||
.map((param: any) => {
|
||||
let type: string;
|
||||
|
||||
switch (param.type) {
|
||||
case "any":
|
||||
type = "TYPE";
|
||||
break;
|
||||
case "byte":
|
||||
type = "TYPE_BYTE";
|
||||
break;
|
||||
case "word":
|
||||
type = "TYPE_WORD";
|
||||
break;
|
||||
case "dword":
|
||||
type = "TYPE_DWORD";
|
||||
break;
|
||||
case "float":
|
||||
type = "TYPE_FLOAT";
|
||||
break;
|
||||
case "label":
|
||||
type = "TYPE_LABEL";
|
||||
break;
|
||||
case "instruction_label":
|
||||
type = "TYPE_I_LABEL";
|
||||
break;
|
||||
case "data_label":
|
||||
type = "TYPE_D_LABEL";
|
||||
break;
|
||||
case "string_label":
|
||||
type = "TYPE_S_LABEL";
|
||||
break;
|
||||
case "string":
|
||||
type = "TYPE_STRING";
|
||||
break;
|
||||
case "reg_ref":
|
||||
type = "TYPE_REG_REF";
|
||||
break;
|
||||
case "reg_tup_ref":
|
||||
type = `new RegTupRefType(${params_to_code(param.reg_tup)})`;
|
||||
break;
|
||||
case "reg_ref_var":
|
||||
type = "TYPE_REG_REF_VAR";
|
||||
break;
|
||||
case "pointer":
|
||||
type = "TYPE_POINTER";
|
||||
break;
|
||||
default:
|
||||
throw new Error(`Type ${param.type} not implemented.`);
|
||||
}
|
||||
|
||||
const doc = (param.doc && JSON.stringify(param.doc)) || "undefined";
|
||||
let access: string;
|
||||
|
||||
switch (param.access) {
|
||||
case "read":
|
||||
access = "ParamAccess.Read";
|
||||
break;
|
||||
case "write":
|
||||
access = "ParamAccess.Write";
|
||||
break;
|
||||
case "read_write":
|
||||
access = "ParamAccess.ReadWrite";
|
||||
break;
|
||||
default:
|
||||
access = "undefined";
|
||||
break;
|
||||
}
|
||||
|
||||
return `new Param(${type}, ${doc}, ${access})`;
|
||||
})
|
||||
.join(", ");
|
||||
}
|
||||
|
||||
@ -39,6 +39,7 @@
|
||||
"devDependencies": {
|
||||
"@types/cheerio": "^0.22.11",
|
||||
"@types/jest": "^24.0.15",
|
||||
"@types/yaml": "^1.0.2",
|
||||
"@typescript-eslint/eslint-plugin": "^1.13.0",
|
||||
"@typescript-eslint/parser": "^1.13.0",
|
||||
"cheerio": "^1.0.0-rc.3",
|
||||
@ -70,6 +71,7 @@
|
||||
"webpack-cli": "^3.3.6",
|
||||
"webpack-dev-server": "^3.7.2",
|
||||
"webpack-merge": "^4.2.1",
|
||||
"worker-loader": "^2.0.0"
|
||||
"worker-loader": "^2.0.0",
|
||||
"yaml": "^1.6.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,9 +5,9 @@ import { Cursor } from "../../cursor/Cursor";
|
||||
import { ResizableBufferCursor } from "../../cursor/ResizableBufferCursor";
|
||||
import { WritableCursor } from "../../cursor/WritableCursor";
|
||||
import { ResizableBuffer } from "../../ResizableBuffer";
|
||||
import { Opcode, OPCODES, Type } from "./opcodes";
|
||||
import { Opcode, OPCODES, Type } from "../../../scripting/opcodes";
|
||||
|
||||
export * from "./opcodes";
|
||||
export * from "../../../scripting/opcodes";
|
||||
|
||||
const logger = Logger.get("data_formats/parsing/quest/bin");
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ import { ResizableBufferCursor } from "../../cursor/ResizableBufferCursor";
|
||||
import { Vec3 } from "../../vector";
|
||||
import { BinFile, Instruction, InstructionSegment, parse_bin, SegmentType, write_bin } from "./bin";
|
||||
import { DatFile, DatNpc, DatObject, parse_dat, write_dat } from "./dat";
|
||||
import { Opcode } from "./opcodes";
|
||||
import { Opcode } from "../../../scripting/opcodes";
|
||||
import { parse_qst, QstContainedFile, write_qst } from "./qst";
|
||||
|
||||
const logger = Logger.get("data_formats/parsing/quest");
|
||||
@ -149,7 +149,7 @@ export function write_quest_qst(quest: Quest, file_name: string): ArrayBuffer {
|
||||
*/
|
||||
function get_episode(func_0_instructions: Instruction[]): Episode {
|
||||
const set_episode = func_0_instructions.find(
|
||||
instruction => instruction.opcode === Opcode.set_episode
|
||||
instruction => instruction.opcode === Opcode.SET_EPISODE
|
||||
);
|
||||
|
||||
if (set_episode) {
|
||||
@ -186,7 +186,7 @@ function get_area_variants(
|
||||
}
|
||||
|
||||
const bb_maps = func_0_instructions.filter(
|
||||
instruction => instruction.opcode === Opcode.bb_map_designate
|
||||
instruction => instruction.opcode === Opcode.BB_MAP_DESIGNATE
|
||||
);
|
||||
|
||||
for (const bb_map of bb_maps) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -149,7 +149,7 @@ function find_values(
|
||||
if (
|
||||
(param.type instanceof RegTupRefType &&
|
||||
register >= val &&
|
||||
register < val + param.type.types.length) ||
|
||||
register < val + param.type.registers.length) ||
|
||||
(param.type === TYPE_REG_REF && val.includes(register)) ||
|
||||
(param.type === TYPE_REG_REF_VAR && val.includes(register))
|
||||
) {
|
||||
|
||||
7683
src/scripting/opcodes.ts
Normal file
7683
src/scripting/opcodes.ts
Normal file
File diff suppressed because it is too large
Load Diff
19
yarn.lock
19
yarn.lock
@ -140,6 +140,13 @@
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.2"
|
||||
|
||||
"@babel/runtime@^7.4.5":
|
||||
version "7.5.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
|
||||
integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
|
||||
dependencies:
|
||||
regenerator-runtime "^0.13.2"
|
||||
|
||||
"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
|
||||
version "7.4.4"
|
||||
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
|
||||
@ -546,6 +553,11 @@
|
||||
"@types/uglify-js" "*"
|
||||
source-map "^0.6.0"
|
||||
|
||||
"@types/yaml@^1.0.2":
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/@types/yaml/-/yaml-1.0.2.tgz#bba080d64714c6ef3eaa023e235dacd2cfa3c938"
|
||||
integrity sha512-rS1VJFjyGKNHk8H97COnPIK+oeLnc0J9G0ES63o/Ky+WlJCeaFGiGCTGhV/GEVKua7ZWIV1JIDopYUwrfvTo7A==
|
||||
|
||||
"@types/yargs@^12.0.2", "@types/yargs@^12.0.9":
|
||||
version "12.0.12"
|
||||
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
|
||||
@ -8891,6 +8903,13 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
|
||||
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
|
||||
integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
|
||||
|
||||
yaml@^1.6.0:
|
||||
version "1.6.0"
|
||||
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.6.0.tgz#d8a985cfb26086dd73f91c637f6e6bc909fddd3c"
|
||||
integrity sha512-iZfse3lwrJRoSlfs/9KQ9iIXxs9++RvBFVzAqbbBiFT+giYtyanevreF9r61ZTbGMgWQBxAua3FzJiniiJXWWw==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.4.5"
|
||||
|
||||
yargs-parser@10.x:
|
||||
version "10.1.0"
|
||||
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user