@gaialabs/core 0.2.13 → 0.2.14

package/dist/index.cjs

@@ -1099,7 +1099,7 @@ var RomProcessingConstants = class RomProcessingConstants {
 * BlockReader specific constants
 */
 var BlockReaderConstants = class {
-	static REF_SEARCH_MAX_RANGE = 416;
+	static REF_SEARCH_MAX_RANGE = 896;
 	static BANK_MASK_CHECK = 64;
 	static BYTE_DELIMITER_THRESHOLD = 256;
 	static BANK_HIGH_MEMORY_1 = 126;
@@ -1926,6 +1926,7 @@ var ReferenceManager = class {
 	structTable = /* @__PURE__ */ new Map();
 	markerTable = /* @__PURE__ */ new Map();
 	nameTable = /* @__PURE__ */ new Map();
+	fileTable = /* @__PURE__ */ new Map();
 	root;
 	constructor(root) {
 		if (!root) throw new Error("root cannot be null");
@@ -1995,7 +1996,7 @@ var ReferenceManager = class {
 	}
 	resolveName(location, type, isBranch) {
 		const prefix = Address.codeFromType(type);
-		let name;
+		let name = null;
 		let label = null;
 		let resolvedLocation = location;
 		const rewrite = this.root.rewrites[location];
@@ -2004,9 +2005,8 @@ var ReferenceManager = class {
 			resolvedLocation = result.location;
 			label = result.label;
 		}
-		const existingName = this.nameTable.get(resolvedLocation);
-		if (existingName) name = existingName;
-		else name = isBranch ? this.createBranchLabel(resolvedLocation) : this.findClosestReference(resolvedLocation) || this.createFallbackName(resolvedLocation);
+		name = this.nameTable.get(resolvedLocation) || null;
+		if (!name) name = isBranch ? this.createBranchLabel(resolvedLocation) : this.findClosestReference(resolvedLocation) || this.createFallbackName(resolvedLocation);
 		return `${prefix || ""}${name}${label || ""}`;
 	}
 	findClosestReference(location) {
@@ -2108,6 +2108,10 @@ var StackOperations = class {
 			case "XBA":
 				this.handleExchangeBytes();
 				break;
+			case "RTL":
+			case "RTS":
+				this._blockReader._referenceManager.tryAddStruct(this._blockReader._romDataReader.position, "Code");
+				break;
 		}
 	}
 	handleAccumulatorPush() {
@@ -2157,7 +2161,16 @@ var CopCommandProcessor = class {
 	* Parses a COP command based on its definition
 	*/
 	parseCopCommand(copDef, operands) {
-		for (let partStr of copDef.parts) {
+		let parts = copDef.parts;
+		if (copDef.conditions) for (const condition of copDef.conditions) {
+			let value = this._romDataReader.romData[this._romDataReader.position + condition.offset];
+			if (condition.value >= 256) value |= this._romDataReader.romData[this._romDataReader.position + condition.offset + 1] << 8;
+			if (value === condition.value) {
+				parts = condition.parts;
+				break;
+			}
+		}
+		for (let partStr of parts) {
 			let bank = null;
 			const bankHintIx = partStr.indexOf("$");
 			if (bankHintIx > 0) {
@@ -2340,6 +2353,7 @@ var AddressingModeHandler = class {
 		if (address.isROM) {
 			const wrapper = new LocationWrapper(address.toLocation(), AddressType.Address);
 			if (this.isJumpInstruction(mnemonic)) this._blockReader.noteType(wrapper.location, "Code", false, reg);
+			if (mnemonic === "JML") this._blockReader._referenceManager.tryAddStruct(this._dataReader.position, "Code");
 			operands.push(wrapper);
 		} else operands.push(address);
 	}
@@ -2378,12 +2392,13 @@ var AddressingModeHandler = class {
 		const isPush = this.isPushInstruction(mnemonic);
 		if (isPush) refLoc++;
 		const isJump = isPush || isIndexedIndirect || this.isJumpInstruction(mnemonic);
-		const addr = new Address(xBank1 ?? (isJump ? Address.resolveBank(this._dataReader.position, registers.mode) : dataBank) ?? 129, refLoc, registers.mode);
+		const addr = new Address(xBank1 ?? (isJump ? Address.resolveBank(this._dataReader.position, registers.mode) : dataBank) ?? this._blockReader._root.config.defaultBank ?? 129, refLoc, registers.mode);
 		if (addr.isROM) {
 			const wrapper = new LocationWrapper(addr.toLocation(), AddressType.Offset);
 			if (isJump) {
 				const type = isIndexedIndirect ? "&Code" : "Code";
 				const name = this._blockReader.noteType(wrapper.location, type, isPush, registers);
+				if (mnemonic === "JMP") this._blockReader._referenceManager.tryAddStruct(this._dataReader.position, "Code");
 				if (isPush) {
 					operands.push(`&${name}-1`);
 					return;
@@ -3018,10 +3033,11 @@ var StringReader = class StringReader {
 	}
 	parseString(stringType, fixedSize) {
 		const commands = stringType.commandLookup;
-		stringType.dictionaries;
+		const dictionaries = stringType.dictionaries;
 		const builder = [];
 		const strLoc = this._romDataReader.position;
 		const terminator = stringType.terminator;
+		const modifiers = stringType.modifiers;
 		let currentLayer = stringType.layers[0];
 		do {
 			const c = this._romDataReader.readByte();
@@ -3029,23 +3045,35 @@ var StringReader = class StringReader {
 				if (stringType.greedyTerminator) while (this._romDataReader.peekByte() === terminator && this._blockReader.partCanContinue()) this._romDataReader.position++;
 				break;
 			}
-			const cmd = commands[c];
-			if (cmd) {
+			let cmd = void 0;
+			const mod = modifiers ? modifiers[c] : void 0;
+			if (mod) {
+				const next = mod[builder[builder.length - 1]];
+				if (next) builder[builder.length - 1] = next;
+				else builder.push(currentLayer.map[c - (currentLayer.base ?? 0)]);
+			} else if (cmd = commands[c]) {
 				this.resolveCommand(cmd, builder);
 				if (cmd.halt) break;
 			} else {
 				let found = false;
-				for (const layer of stringType.layers) if (layer.on !== void 0) {
-					if (c === layer.on) {
-						currentLayer = layer;
-						builder.push("[--]");
+				for (const dictionary of Object.values(dictionaries)) if (dictionary.base !== void 0 && c >= dictionary.base && c <= dictionary.base + dictionary.entries.length) {
+					builder.push(dictionary.entries[c - dictionary.base]);
+					found = true;
+					break;
+				}
+				if (!found) {
+					for (const layer of stringType.layers) if (layer.on !== void 0) {
+						if (c === layer.on) {
+							currentLayer = layer;
+							builder.push("[--]");
+							found = true;
+							break;
+						}
+					} else if (layer.base && c >= layer.base && c < layer.base + layer.map.length) {
+						builder.push(layer.map[c - layer.base]);
 						found = true;
 						break;
 					}
-				} else if (layer.base && c >= layer.base && c < layer.base + layer.map.length) {
-					builder.push(layer.map[c - layer.base]);
-					found = true;
-					break;
 				}
 				if (!found) {
 					let index = c - (currentLayer.base ?? 0);
@@ -3151,29 +3179,44 @@ var TypeParser = class {
 		if (!parentType) throw new Error(`Unknown type: ${fixedTypeName}`);
 		const delimiter = parentType.delimiter;
 		const discOffset = parentType.discriminator;
+		const discLogic = parentType.discriminatorLogic;
+		const nullValue = parentType.null;
 		const objects = [];
+		if (delimiter === void 0 && this._blockReader.delimiterReached(nullValue)) {
+			objects.push({
+				name: parentType.name,
+				parts: ["null"]
+			});
+			return objects;
+		}
 		let delReached;
 		while (!(delReached = this._blockReader.delimiterReached(delimiter))) {
 			const startPosition = this._romDataReader.position;
 			let targetType = parentType;
-			if (discOffset !== void 0) {
-				const discPosition = this._romDataReader.position + discOffset;
-				const desc = this._romDataReader.romData[discPosition];
-				if (discOffset === 0) this._romDataReader.position++;
-				targetType = Object.values(this._blockReader._root.structs).find((x) => x.parent === fixedTypeName && x.discriminator === desc) || parentType;
-			}
-			const types = targetType.types;
-			if (types && types.length > 0) {
-				const memberCount = types.length;
-				const prevPosition = this._romDataReader.position;
-				const parts = new Array(memberCount);
-				const def = {
-					name: targetType.name,
-					parts
-				};
-				for (let i = 0; i < memberCount; i++) parts[i] = this.parseType(types[i], reg, depth + 1, bank);
-				if (discOffset !== void 0 && discOffset === this._romDataReader.position - prevPosition) this._romDataReader.position++;
-				objects.push(def);
+			if (this._blockReader.delimiterReached(nullValue)) objects.push({
+				name: parentType.name,
+				parts: ["null"]
+			});
+			else {
+				if (discOffset !== void 0) {
+					const discPosition = this._romDataReader.position + discOffset;
+					const desc = this._romDataReader.romData[discPosition];
+					targetType = Object.values(this._blockReader._root.structs).find((x) => x.parent === fixedTypeName && (discLogic === "&" ? ((x.discriminator ?? 0) & desc) !== 0 : x.discriminator === desc)) || parentType;
+					if (discOffset === 0 && parentType != targetType && discLogic === "=") this._romDataReader.position++;
+				}
+				const types = targetType.types;
+				if (types && types.length > 0) {
+					const memberCount = types.length;
+					const prevPosition = this._romDataReader.position;
+					const parts = new Array(memberCount);
+					const def = {
+						name: targetType.name,
+						parts
+					};
+					for (let i = 0; i < memberCount; i++) parts[i] = this.parseType(types[i], reg, depth + 1, bank);
+					if (discOffset !== void 0 && discOffset === this._romDataReader.position - prevPosition) this._romDataReader.position++;
+					objects.push(def);
+				} else this._romDataReader.position++;
 			}
 			let checkPosition = startPosition;
 			while (++checkPosition < this._romDataReader.position) {
@@ -3184,6 +3227,7 @@ var TypeParser = class {
 				}
 			}
 			if (!this._blockReader.partCanContinue()) break;
+			if (nullValue !== void 0) break;
 		}
 		if (delReached && depth === 0) this._referenceManager.tryAddStruct(this._romDataReader.position, typeName);
 		return objects;
@@ -3436,9 +3480,6 @@ var BlockReader = class {
 	/**
 	* Processes predefined file references
 	*/
-	initializeFileReferences() {
-		for (const file of this._root.files) this._referenceManager.tryAddName(file.start, file.name);
-	}
 	/**
 	* Resolves mnemonic for a given address
 	*/
@@ -3519,7 +3560,6 @@ var BlockReader = class {
 	analyzeAndResolve() {
 		console.log("analyzeAndResolve started");
 		this.initializeOverrides();
-		this.initializeFileReferences();
 		this.createChunkFilesFromDatabase();
 		this.initializeBlocksAndParts();
 		this.analyzeChunkFiles();
@@ -3535,9 +3575,12 @@ var BlockReader = class {
 	*/
 	initializeBlocksAndParts() {
 		console.log("initializeBlocksAndParts");
-		for (const block of this._enrichedChunks) for (const part of block.parts || []) {
-			if (part.structName) this._referenceManager.tryAddStruct(part.location, part.structName);
-			if (part.label) this._referenceManager.tryAddName(part.location, part.label);
+		for (const block of this._enrichedChunks) {
+			for (const part of block.parts || []) {
+				if (part.structName) this._referenceManager.tryAddStruct(part.location, part.structName);
+				if (part.label) this._referenceManager.tryAddName(part.location, part.label);
+			}
+			this._referenceManager.tryAddName(block.location, block.name);
 		}
 	}
 	/**
@@ -3996,7 +4039,7 @@ var BlockWriter = class {
 				objLines = [this._referenceManager.resolveName(obj.location, obj.type, isBranch)];
 				break;
 			case ObjectType.Address:
-				objLines = isArray ? [`$#${obj.offset.toString(16).toUpperCase().padStart(4, "0")}`] : [`$${obj.toString()}`];
+				objLines = isArray ? [`$#${obj.toString()}`] : [`$${obj.toString()}`];
 				break;
 			case ObjectType.ByteArray:
 				objLines = [`#${Array.from(obj).map((b) => b.toString(16).toUpperCase().padStart(2, "0")).join("")}`];
@@ -4056,14 +4099,14 @@ var BlockWriter = class {
 		this._isInline = true;
 		let first = true;
 		for (const op of opList) {
-			if (first) first = false;
-			else {
+			if (!first || depth > 0) {
 				const labelResult = this._referenceManager.tryGetName(op.location);
 				if (labelResult.found) {
 					lines.push("");
 					lines.push(`  ${labelResult.referenceName}:`);
 				}
 			}
+			first = false;
 			let opLine = `    ${op.mnem} `;
 			if (op.copDef) {
 				opLine += `[${op.copDef.name}]`;
@@ -4830,7 +4873,7 @@ var RomProcessor = class RomProcessor {
 					ix++;
 					continue;
 				}
-				file.includes = file.includes || /* @__PURE__ */ new Set();
+				if (!file.includes) file.includes = /* @__PURE__ */ new Set();
 				file.includes.add(patch.name.toUpperCase());
 				patch.parts.splice(ix, 1);
 			}
@@ -5530,10 +5573,7 @@ var DbBlock = class {
 		this.group = data.group ?? void 0;
 		this.scene = data.scene ?? void 0;
 		this.parts = (data.parts ?? []).sort((a, b) => {
-			const orderA = a.order ?? 0;
-			const orderB = b.order ?? 0;
-			if (orderA !== orderB) return orderA - orderB;
-			return a.start - b.start;
+			return (a.order ?? a.start ?? 0) - (b.order ?? b.start ?? 0);
 		});
 		this.transforms = data.transforms ?? [];
 		this.postProcess = data.postProcess ?? void 0;
@@ -5608,12 +5648,16 @@ var DbStruct = class {
 	parent;
 	delimiter;
 	discriminator;
+	discriminatorLogic;
+	null;
 	constructor(data) {
 		this.name = data.name ?? "";
 		this.types = data.types ?? void 0;
 		this.parent = data.parent ?? void 0;
 		this.delimiter = data.delimiter ?? void 0;
 		this.discriminator = data.discriminator ?? void 0;
+		this.discriminatorLogic = data.discriminatorLogic ?? (this.discriminator !== void 0 ? "=" : void 0);
+		this.null = data.null ?? void 0;
 		if (!this.name) throw new Error("Name is required");
 	}
 };
@@ -5668,14 +5712,16 @@ var DbStringCommand = class {
 	}
 };
 var DbStringDictionary = class {
+	base;
 	command;
 	commandName;
 	name;
 	entries;
 	constructor(data) {
-		if (typeof data.command !== "number") throw new Error("Command is required");
+		if (typeof data.command !== "number" && typeof data.base !== "number") throw new Error("Command or base is required");
 		if (!data.name) throw new Error("Name is required");
 		if (!data.entries || data.entries.length === 0) throw new Error("Entries is required");
+		this.base = data.base ?? void 0;
 		this.command = data.command ?? void 0;
 		this.commandName = data.commandName ?? void 0;
 		this.name = data.name;
@@ -5696,6 +5742,7 @@ var DbStringType = class {
 	greedyTerminator;
 	dictionaries;
 	dictionaryLookup;
+	modifiers;
 	constructor(data) {
 		if (!data.name) throw new Error("Name is required");
 		if (!data.delimiter) throw new Error("Delimiter is required");
@@ -5716,6 +5763,7 @@ var DbStringType = class {
 			text: z,
 			id: (y.command ?? 0) << 8 | ix
 		}))).sort((a, b) => b.text.length - a.text.length);
+		this.modifiers = data.modifiers;
 	}
 };
 
@@ -5731,6 +5779,7 @@ var CopDef = class {
 	size;
 	parts;
 	halt;
+	conditions;
 	constructor(data) {
 		if (!data.name) throw new Error("Name is required");
 		if (typeof data.id !== "number") throw new Error("ID is required");
@@ -5739,6 +5788,7 @@ var CopDef = class {
 		this.parts = data.parts ?? [];
 		this.halt = data.halt ?? false;
 		this.size = data.size ?? 0;
+		this.conditions = data.conditions ?? [];
 	}
 };