@markw65/monkeyc-optimizer 1.1.19 → 1.1.21

package/build/optimizer.cjs

@@ -18,27 +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_O5LFMOIG.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_O5LFMOIG.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_IAUHYWVN.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_O5LFMOIG.defaultConfig,
-  display: () => import_chunk_O5LFMOIG.display,
-  generateApiMirTests: () => import_chunk_O5LFMOIG.generateApiMirTests,
-  generateOneConfig: () => import_chunk_O5LFMOIG.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_O5LFMOIG.generateOptimizedProject,
-  getConfig: () => import_chunk_O5LFMOIG.getConfig,
-  getProjectAnalysis: () => import_chunk_O5LFMOIG.getProjectAnalysis,
-  get_jungle: () => import_chunk_O5LFMOIG.get_jungle,
-  isErrorWithLocation: () => import_chunk_O5LFMOIG.isErrorWithLocation,
-  launchSimulator: () => import_chunk_O5LFMOIG.launchSimulator,
-  manifestProducts: () => import_chunk_O5LFMOIG.manifestProducts,
-  mctree: () => import_chunk_O5LFMOIG.mctree,
-  simulateProgram: () => import_chunk_O5LFMOIG.simulateProgram
+  StateNodeAttributes: () => import_chunk_ZDTW2QRS.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_ZDTW2QRS.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_HHQDDCTP.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_ZDTW2QRS.defaultConfig,
+  display: () => import_chunk_ZDTW2QRS.display,
+  generateApiMirTests: () => import_chunk_ZDTW2QRS.generateApiMirTests,
+  generateOneConfig: () => import_chunk_ZDTW2QRS.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_ZDTW2QRS.generateOptimizedProject,
+  getConfig: () => import_chunk_ZDTW2QRS.getConfig,
+  getProjectAnalysis: () => import_chunk_ZDTW2QRS.getProjectAnalysis,
+  get_jungle: () => import_chunk_ZDTW2QRS.get_jungle,
+  isErrorWithLocation: () => import_chunk_ZDTW2QRS.isErrorWithLocation,
+  launchSimulator: () => import_chunk_ZDTW2QRS.launchSimulator,
+  manifestProducts: () => import_chunk_ZDTW2QRS.manifestProducts,
+  mctree: () => import_chunk_ZDTW2QRS.mctree,
+  simulateProgram: () => import_chunk_ZDTW2QRS.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_O5LFMOIG = require("./chunk-O5LFMOIG.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_O5LFMOIG.init_optimizer)();
+var import_chunk_ZDTW2QRS = require("./chunk-ZDTW2QRS.cjs");
+var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
+(0, import_chunk_ZDTW2QRS.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_O5LFMOIG.SectionKinds,
-  appSupport: () => import_chunk_O5LFMOIG.appSupport,
-  connectiq: () => import_chunk_O5LFMOIG.connectiq,
-  getDeviceInfo: () => import_chunk_O5LFMOIG.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_O5LFMOIG.getFunctionDocumentation,
-  getLanguages: () => import_chunk_O5LFMOIG.getLanguages,
-  getSdkPath: () => import_chunk_O5LFMOIG.getSdkPath,
-  isWin: () => import_chunk_O5LFMOIG.isWin,
-  optimizeProgram: () => import_chunk_O5LFMOIG.optimizeProgram,
-  readPrg: () => import_chunk_O5LFMOIG.readPrg,
-  readPrgWithOffsets: () => import_chunk_O5LFMOIG.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_O5LFMOIG.xml_util_exports
+  SectionKinds: () => import_chunk_ZDTW2QRS.SectionKinds,
+  appSupport: () => import_chunk_ZDTW2QRS.appSupport,
+  connectiq: () => import_chunk_ZDTW2QRS.connectiq,
+  getDeviceInfo: () => import_chunk_ZDTW2QRS.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_ZDTW2QRS.getFunctionDocumentation,
+  getLanguages: () => import_chunk_ZDTW2QRS.getLanguages,
+  getSdkPath: () => import_chunk_ZDTW2QRS.getSdkPath,
+  isWin: () => import_chunk_ZDTW2QRS.isWin,
+  optimizeProgram: () => import_chunk_ZDTW2QRS.optimizeProgram,
+  readPrg: () => import_chunk_ZDTW2QRS.readPrg,
+  readPrgWithOffsets: () => import_chunk_ZDTW2QRS.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_ZDTW2QRS.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_O5LFMOIG = require("./chunk-O5LFMOIG.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_O5LFMOIG.init_sdk_util)();
+var import_chunk_ZDTW2QRS = require("./chunk-ZDTW2QRS.cjs");
+var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
+(0, import_chunk_ZDTW2QRS.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/bytecode.d.ts

@@ -51,10 +51,11 @@ 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, extra?: (block: Block, footer: boolean) => 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, extra?: (block: Block, footer: boolean) => string): string;
 export declare function blockToString(block: Block, context: Context | null): string;
+export declare function lineInfoToString(lineInfo: LineNumber, 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>;
 export declare function makeArgless(bc: Bytecode, op: Opcodes): void;

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

@@ -1,5 +1,8 @@
 import { Block, FuncEntry } from "./bytecode";
+import { Bytecode } from "./opcodes";
 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;
+export declare function postOrderPropagate<T>(func: FuncEntry, preBlock: (block: Block) => T, processBc: (block: Block, bc: Bytecode, state: T) => void, postBlock: (block: Block, state: T) => void, merge: (state: T, predBlock: Block, isExPred: boolean) => boolean): void;
+export declare function rpoPropagate<T>(func: FuncEntry, preBlock: (block: Block) => T, processBc: (block: Block, bc: Bytecode, state: T) => void, postBlock: (block: Block, state: T) => void, merge: (from: Block, state: T, predBlock: Block, isExSucc: boolean) => boolean): void;

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

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

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

@@ -0,0 +1,19 @@
+import { ExactOrUnion } from "../optimizer";
+import { Context, FuncEntry } from "./bytecode";
+import { Lputv } from "./opcodes";
+interface InterpItemInfo {
+    type: ExactOrUnion;
+    equivs?: Set<number>;
+}
+interface InterpStackElem extends InterpItemInfo {
+    dup?: number;
+}
+declare type InterpState = {
+    stack: InterpStackElem[];
+    locals: InterpItemInfo[];
+};
+export declare function interpFunc(func: FuncEntry, context: Context): {
+    liveInState: Map<number, InterpState>;
+    equivSets: Map<Lputv, Set<number>>;
+};
+export {};

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

@@ -0,0 +1,2 @@
+import { FuncEntry } from "./bytecode";
+export declare function computeConflictGraph(func: FuncEntry): void;

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/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_HHQDDCTP.GenericQueue,
+  bumpLogging: () => import_chunk_HHQDDCTP.bumpLogging,
+  copyRecursiveAsNeeded: () => import_chunk_HHQDDCTP.copyRecursiveAsNeeded,
+  every: () => import_chunk_HHQDDCTP.every,
+  first_modified: () => import_chunk_HHQDDCTP.first_modified,
+  forEach: () => import_chunk_HHQDDCTP.forEach,
+  globSome: () => import_chunk_HHQDDCTP.globSome,
+  globa: () => import_chunk_HHQDDCTP.globa,
+  last_modified: () => import_chunk_HHQDDCTP.last_modified,
+  log: () => import_chunk_HHQDDCTP.log,
+  logger: () => import_chunk_HHQDDCTP.logger,
+  map: () => import_chunk_HHQDDCTP.map,
+  popcount: () => import_chunk_HHQDDCTP.popcount,
+  promiseAll: () => import_chunk_HHQDDCTP.promiseAll,
+  pushUnique: () => import_chunk_HHQDDCTP.pushUnique,
+  readByLine: () => import_chunk_HHQDDCTP.readByLine,
+  reduce: () => import_chunk_HHQDDCTP.reduce,
+  sameArrays: () => import_chunk_HHQDDCTP.sameArrays,
+  setBanner: () => import_chunk_HHQDDCTP.setBanner,
+  some: () => import_chunk_HHQDDCTP.some,
+  spawnByLine: () => import_chunk_HHQDDCTP.spawnByLine,
+  wouldLog: () => import_chunk_HHQDDCTP.wouldLog
 });
 module.exports = __toCommonJS(util_exports);
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_IAUHYWVN.init_util)();
+var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
+(0, import_chunk_HHQDDCTP.init_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  GenericQueue,
   bumpLogging,
   copyRecursiveAsNeeded,
   every,

package/build/worker-thread.cjs

@@ -21,15 +21,15 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_O5LFMOIG = require("./chunk-O5LFMOIG.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
+var import_chunk_ZDTW2QRS = require("./chunk-ZDTW2QRS.cjs");
+var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.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_HHQDDCTP.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_O5LFMOIG.init_worker_task)();
+    (0, import_chunk_ZDTW2QRS.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_O5LFMOIG.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_ZDTW2QRS.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.19",
+  "version": "1.1.21",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -21,12 +21,13 @@
     "build-debug": "node esbuild.mjs",
     "build-release": "node esbuild.mjs --release",
     "prepack": "node esbuild.mjs --release",
-    "test": "npm run test-mocha && npm run test-optimized && npm run test-unopt && npm run test-remote && npm run test-remote-tests",
+    "test": "npm run test-mocha && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-remote && npm run test-remote-tests",
     "test-mocha": "npx mocha --timeout 999999 build/mocha.cjs",
     "test-remote": "node ./test/test.js --showInfo --postOptimize --product=pick-one --github",
     "test-remote-tests": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
     "test-optimized": "node test/test.js --showInfo --postOptimize --typeCheckLevel Strict --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-unopt": "node test/test.js --typeCheckLevel Strict --skipOptimization --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
+    "test-post-only": "node test/test.js --typeCheckLevel Strict --skipOptimization --postOptimize --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "eslint": "npx eslint ."
   },
@@ -36,7 +37,6 @@
     "build/sdk-util.cjs",
     "build/api.cjs",
     "build/worker-thread.cjs",
-    "build/worker-pool.cjs",
     "build/chunk-*.cjs",
     "build/src/**/*.d.ts"
   ],

package/build/worker-pool.cjs

@@ -1,34 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var worker_pool_exports = {};
-__export(worker_pool_exports, {
-  runTaskInPool: () => import_chunk_O5LFMOIG.runTaskInPool,
-  startPool: () => import_chunk_O5LFMOIG.startPool,
-  stopPool: () => import_chunk_O5LFMOIG.stopPool
-});
-module.exports = __toCommonJS(worker_pool_exports);
-var import_chunk_O5LFMOIG = require("./chunk-O5LFMOIG.cjs");
-var import_chunk_IAUHYWVN = require("./chunk-IAUHYWVN.cjs");
-(0, import_chunk_O5LFMOIG.init_worker_pool)();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  runTaskInPool,
-  startPool,
-  stopPool
-});