@markw65/monkeyc-optimizer 1.1.21 → 1.1.22

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_ZDTW2QRS.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_ZDTW2QRS.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_563GVBVT.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_563GVBVT.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
+  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
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_ZDTW2QRS = require("./chunk-ZDTW2QRS.cjs");
+var import_chunk_563GVBVT = require("./chunk-563GVBVT.cjs");
 var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
-(0, import_chunk_ZDTW2QRS.init_optimizer)();
+(0, import_chunk_563GVBVT.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_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
+  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
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_ZDTW2QRS = require("./chunk-ZDTW2QRS.cjs");
+var import_chunk_563GVBVT = require("./chunk-563GVBVT.cjs");
 var import_chunk_HHQDDCTP = require("./chunk-HHQDDCTP.cjs");
-(0, import_chunk_ZDTW2QRS.init_sdk_util)();
+(0, import_chunk_563GVBVT.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/api.d.ts

@@ -26,7 +26,7 @@ export declare function findNamesInScope(declStack: StateNode[][], pattern: stri
     parent: StateNode;
     depth: number;
 }][];
-export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | ModuleStateNode | FunctionStateNode | ClassStateNode | TypedefStateNode | ProgramStateNode | import("./optimizer-types").BlockStateNode | VariableStateNode | EnumStateNode)[];
+export declare function mapVarDeclsByType(state: ProgramStateAnalysis, decls: StateNodeDecl[], node: mctree.Node, typeMap: TypeMap | null | undefined): (mctree.Identifier | mctree.EnumStringMember | mctree.AsIdentifier | FunctionStateNode | ClassStateNode | ModuleStateNode | ProgramStateNode | VariableStateNode | import("./optimizer-types").BlockStateNode | TypedefStateNode | EnumStateNode)[];
 export declare function formatAstLongLines(node: mctree.Node): string;
 export declare function createDocumentationMap(functionDocumentation: {
     name: string;

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

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

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

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

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

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import * as crypto from "node:crypto";
+import { BuildConfig } from "src/optimizer-types";
 import { xmlUtil } from "../sdk-util";
 import { ExceptionEntry, ExceptionsMap } from "./exceptions";
 import { Header } from "./header";
@@ -23,6 +24,7 @@ export declare type SectionInfo = {
 };
 export declare type Logger = (module: string, level: number, message: string) => void;
 export declare type Context = {
+    config: BuildConfig;
     filepath: string;
     sections: Record<number, SectionInfo>;
     header: Header;

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

@@ -5,4 +5,11 @@ 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;
+export declare enum RpoFlags {
+    EnqueueTaken = 1,
+    EnqueueNext = 2,
+    SkipTaken = 4,
+    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;

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

@@ -1,19 +1,20 @@
 import { ExactOrUnion } from "../optimizer";
 import { Context, FuncEntry } from "./bytecode";
-import { Lputv } from "./opcodes";
+import { Bytecode, Lputv } from "./opcodes";
 interface InterpItemInfo {
     type: ExactOrUnion;
     equivs?: Set<number>;
 }
-interface InterpStackElem extends InterpItemInfo {
-    dup?: number;
-}
-declare type InterpState = {
-    stack: InterpStackElem[];
+export declare type InterpState = {
+    stack: InterpItemInfo[];
     locals: InterpItemInfo[];
+    loopBlock?: true;
 };
+export declare function cloneState(state: InterpState | null | undefined): InterpState;
+export declare function interpBytecode(bc: Bytecode, localState: InterpState, context: Context): void;
 export declare function interpFunc(func: FuncEntry, context: Context): {
     liveInState: Map<number, InterpState>;
     equivSets: Map<Lputv, Set<number>>;
 };
+export declare function instForType(type: ExactOrUnion, offset: number): Bytecode | null;
 export {};

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

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

package/build/src/readprg.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as crypto from "node:crypto";
+import { BuildConfig } from "./optimizer-types";
 import { SectionInfo } from "./readprg/bytecode";
 import { xmlUtil } from "./sdk-util";
 export declare function readPrg(path: string): Promise<{
@@ -14,12 +15,12 @@ export declare function readPrgWithOffsets(view: DataView): {
     view: DataView;
     sections: Record<number, SectionInfo>;
 };
-export declare function optimizeProgram(filepath: string, devKey?: string | undefined, output?: string): Promise<unknown>;
-export declare function optimizeProgramBuffer(filepath: string, view: DataView, debugXml: xmlUtil.Document, key: crypto.KeyObject | undefined): {
+export declare function optimizeProgram(filepath: string, devKey?: string | undefined, output?: string, config?: BuildConfig): Promise<unknown>;
+export declare function optimizeProgramBuffer(filepath: string, view: DataView, debugXml: xmlUtil.Document, key: crypto.KeyObject | undefined, config: BuildConfig | undefined): {
     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<{
+export declare function optimizePrgAndDebug(prgName: string, prgBuffer: ArrayBuffer, prgOffset: number, prgLength: number, xmlName: string, xmlBuffer: ArrayBuffer, xmlOffset: number, xmlLength: number, key: crypto.KeyObject, config: BuildConfig | undefined): Promise<{
     sigBuffer: ArrayBufferLike | undefined;
     sigOffset: number | undefined;
     sigLength: number | undefined;

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

@@ -17,7 +17,7 @@ export declare function printBlockHeader(block: TypeFlowBlock): void;
 export declare function describeEvent(event: Event): string;
 export declare function printBlockEvents(block: TypeFlowBlock, extra?: (event: Event) => string): void;
 export declare function printBlockTrailer(block: TypeFlowBlock): void;
-export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): [StateNode[], StateNode[]] | readonly [null, null];
+export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): readonly [null, null] | [StateNode[], StateNode[]];
 export declare function refineObjectTypeByDecls(istate: InterpState, object: ExactOrUnion, trueDecls: StateNode[]): ExactOrUnion;
 export declare function findNextObjectType(istate: InterpState, trueDecls: StateNode[], next: mctree.DottedMemberExpression): import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | import("./types").ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | import("./types").ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | null;
 export declare function resolveDottedMember(istate: InterpState, object: ExactOrUnion, next: mctree.DottedMemberExpression): {

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

@@ -41,6 +41,7 @@ interface OptimizePrgAndDebug extends BaseNode {
         xmlOffset: number;
         xmlLength: number;
         key: crypto.KeyObject;
+        config: BuildConfig | undefined;
     };
 }
 export declare type WorkerTask = BuildOptimizedProject | GenerateOptimizedProject | GenerateOneConfig | OptimizePrgAndDebug;

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_ZDTW2QRS = require("./chunk-ZDTW2QRS.cjs");
+var import_chunk_563GVBVT = require("./chunk-563GVBVT.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_HHQDDCTP.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_ZDTW2QRS.init_worker_task)();
+    (0, import_chunk_563GVBVT.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_ZDTW2QRS.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_563GVBVT.performTask)(task));
       });
     }
   }

package/package.json

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