@markw65/monkeyc-optimizer 1.1.51 → 1.1.53

package/build/optimizer.cjs

@@ -18,28 +18,28 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_HKWBVOEL.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_HKWBVOEL.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_32NRMXAJ.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_32NRMXAJ.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_SG7ODKRM.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_HKWBVOEL.defaultConfig,
-  display: () => import_chunk_HKWBVOEL.display,
-  generateOneConfig: () => import_chunk_HKWBVOEL.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_HKWBVOEL.generateOptimizedProject,
-  getConfig: () => import_chunk_HKWBVOEL.getConfig,
-  getProjectAnalysis: () => import_chunk_HKWBVOEL.getProjectAnalysis,
-  get_jungle: () => import_chunk_HKWBVOEL.get_jungle,
-  isErrorWithLocation: () => import_chunk_HKWBVOEL.isErrorWithLocation,
-  launchSimulator: () => import_chunk_HKWBVOEL.launchSimulator,
-  manifestProducts: () => import_chunk_HKWBVOEL.manifestProducts,
-  mctree: () => import_chunk_HKWBVOEL.mctree,
-  simulateProgram: () => import_chunk_HKWBVOEL.simulateProgram
+  defaultConfig: () => import_chunk_32NRMXAJ.defaultConfig,
+  display: () => import_chunk_32NRMXAJ.display,
+  generateOneConfig: () => import_chunk_32NRMXAJ.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_32NRMXAJ.generateOptimizedProject,
+  getConfig: () => import_chunk_32NRMXAJ.getConfig,
+  getProjectAnalysis: () => import_chunk_32NRMXAJ.getProjectAnalysis,
+  get_jungle: () => import_chunk_32NRMXAJ.get_jungle,
+  isErrorWithLocation: () => import_chunk_32NRMXAJ.isErrorWithLocation,
+  launchSimulator: () => import_chunk_32NRMXAJ.launchSimulator,
+  manifestProducts: () => import_chunk_32NRMXAJ.manifestProducts,
+  mctree: () => import_chunk_32NRMXAJ.mctree,
+  simulateProgram: () => import_chunk_32NRMXAJ.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_HKWBVOEL.init_optimizer)();
+(0, import_chunk_32NRMXAJ.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_HKWBVOEL.SectionKinds,
-  appSupport: () => import_chunk_HKWBVOEL.appSupport,
-  connectiq: () => import_chunk_HKWBVOEL.connectiq,
-  getDeviceInfo: () => import_chunk_HKWBVOEL.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_HKWBVOEL.getFunctionDocumentation,
-  getLanguages: () => import_chunk_HKWBVOEL.getLanguages,
-  getSdkPath: () => import_chunk_HKWBVOEL.getSdkPath,
-  isWin: () => import_chunk_HKWBVOEL.isWin,
-  optimizeProgram: () => import_chunk_HKWBVOEL.optimizeProgram,
-  readPrg: () => import_chunk_HKWBVOEL.readPrg,
-  readPrgWithOffsets: () => import_chunk_HKWBVOEL.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_HKWBVOEL.xml_util_exports
+  SectionKinds: () => import_chunk_32NRMXAJ.SectionKinds,
+  appSupport: () => import_chunk_32NRMXAJ.appSupport,
+  connectiq: () => import_chunk_32NRMXAJ.connectiq,
+  getDeviceInfo: () => import_chunk_32NRMXAJ.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_32NRMXAJ.getFunctionDocumentation,
+  getLanguages: () => import_chunk_32NRMXAJ.getLanguages,
+  getSdkPath: () => import_chunk_32NRMXAJ.getSdkPath,
+  isWin: () => import_chunk_32NRMXAJ.isWin,
+  optimizeProgram: () => import_chunk_32NRMXAJ.optimizeProgram,
+  readPrg: () => import_chunk_32NRMXAJ.readPrg,
+  readPrgWithOffsets: () => import_chunk_32NRMXAJ.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_32NRMXAJ.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_HKWBVOEL.init_sdk_util)();
+(0, import_chunk_32NRMXAJ.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/optimizer-types.d.ts

@@ -1,5 +1,4 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { EnumStringMember } from "@markw65/prettier-plugin-monkeyc/build/estree-types";
 import { xmlUtil } from "./sdk-util";
 import { ExactOrUnion } from "./type-flow/types";
 export type DiagnosticType = "ERROR" | "WARNING" | "INFO";
@@ -228,7 +227,7 @@ export type ProgramState = {
     };
     diagnostics?: Record<string, PreDiagnostic[]>;
     inlineDiagnostics?: Record<string, Diagnostic[]>;
-    enumMap?: Map<EnumStringMember, EnumStateNode>;
+    enumMap?: Map<mctree.EnumStringMember, EnumStateNode>;
 };
 export type Finalized<T, Keys extends keyof T> = T & {
     [key in Keys]-?: NonNullable<T[key]>;

package/build/src/readprg/bytecode.d.ts

@@ -9,6 +9,7 @@ import { Bytecode, Opcodes } from "./opcodes";
 import { SymbolTable } from "./symbols";
 export declare const enum SectionKinds {
     HEADER = -805253120,
+    HEADER_VERSIONED = -805253107,
     TEXT = -1059145026,
     DATA = -629491010,
     SYMBOLS = 1461170197,

package/build/src/readprg/header.d.ts

@@ -5,6 +5,7 @@ export type SectionOffset = {
     code: number;
 };
 export type Header = {
+    headerVersion: number;
     ciqVersion: number;
     backgroundOffsets: SectionOffset;
     appLock: boolean;

package/build/src/readprg/opcodes.d.ts

@@ -54,7 +54,28 @@ export declare enum Opcodes {
     throw = 51,
     cpush = 52,
     argc = 53,
-    newba = 54
+    newba = 54,
+    ipushz = 55,
+    ipush1 = 56,
+    ipush2 = 57,
+    ipush3 = 58,
+    fpushz = 59,
+    lpushz = 60,
+    dpushz = 61,
+    btpush = 62,
+    bfpush = 63,
+    apush = 64,
+    bapush = 65,
+    hpush = 66,
+    getselfv = 67,
+    getself = 68,
+    getmv = 69,
+    getlocalv = 70,
+    getsv = 71,
+    invokemz = 72,
+    aputvdup = 73,
+    argcincsp = 74,
+    isnotnull = 75
 }
 interface BaseOpcode {
     op: Opcodes;
@@ -76,6 +97,9 @@ export interface ByteArg extends BaseOpcode {
 export interface ShortArg extends BaseOpcode {
     arg: number;
 }
+export interface ThreeByteArg extends BaseOpcode {
+    arg: number;
+}
 export interface WordArg extends BaseOpcode {
     arg: number;
 }
@@ -127,18 +151,27 @@ export interface Xorv extends Argless {
 export interface Getv extends Argless {
     op: Opcodes.getv;
 }
+export interface Getselfv extends WordArg {
+    op: Opcodes.getselfv;
+}
 export interface Putv extends Argless {
     op: Opcodes.putv;
 }
 export interface Invokem extends ByteArg {
     op: Opcodes.invokem;
 }
+export interface Invokemz extends Argless {
+    op: Opcodes.invokemz;
+}
 export interface Agetv extends Argless {
     op: Opcodes.agetv;
 }
 export interface Aputv extends Argless {
     op: Opcodes.aputv;
 }
+export interface Aputvdup extends Argless {
+    op: Opcodes.aputvdup;
+}
 export type LocalRange = {
     name: string;
     id: number;
@@ -150,6 +183,9 @@ export interface LocalInst extends ByteArg {
 export interface Lgetv extends LocalInst {
     op: Opcodes.lgetv;
 }
+export interface Getself extends Argless {
+    op: Opcodes.getself;
+}
 export interface Lputv extends LocalInst {
     op: Opcodes.lputv;
 }
@@ -180,6 +216,15 @@ export interface Bf extends ShortArg {
 export interface Jsr extends ShortArg {
     op: Opcodes.jsr;
 }
+export interface Apush extends WordArg {
+    op: Opcodes.apush;
+}
+export interface Bapush extends WordArg {
+    op: Opcodes.bapush;
+}
+export interface Hpush extends WordArg {
+    op: Opcodes.hpush;
+}
 export interface Eq extends Argless {
     op: Opcodes.eq;
 }
@@ -201,6 +246,9 @@ export interface Ne extends Argless {
 export interface Isnull extends Argless {
     op: Opcodes.isnull;
 }
+export interface Isnotnull extends Argless {
+    op: Opcodes.isnotnull;
+}
 export interface Isa extends Argless {
     op: Opcodes.isa;
 }
@@ -213,9 +261,24 @@ export interface Ts extends Argless {
 export interface Ipush extends WordArg {
     op: Opcodes.ipush;
 }
+export interface Ipushz extends Argless {
+    op: Opcodes.ipushz;
+}
+export interface Ipush1 extends ByteArg {
+    op: Opcodes.ipush1;
+}
+export interface Ipush2 extends ShortArg {
+    op: Opcodes.ipush2;
+}
+export interface Ipush3 extends ThreeByteArg {
+    op: Opcodes.ipush3;
+}
 export interface Fpush extends FloatArg {
     op: Opcodes.fpush;
 }
+export interface Fpushz extends Argless {
+    op: Opcodes.fpushz;
+}
 export interface Spush extends WordArg {
     op: Opcodes.spush;
 }
@@ -225,6 +288,12 @@ export interface Frpush extends Argless {
 export interface Bpush extends ByteArg {
     op: Opcodes.bpush;
 }
+export interface Btpush extends Argless {
+    op: Opcodes.btpush;
+}
+export interface Bfpush extends Argless {
+    op: Opcodes.bfpush;
+}
 export interface Npush extends Argless {
     op: Opcodes.npush;
 }
@@ -240,12 +309,36 @@ export interface Newd extends Argless {
 export interface Getm extends Argless {
     op: Opcodes.getm;
 }
+export interface Getmv extends BaseOpcode {
+    op: Opcodes.getmv;
+    arg: {
+        module: number;
+        var: number;
+    };
+}
+export interface Getlocalv extends BaseOpcode {
+    op: Opcodes.getlocalv;
+    arg: {
+        local: number;
+        var: number;
+    };
+    range?: LocalRange;
+}
+export interface Getsv extends WordArg {
+    op: Opcodes.getsv;
+}
 export interface Lpush extends LongArg {
     op: Opcodes.lpush;
 }
+export interface Lpushz extends Argless {
+    op: Opcodes.lpushz;
+}
 export interface Dpush extends DoubleArg {
     op: Opcodes.dpush;
 }
+export interface Dpushz extends Argless {
+    op: Opcodes.dpushz;
+}
 export interface Throw extends Argless {
     op: Opcodes.throw;
 }
@@ -258,9 +351,16 @@ export interface Newba extends Argless {
 export interface Argc extends ByteArg {
     op: Opcodes.argc;
 }
-export type Bytecode = Nop | Incsp | Popv | Addv | Subv | Mulv | Divv | Andv | Orv | Modv | Shlv | Shrv | Xorv | Getv | Putv | Invokem | Agetv | Aputv | Lgetv | Lputv | Newa | Newc | Return | Ret | News | Goto | Eq | Lt | Lte | Gt | Gte | Ne | Isnull | Isa | Canhazplz | Jsr | Ts | Ipush | Fpush | Spush | Bt | Bf | Frpush | Bpush | Npush | Invv | Dup | Newd | Getm | Lpush | Dpush | Throw | Cpush | Argc | Newba;
+export interface Argcincsp extends BaseOpcode {
+    op: Opcodes.argcincsp;
+    arg: {
+        argc: number;
+        incsp: number;
+    };
+}
+export type Bytecode = Nop | Incsp | Popv | Addv | Subv | Mulv | Divv | Andv | Orv | Modv | Shlv | Shrv | Xorv | Getv | Putv | Invokem | Agetv | Aputv | Lgetv | Lputv | Newa | Newc | Return | Ret | News | Goto | Eq | Lt | Lte | Gt | Gte | Ne | Isnull | Isa | Canhazplz | Jsr | Ts | Ipush | Fpush | Spush | Bt | Bf | Frpush | Bpush | Npush | Invv | Dup | Newd | Getm | Lpush | Dpush | Throw | Cpush | Argc | Newba | Ipushz | Ipush1 | Ipush2 | Ipush3 | Fpushz | Lpushz | Dpushz | Btpush | Bfpush | Apush | Bapush | Hpush | Getselfv | Getself | Getmv | Getlocalv | Getsv | Invokemz | Aputvdup | Argcincsp | Isnotnull;
 export declare function parseCode(view: DataView, lineTable: Map<number, LineNumber>): Bytecode[];
-export declare function opcodeSize(op: Opcodes): 1 | 2 | 3 | 5 | 9;
+export declare function opcodeSize(op: Opcodes): 1 | 2 | 3 | 4 | 5 | 6 | 9;
 export declare function emitBytecode(bytecode: Bytecode, view: DataView, offset: number, linktable: Map<number, number>, shift_hack: boolean): number;
 export declare function getOpInfo(bytecode: Bytecode): {
     pop: number;
@@ -274,6 +374,7 @@ export declare const enum Effects {
     Call = 8
 }
 export declare function getOpEffects(bytecode: Bytecode): number;
+export declare function opReadsLocal(bytecode: Bytecode): number | null;
 export declare function isBoolOp(op: Opcodes): boolean;
 export declare function isCondBranch(op: Opcodes): boolean;
 export {};

package/build/src/sdk-util.d.ts

@@ -14,6 +14,7 @@ export type DeviceInfo = {
         deviceFamily: string;
         displayName: string;
         languages: Record<string, true>;
+        ciqVersions: Array<string>;
     };
 };
 export declare function getDeviceInfo(): Promise<DeviceInfo>;

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_HKWBVOEL = require("./chunk-HKWBVOEL.cjs");
+var import_chunk_32NRMXAJ = require("./chunk-32NRMXAJ.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_HKWBVOEL.init_worker_task)();
+    (0, import_chunk_32NRMXAJ.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_HKWBVOEL.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_32NRMXAJ.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -52,7 +52,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.55"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.56"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",