@gaialabs/core 0.1.11 → 0.1.13

package/dist/index.js

@@ -715,9 +715,11 @@ var AddressingModeHandler = class {
       case "Immediate":
         this.handleImmediateMode(code.mnem, context.size, operands, reg);
         break;
+      case "AbsoluteIndexedIndirect":
+        this.handleAbsoluteMode(code.mnem, void 0, context.nextAddress, reg.dataBank, operands, reg, true);
+        break;
       case "AbsoluteIndirect":
       case "AbsoluteIndirectLong":
-      case "AbsoluteIndexedIndirect":
       case "Absolute":
       case "AbsoluteIndexedX":
       case "AbsoluteIndexedY":
@@ -847,19 +849,20 @@ var AddressingModeHandler = class {
     const stackOperations = new StackOperations(reg, this._blockReader);
     stackOperations.handleStackOperation(mnemonic);
   }
-  handleAbsoluteMode(mnemonic, xBank1, next, dataBank, operands, registers) {
+  handleAbsoluteMode(mnemonic, xBank1, next, dataBank, operands, registers, isIndexedIndirect = false) {
     let refLoc = this._dataReader.readUShort();
     const isPush = this.isPushInstruction(mnemonic);
     if (isPush) {
       refLoc++;
     }
-    const isJump = isPush || this.isJumpInstruction(mnemonic);
+    const isJump = isPush || isIndexedIndirect || this.isJumpInstruction(mnemonic);
     const bank = xBank1 ?? (isJump ? this._dataReader.position >> 16 : dataBank ?? 129);
     const addr = new shared.Address(bank, refLoc);
     if (addr.isROM) {
       const wrapper = new shared.LocationWrapper(addr.toInt(), shared.AddressType.Offset);
       if (isJump) {
-        const name = this._blockReader.noteType(wrapper.location, "Code", isPush, registers);
+        const type = isIndexedIndirect ? "*Code" : "Code";
+        const name = this._blockReader.noteType(wrapper.location, type, isPush, registers);
         if (isPush) {
           operands.push(`&${name}-1`);
           return;
@@ -3194,7 +3197,7 @@ var AssemblerState = class _AssemblerState {
     this.dbStruct = structType === null ? null : Object.values(this.root.structs).find(
       (x) => x.name.toLowerCase() === structType.toLowerCase()
     ) || null;
-    this.parentStruct = this.dbStruct?.parent == null ? null : Object.values(this.root.structs).find(
+    this.parentStruct = !this.dbStruct || !this.dbStruct.parent ? null : Object.values(this.root.structs).find(
       (x) => x.name.toLowerCase() === this.dbStruct.parent.toLowerCase()
     ) || null;
     this.discriminator = this.parentStruct?.discriminator ?? null;