@markw65/monkeyc-optimizer 1.1.22 → 1.1.24

package/build/{chunk-HHQDDCTP.cjs → chunk-QFQPBQSO.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_HHQDDCTP_exports = {};
-__export(chunk_HHQDDCTP_exports, {
+var chunk_QFQPBQSO_exports = {};
+__export(chunk_QFQPBQSO_exports, {
   GenericQueue: () => GenericQueue,
   __commonJS: () => __commonJS,
   __esm: () => __esm,
@@ -58,7 +58,7 @@ __export(chunk_HHQDDCTP_exports, {
   spawnByLine: () => spawnByLine,
   wouldLog: () => wouldLog
 });
-module.exports = __toCommonJS(chunk_HHQDDCTP_exports);
+module.exports = __toCommonJS(chunk_QFQPBQSO_exports);
 var child_process = __toESM(require("child_process"));
 var fsc = __toESM(require("fs"));
 var fs = __toESM(require("fs/promises"));
@@ -5455,7 +5455,7 @@ var require_priorityqueuejs = __commonJS({
 });
 function logger(module2, level, message) {
   if (wouldLog(module2, level)) {
-    log(message);
+    log(typeof message === "function" ? message() : message);
   }
 }
 function wouldLog(module2, level) {

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_563GVBVT.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_563GVBVT.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_HHQDDCTP.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_563GVBVT.defaultConfig,
-  display: () => import_chunk_563GVBVT.display,
-  generateApiMirTests: () => import_chunk_563GVBVT.generateApiMirTests,
-  generateOneConfig: () => import_chunk_563GVBVT.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_563GVBVT.generateOptimizedProject,
-  getConfig: () => import_chunk_563GVBVT.getConfig,
-  getProjectAnalysis: () => import_chunk_563GVBVT.getProjectAnalysis,
-  get_jungle: () => import_chunk_563GVBVT.get_jungle,
-  isErrorWithLocation: () => import_chunk_563GVBVT.isErrorWithLocation,
-  launchSimulator: () => import_chunk_563GVBVT.launchSimulator,
-  manifestProducts: () => import_chunk_563GVBVT.manifestProducts,
-  mctree: () => import_chunk_563GVBVT.mctree,
-  simulateProgram: () => import_chunk_563GVBVT.simulateProgram
+  StateNodeAttributes: () => import_chunk_3HVXWNU4.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_3HVXWNU4.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_QFQPBQSO.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_3HVXWNU4.defaultConfig,
+  display: () => import_chunk_3HVXWNU4.display,
+  generateApiMirTests: () => import_chunk_3HVXWNU4.generateApiMirTests,
+  generateOneConfig: () => import_chunk_3HVXWNU4.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_3HVXWNU4.generateOptimizedProject,
+  getConfig: () => import_chunk_3HVXWNU4.getConfig,
+  getProjectAnalysis: () => import_chunk_3HVXWNU4.getProjectAnalysis,
+  get_jungle: () => import_chunk_3HVXWNU4.get_jungle,
+  isErrorWithLocation: () => import_chunk_3HVXWNU4.isErrorWithLocation,
+  launchSimulator: () => import_chunk_3HVXWNU4.launchSimulator,
+  manifestProducts: () => import_chunk_3HVXWNU4.manifestProducts,
+  mctree: () => import_chunk_3HVXWNU4.mctree,
+  simulateProgram: () => import_chunk_3HVXWNU4.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_563GVBVT = require("./chunk-563GVBVT.cjs");
-var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
-(0, import_chunk_563GVBVT.init_optimizer)();
+var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
+(0, import_chunk_3HVXWNU4.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_563GVBVT.SectionKinds,
-  appSupport: () => import_chunk_563GVBVT.appSupport,
-  connectiq: () => import_chunk_563GVBVT.connectiq,
-  getDeviceInfo: () => import_chunk_563GVBVT.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_563GVBVT.getFunctionDocumentation,
-  getLanguages: () => import_chunk_563GVBVT.getLanguages,
-  getSdkPath: () => import_chunk_563GVBVT.getSdkPath,
-  isWin: () => import_chunk_563GVBVT.isWin,
-  optimizeProgram: () => import_chunk_563GVBVT.optimizeProgram,
-  readPrg: () => import_chunk_563GVBVT.readPrg,
-  readPrgWithOffsets: () => import_chunk_563GVBVT.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_563GVBVT.xml_util_exports
+  SectionKinds: () => import_chunk_3HVXWNU4.SectionKinds,
+  appSupport: () => import_chunk_3HVXWNU4.appSupport,
+  connectiq: () => import_chunk_3HVXWNU4.connectiq,
+  getDeviceInfo: () => import_chunk_3HVXWNU4.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_3HVXWNU4.getFunctionDocumentation,
+  getLanguages: () => import_chunk_3HVXWNU4.getLanguages,
+  getSdkPath: () => import_chunk_3HVXWNU4.getSdkPath,
+  isWin: () => import_chunk_3HVXWNU4.isWin,
+  optimizeProgram: () => import_chunk_3HVXWNU4.optimizeProgram,
+  readPrg: () => import_chunk_3HVXWNU4.readPrg,
+  readPrgWithOffsets: () => import_chunk_3HVXWNU4.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_3HVXWNU4.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_563GVBVT = require("./chunk-563GVBVT.cjs");
-var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
-(0, import_chunk_563GVBVT.init_sdk_util)();
+var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
+(0, import_chunk_3HVXWNU4.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

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

@@ -45,6 +45,7 @@ export declare type BuildConfig = {
     covarianceWarnings?: boolean;
     checkTypes?: DiagnosticType | "OFF";
     removeArgc?: boolean;
+    postBuildPRE?: boolean;
 };
 export declare type StateNodeDecl = StateNode | mctree.EnumStringMember | mctree.TypedIdentifier;
 export declare type StateNodeDecls = {

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import * as crypto from "node:crypto";
-import { BuildConfig } from "src/optimizer-types";
+import { BuildConfig } from "../optimizer-types";
 import { xmlUtil } from "../sdk-util";
 import { ExceptionEntry, ExceptionsMap } from "./exceptions";
 import { Header } from "./header";
@@ -35,6 +35,7 @@ export declare type Context = {
     key?: crypto.KeyObject;
     debugXml: xmlUtil.Document;
     nextOffset: number;
+    nextLocalId: number;
 };
 export declare type Block = {
     offset: number;
@@ -48,6 +49,7 @@ export declare type Block = {
 export declare type FuncEntry = {
     name?: string;
     offset: number;
+    argc?: number;
     blocks: Map<number, Block>;
 };
 export declare function offsetToString(offset: number): string;

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

@@ -4,6 +4,7 @@ export declare function postOrderTraverse(func: FuncEntry, visitor: (block: Bloc
 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 computeDominators(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 enum RpoFlags {
     EnqueueTaken = 1,
@@ -12,4 +13,4 @@ export declare enum RpoFlags {
     SkipNext = 8,
     RestartBlock = 16
 }
-export declare function rpoPropagate<T>(func: FuncEntry, preBlock: (block: Block) => T, processBc: (block: Block, bc: Bytecode, state: T) => RpoFlags | null | undefined | void, postBlock: (block: Block, state: T) => void, merge: (from: Block, state: T, predBlock: Block, isExSucc: boolean) => boolean): void;
+export declare function rpoPropagate<T>(func: FuncEntry, preBlock: (block: Block) => T, processBc: ((block: Block, bc: Bytecode, state: T) => RpoFlags | null | undefined | void) | null, postBlock: (block: Block, state: T) => void, merge: (from: Block, state: T, succBlock: Block, isExSucc: boolean) => boolean): void;

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

@@ -1,14 +1,23 @@
 import { Context, FuncEntry } from "./bytecode";
 import { ExceptionsMap } from "./exceptions";
 import { LineNumber } from "./linenum";
+declare type LocalXmlInfo = {
+    name: string;
+    startPc: number;
+    endPc: number;
+    isParam: boolean;
+    slot: number;
+    id: number;
+};
 export declare type LocalsMap = Map<number, {
     startPc: number;
     endPc: number;
 }>;
 export declare type UpdateInfo = {
     offsetMap: Map<number, number>;
-    localsMap: Map<FuncEntry, LocalsMap>;
+    localRanges: LocalXmlInfo[];
     lineMap: LineNumber[];
     exceptionsMap: ExceptionsMap;
 };
 export declare function emitFunc(func: FuncEntry, view: DataView, start: number, updateInfo: UpdateInfo, context: Context): number;
+export {};

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

@@ -15,6 +15,7 @@ export declare function interpBytecode(bc: Bytecode, localState: InterpState, co
 export declare function interpFunc(func: FuncEntry, context: Context): {
     liveInState: Map<number, InterpState>;
     equivSets: Map<Lputv, Set<number>>;
+    changes: number;
 };
 export declare function instForType(type: ExactOrUnion, offset: number): Bytecode | null;
 export {};

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

@@ -139,10 +139,18 @@ export interface Agetv extends Argless {
 export interface Aputv extends Argless {
     op: Opcodes.aputv;
 }
-export interface Lgetv extends ByteArg {
+export declare type LocalRange = {
+    name: string;
+    id: number;
+    isParam?: true | undefined;
+};
+export interface LocalInst extends ByteArg {
+    range?: LocalRange;
+}
+export interface Lgetv extends LocalInst {
     op: Opcodes.lgetv;
 }
-export interface Lputv extends ByteArg {
+export interface Lputv extends LocalInst {
     op: Opcodes.lputv;
 }
 export interface Newa extends Argless {
@@ -258,6 +266,14 @@ export declare function getOpInfo(bytecode: Bytecode): {
     pop: number;
     push: number;
 };
+export declare const enum Effects {
+    None = 0,
+    Local = 1,
+    Global = 2,
+    ArrayLike = 4,
+    Call = 8
+}
+export declare function getOpEffects(bytecode: Bytecode): number;
 export declare function isBoolOp(op: Opcodes): boolean;
 export declare function isCondBranch(op: Opcodes): boolean;
 export {};

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

@@ -0,0 +1,2 @@
+import { Context, FuncEntry } from "./bytecode";
+export declare function sizeBasedPRE(func: FuncEntry, context: Context): true | undefined;

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

@@ -9,6 +9,7 @@ export declare class SymbolTable {
     methods: Map<number, {
         name: string;
         id: number | null;
+        argc: number | null;
     }>;
     decoder: import("util").TextDecoder;
     parseSymbolTable(view: DataView): number;

package/build/src/type-flow/interp.d.ts

@@ -23,6 +23,7 @@ export declare function evaluateExpr(state: ProgramStateAnalysis, expr: mctree.E
 export declare function preEvaluate(istate: InterpState, node: mctree.Node): null | (keyof mctree.NodeAll)[];
 export declare function evaluate(istate: InterpState, node: mctree.Expression): InterpStackElem;
 export declare function evaluate(istate: InterpState, node: mctree.Node): InterpStackElem | undefined;
+export declare function evaluateUnaryTypes(op: mctree.UnaryOperator, argument: ExactOrUnion): ExactOrUnion;
 export declare function deEnumerate(t: ExactOrUnion): ExactOrUnion;
 export declare function evaluateNode(istate: InterpState, node: mctree.Node): void;
 export declare function roundToFloat(value: number): number;

package/build/util.cjs

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

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_563GVBVT = require("./chunk-563GVBVT.cjs");
-var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
+var import_chunk_3HVXWNU4 = require("./chunk-3HVXWNU4.cjs");
+var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
 var import_node_worker_threads = require("node:worker_threads");
-var require_worker_thread = (0, import_chunk_HHQDDCTP.__commonJS)({
+var require_worker_thread = (0, import_chunk_QFQPBQSO.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_563GVBVT.init_worker_task)();
+    (0, import_chunk_3HVXWNU4.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_563GVBVT.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_3HVXWNU4.performTask)(task));
       });
     }
   }

package/package.json

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