@markw65/monkeyc-optimizer 1.1.18 → 1.1.20

package/build/optimizer.cjs

@@ -18,28 +18,27 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_YCLY27QH.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_TM6GLTGC.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_IAUHYWVN.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_TM6GLTGC.defaultConfig,
-  display: () => import_chunk_YCLY27QH.display,
-  generateApiMirTests: () => import_chunk_TM6GLTGC.generateApiMirTests,
-  generateOneConfig: () => import_chunk_TM6GLTGC.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_TM6GLTGC.generateOptimizedProject,
-  getConfig: () => import_chunk_TM6GLTGC.getConfig,
-  getProjectAnalysis: () => import_chunk_TM6GLTGC.getProjectAnalysis,
-  get_jungle: () => import_chunk_TM6GLTGC.get_jungle,
-  isErrorWithLocation: () => import_chunk_TM6GLTGC.isErrorWithLocation,
-  launchSimulator: () => import_chunk_TM6GLTGC.launchSimulator,
-  manifestProducts: () => import_chunk_TM6GLTGC.manifestProducts,
-  mctree: () => import_chunk_TM6GLTGC.mctree,
-  simulateProgram: () => import_chunk_TM6GLTGC.simulateProgram
+  StateNodeAttributes: () => import_chunk_DCGJCC63.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_DCGJCC63.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_APACX34C.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_DCGJCC63.defaultConfig,
+  display: () => import_chunk_DCGJCC63.display,
+  generateApiMirTests: () => import_chunk_DCGJCC63.generateApiMirTests,
+  generateOneConfig: () => import_chunk_DCGJCC63.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_DCGJCC63.generateOptimizedProject,
+  getConfig: () => import_chunk_DCGJCC63.getConfig,
+  getProjectAnalysis: () => import_chunk_DCGJCC63.getProjectAnalysis,
+  get_jungle: () => import_chunk_DCGJCC63.get_jungle,
+  isErrorWithLocation: () => import_chunk_DCGJCC63.isErrorWithLocation,
+  launchSimulator: () => import_chunk_DCGJCC63.launchSimulator,
+  manifestProducts: () => import_chunk_DCGJCC63.manifestProducts,
+  mctree: () => import_chunk_DCGJCC63.mctree,
+  simulateProgram: () => import_chunk_DCGJCC63.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_TM6GLTGC = require("./chunk-TM6GLTGC.cjs");
-var import_chunk_YCLY27QH = require("./chunk-YCLY27QH.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_TM6GLTGC.init_optimizer)();
+var import_chunk_DCGJCC63 = require("./chunk-DCGJCC63.cjs");
+var import_chunk_APACX34C = require("./chunk-APACX34C.cjs");
+(0, import_chunk_DCGJCC63.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,23 +18,23 @@ 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_YCLY27QH.SectionKinds,
-  appSupport: () => import_chunk_YCLY27QH.appSupport,
-  connectiq: () => import_chunk_YCLY27QH.connectiq,
-  getDeviceInfo: () => import_chunk_YCLY27QH.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_YCLY27QH.getFunctionDocumentation,
-  getLanguages: () => import_chunk_YCLY27QH.getLanguages,
-  getSdkPath: () => import_chunk_YCLY27QH.getSdkPath,
-  isWin: () => import_chunk_YCLY27QH.isWin,
-  optimizeProgram: () => import_chunk_YCLY27QH.optimizeProgram,
-  readPrg: () => import_chunk_YCLY27QH.readPrg,
-  readPrgWithOffsets: () => import_chunk_YCLY27QH.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_YCLY27QH.xml_util_exports
+  SectionKinds: () => import_chunk_DCGJCC63.SectionKinds,
+  appSupport: () => import_chunk_DCGJCC63.appSupport,
+  connectiq: () => import_chunk_DCGJCC63.connectiq,
+  getDeviceInfo: () => import_chunk_DCGJCC63.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_DCGJCC63.getFunctionDocumentation,
+  getLanguages: () => import_chunk_DCGJCC63.getLanguages,
+  getSdkPath: () => import_chunk_DCGJCC63.getSdkPath,
+  isWin: () => import_chunk_DCGJCC63.isWin,
+  optimizeProgram: () => import_chunk_DCGJCC63.optimizeProgram,
+  readPrg: () => import_chunk_DCGJCC63.readPrg,
+  readPrgWithOffsets: () => import_chunk_DCGJCC63.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_DCGJCC63.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_YCLY27QH = require("./chunk-YCLY27QH.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_YCLY27QH.init_sdk_util)();
+var import_chunk_DCGJCC63 = require("./chunk-DCGJCC63.cjs");
+var import_chunk_APACX34C = require("./chunk-APACX34C.cjs");
+(0, import_chunk_DCGJCC63.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/data-flow.d.ts

@@ -1,6 +1,7 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
 import { BaseEvent, Block } from "./control-flow";
 import { FunctionStateNode, ProgramStateAnalysis, StateNodeDecl } from "./optimizer-types";
+import { GenericQueue } from "./util";
 export declare type RefNode = mctree.Identifier | mctree.MemberExpression | mctree.Literal;
 export declare type MemberDecl = {
     type: "MemberDecl";
@@ -101,10 +102,6 @@ export declare function buildDataFlowGraph(state: ProgramStateAnalysis, func: Fu
     identifiers: Set<string>;
     graph: Block<Event>;
 };
-export declare class DataflowQueue {
-    private enqueued;
-    private queue;
-    enqueue(block: DataFlowBlock): void;
-    dequeue(): DataFlowBlock;
-    empty(): boolean;
+export declare class DataflowQueue extends GenericQueue<DataFlowBlock> {
+    constructor();
 }

package/build/src/readprg/array-init.d.ts

@@ -1,2 +1,2 @@
 import { Block, Context, FuncEntry } from "./bytecode";
-export declare function optimizeArrayInit(func: FuncEntry, block: Block, index: number, context: Context): boolean;
+export declare function optimizeArrayInit(func: FuncEntry, block: Block, index: number, stackPreserving: boolean, context: Context): boolean;

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

@@ -2,10 +2,12 @@
 import * as crypto from "node:crypto";
 import { xmlUtil } from "../sdk-util";
 import { ExceptionEntry, ExceptionsMap } from "./exceptions";
+import { Header } from "./header";
 import { LineNumber } from "./linenum";
 import { Bytecode, Opcodes } from "./opcodes";
 import { SymbolTable } from "./symbols";
 export declare const enum SectionKinds {
+    HEADER = -805253120,
     TEXT = -1059145026,
     DATA = -629491010,
     SYMBOLS = 1461170197,
@@ -23,6 +25,7 @@ export declare type Logger = (module: string, level: number, message: string) =>
 export declare type Context = {
     filepath: string;
     sections: Record<number, SectionInfo>;
+    header: Header;
     symbolTable: SymbolTable;
     lineTable: Map<number, LineNumber>;
     exceptionsMap: ExceptionsMap;
@@ -48,9 +51,9 @@ export declare type FuncEntry = {
 export declare function offsetToString(offset: number): string;
 export declare function fixSectionSize(section: SectionKinds, sections: Context["sections"], newSize: number): void;
 export declare function optimizeBytecode(context: Context): void;
-export declare function functionBanner(func: FuncEntry, context: Context | null, pass: string): () => string;
+export declare function functionBanner(func: FuncEntry, context: Context | null, pass: string, footer?: (block: Block) => string): () => string;
 export declare function printFunction(func: FuncEntry, context: Context | null): void;
-export declare function functionToString(func: FuncEntry, context: Context | null): string;
+export declare function functionToString(func: FuncEntry, context: Context | null, footer?: (block: Block) => string): string;
 export declare function blockToString(block: Block, context: Context | null): string;
 export declare function bytecodeToString(bytecode: Bytecode, symbolTable: SymbolTable | null | undefined): string;
 export declare function findFunctions({ bytecodes, symbolTable, exceptionsMap, }: Context): Map<number, FuncEntry>;

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

@@ -0,0 +1,5 @@
+import { Block, FuncEntry } from "./bytecode";
+export declare function postOrderTraverse(func: FuncEntry, visitor: (block: Block) => void): void;
+export declare function intersect<T>(a: Set<T>, b: Set<T>): Set<T>;
+export declare type DomLike = Map<number, Set<number>>;
+export declare function computePostDominators(func: FuncEntry): DomLike;

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

@@ -1,2 +1,3 @@
 import { Context, FuncEntry } from "./bytecode";
 export declare function localDCE(func: FuncEntry, context: Context): boolean;
+export declare function computeLiveLocals(func: FuncEntry): Map<number, Set<number>>;

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

@@ -0,0 +1,15 @@
+import { Context } from "./bytecode";
+import { UpdateInfo } from "./emit";
+export declare type SectionOffset = {
+    data: number;
+    code: number;
+};
+export declare type Header = {
+    ciqVersion: number;
+    backgroundOffsets: SectionOffset;
+    appLock: boolean;
+    glanceOffsets: SectionOffset;
+    flags: number;
+};
+export declare function parseHeader(view: DataView): Header;
+export declare function fixupHeader(context: Context, updateInfo: UpdateInfo): void;

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

@@ -0,0 +1,5 @@
+import { Block, FuncEntry } from "./bytecode";
+export declare function isSwitchLike(func: FuncEntry, block: Block, index: number): false | {
+    xpush: import("./opcodes").Ipush | import("./opcodes").Fpush | import("./opcodes").Spush | import("./opcodes").Bpush | import("./opcodes").Lpush | import("./opcodes").Dpush | import("./opcodes").Cpush;
+    index: number;
+};

package/build/src/readprg.d.ts

@@ -19,3 +19,12 @@ export declare function optimizeProgramBuffer(filepath: string, view: DataView,
     signature: Buffer | undefined;
     buffer: Buffer;
 };
+export declare function optimizePrgAndDebug(prgName: string, prgBuffer: ArrayBuffer, prgOffset: number, prgLength: number, xmlName: string, xmlBuffer: ArrayBuffer, xmlOffset: number, xmlLength: number, key: crypto.KeyObject): Promise<{
+    sigBuffer: ArrayBufferLike | undefined;
+    sigOffset: number | undefined;
+    sigLength: number | undefined;
+    prgBuffer: ArrayBufferLike;
+    prgOffset: number;
+    prgLength: number;
+    debugXml: string;
+}>;

package/build/src/util.d.ts

@@ -23,3 +23,11 @@ export declare function readByLine(file: string, lineHandler: LineHandler): Prom
 export declare function promiseAll<T>(promiseFn: (i: number) => Promise<T> | null, parallelism: number): Promise<T[]>;
 export declare function copyRecursiveAsNeeded(source: string, target: string, filter?: (src: string, tgt: string) => boolean): Promise<void>;
 export declare function popcount(x: number): number;
+export declare class GenericQueue<Block> {
+    private enqueued;
+    private queue;
+    constructor(sort: (a: Block, b: Block) => number);
+    enqueue(block: Block): void;
+    dequeue(): Block;
+    empty(): boolean;
+}

package/build/src/worker-task.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import * as crypto from "node:crypto";
 import { JungleQualifier } from "./jungles";
 import { BuildConfig } from "./optimizer";
 import { xmlUtil } from "./sdk-util";
@@ -27,7 +29,21 @@ interface GenerateOptimizedProject extends BaseNode {
         options: BuildConfig;
     };
 }
-export declare type WorkerTask = BuildOptimizedProject | GenerateOptimizedProject | GenerateOneConfig;
+interface OptimizePrgAndDebug extends BaseNode {
+    type: "optimizePrgAndDebug";
+    data: {
+        prgName: string;
+        prgBuffer: ArrayBuffer;
+        prgOffset: number;
+        prgLength: number;
+        xmlName: string;
+        xmlBuffer: ArrayBuffer;
+        xmlOffset: number;
+        xmlLength: number;
+        key: crypto.KeyObject;
+    };
+}
+export declare type WorkerTask = BuildOptimizedProject | GenerateOptimizedProject | GenerateOneConfig | OptimizePrgAndDebug;
 export declare const workerTaskHandlers: {
     readonly buildOptimizedProject: (data: BuildOptimizedProject["data"]) => Promise<{
         exe: string;
@@ -54,6 +70,15 @@ export declare const workerTaskHandlers: {
         hasTests: boolean;
         diagnostics: Record<string, import("./optimizer-types").Diagnostic[]> | undefined;
     }>;
+    readonly optimizePrgAndDebug: (data: OptimizePrgAndDebug["data"]) => Promise<{
+        sigBuffer: ArrayBufferLike | undefined;
+        sigOffset: number | undefined;
+        sigLength: number | undefined;
+        prgBuffer: ArrayBufferLike;
+        prgOffset: number;
+        prgLength: number;
+        debugXml: string;
+    }>;
 };
 declare type RemovePromise<T> = T extends Promise<infer U> ? U : T;
 export declare type WorkerTaskResult<T> = T extends WorkerTask ? RemovePromise<ReturnType<typeof workerTaskHandlers[T["type"]]>> : never;

package/build/util.cjs

@@ -18,33 +18,35 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var util_exports = {};
 __export(util_exports, {
-  bumpLogging: () => import_chunk_IAUHYWVN.bumpLogging,
-  copyRecursiveAsNeeded: () => import_chunk_IAUHYWVN.copyRecursiveAsNeeded,
-  every: () => import_chunk_IAUHYWVN.every,
-  first_modified: () => import_chunk_IAUHYWVN.first_modified,
-  forEach: () => import_chunk_IAUHYWVN.forEach,
-  globSome: () => import_chunk_IAUHYWVN.globSome,
-  globa: () => import_chunk_IAUHYWVN.globa,
-  last_modified: () => import_chunk_IAUHYWVN.last_modified,
-  log: () => import_chunk_IAUHYWVN.log,
-  logger: () => import_chunk_IAUHYWVN.logger,
-  map: () => import_chunk_IAUHYWVN.map,
-  popcount: () => import_chunk_IAUHYWVN.popcount,
-  promiseAll: () => import_chunk_IAUHYWVN.promiseAll,
-  pushUnique: () => import_chunk_IAUHYWVN.pushUnique,
-  readByLine: () => import_chunk_IAUHYWVN.readByLine,
-  reduce: () => import_chunk_IAUHYWVN.reduce,
-  sameArrays: () => import_chunk_IAUHYWVN.sameArrays,
-  setBanner: () => import_chunk_IAUHYWVN.setBanner,
-  some: () => import_chunk_IAUHYWVN.some,
-  spawnByLine: () => import_chunk_IAUHYWVN.spawnByLine,
-  wouldLog: () => import_chunk_IAUHYWVN.wouldLog
+  GenericQueue: () => import_chunk_APACX34C.GenericQueue,
+  bumpLogging: () => import_chunk_APACX34C.bumpLogging,
+  copyRecursiveAsNeeded: () => import_chunk_APACX34C.copyRecursiveAsNeeded,
+  every: () => import_chunk_APACX34C.every,
+  first_modified: () => import_chunk_APACX34C.first_modified,
+  forEach: () => import_chunk_APACX34C.forEach,
+  globSome: () => import_chunk_APACX34C.globSome,
+  globa: () => import_chunk_APACX34C.globa,
+  last_modified: () => import_chunk_APACX34C.last_modified,
+  log: () => import_chunk_APACX34C.log,
+  logger: () => import_chunk_APACX34C.logger,
+  map: () => import_chunk_APACX34C.map,
+  popcount: () => import_chunk_APACX34C.popcount,
+  promiseAll: () => import_chunk_APACX34C.promiseAll,
+  pushUnique: () => import_chunk_APACX34C.pushUnique,
+  readByLine: () => import_chunk_APACX34C.readByLine,
+  reduce: () => import_chunk_APACX34C.reduce,
+  sameArrays: () => import_chunk_APACX34C.sameArrays,
+  setBanner: () => import_chunk_APACX34C.setBanner,
+  some: () => import_chunk_APACX34C.some,
+  spawnByLine: () => import_chunk_APACX34C.spawnByLine,
+  wouldLog: () => import_chunk_APACX34C.wouldLog
 });
 module.exports = __toCommonJS(util_exports);
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_IAUHYWVN.init_util)();
+var import_chunk_APACX34C = require("./chunk-APACX34C.cjs");
+(0, import_chunk_APACX34C.init_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  GenericQueue,
   bumpLogging,
   copyRecursiveAsNeeded,
   every,

package/build/worker-pool.cjs

@@ -18,15 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var worker_pool_exports = {};
 __export(worker_pool_exports, {
-  runTaskInPool: () => import_chunk_TM6GLTGC.runTaskInPool,
-  startPool: () => import_chunk_TM6GLTGC.startPool,
-  stopPool: () => import_chunk_TM6GLTGC.stopPool
+  runTaskInPool: () => import_chunk_DCGJCC63.runTaskInPool,
+  startPool: () => import_chunk_DCGJCC63.startPool,
+  stopPool: () => import_chunk_DCGJCC63.stopPool
 });
 module.exports = __toCommonJS(worker_pool_exports);
-var import_chunk_TM6GLTGC = require("./chunk-TM6GLTGC.cjs");
-var import_chunk_YCLY27QH = require("./chunk-YCLY27QH.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_TM6GLTGC.init_worker_pool)();
+var import_chunk_DCGJCC63 = require("./chunk-DCGJCC63.cjs");
+var import_chunk_APACX34C = require("./chunk-APACX34C.cjs");
+(0, import_chunk_DCGJCC63.init_worker_pool)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   runTaskInPool,

package/build/worker-thread.cjs

@@ -21,16 +21,15 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_TM6GLTGC = require("./chunk-TM6GLTGC.cjs");
-var import_chunk_YCLY27QH = require("./chunk-YCLY27QH.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
+var import_chunk_DCGJCC63 = require("./chunk-DCGJCC63.cjs");
+var import_chunk_APACX34C = require("./chunk-APACX34C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
-var require_worker_thread = (0, import_chunk_IAUHYWVN.__commonJS)({
+var require_worker_thread = (0, import_chunk_APACX34C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_TM6GLTGC.init_worker_task)();
+    (0, import_chunk_DCGJCC63.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_TM6GLTGC.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_DCGJCC63.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",