@markw65/monkeyc-optimizer 1.1.39 → 1.1.40

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.40
+
+- Update the bytecode optimizer to be compatible with Sdk-7.x
+
 ### 1.1.39
 
 - Update to [@markw65/prettier-plugin-monkeyc@1.0.54](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1054)

package/build/api.cjs

@@ -18,47 +18,47 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_3H4GE7RU.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_3H4GE7RU.collectNamespaces,
-  createDocumentationMap: () => import_chunk_3H4GE7RU.createDocumentationMap,
-  diagnostic: () => import_chunk_3H4GE7RU.diagnostic,
-  diagnosticHelper: () => import_chunk_3H4GE7RU.diagnosticHelper,
-  findNamesInScope: () => import_chunk_3H4GE7RU.findNamesInScope,
-  findUsingForNode: () => import_chunk_3H4GE7RU.findUsingForNode,
-  formatAst: () => import_chunk_3H4GE7RU.formatAst,
-  formatAstLongLines: () => import_chunk_3H4GE7RU.formatAstLongLines,
-  formatScopedName: () => import_chunk_3H4GE7RU.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_3H4GE7RU.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_3H4GE7RU.getApiMapping,
-  getSuperClasses: () => import_chunk_3H4GE7RU.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_Z2SLP4FQ.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_Z2SLP4FQ.collectNamespaces,
+  createDocumentationMap: () => import_chunk_Z2SLP4FQ.createDocumentationMap,
+  diagnostic: () => import_chunk_Z2SLP4FQ.diagnostic,
+  diagnosticHelper: () => import_chunk_Z2SLP4FQ.diagnosticHelper,
+  findNamesInScope: () => import_chunk_Z2SLP4FQ.findNamesInScope,
+  findUsingForNode: () => import_chunk_Z2SLP4FQ.findUsingForNode,
+  formatAst: () => import_chunk_Z2SLP4FQ.formatAst,
+  formatAstLongLines: () => import_chunk_Z2SLP4FQ.formatAstLongLines,
+  formatScopedName: () => import_chunk_Z2SLP4FQ.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_Z2SLP4FQ.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_Z2SLP4FQ.getApiMapping,
+  getSuperClasses: () => import_chunk_Z2SLP4FQ.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_3H4GE7RU.isClassVariable,
-  isLocal: () => import_chunk_3H4GE7RU.isLocal,
-  isLookupCandidate: () => import_chunk_3H4GE7RU.isLookupCandidate,
-  isStateNode: () => import_chunk_3H4GE7RU.isStateNode,
-  lookupByFullName: () => import_chunk_3H4GE7RU.lookupByFullName,
-  lookupNext: () => import_chunk_3H4GE7RU.lookupNext,
-  lookupResultContains: () => import_chunk_3H4GE7RU.lookupResultContains,
-  lookupWithType: () => import_chunk_3H4GE7RU.lookupWithType,
-  makeToyboxLink: () => import_chunk_3H4GE7RU.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_3H4GE7RU.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_3H4GE7RU.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_3H4GE7RU.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_3H4GE7RU.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_3H4GE7RU.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_3H4GE7RU.sameLookupResult,
+  isClassVariable: () => import_chunk_Z2SLP4FQ.isClassVariable,
+  isLocal: () => import_chunk_Z2SLP4FQ.isLocal,
+  isLookupCandidate: () => import_chunk_Z2SLP4FQ.isLookupCandidate,
+  isStateNode: () => import_chunk_Z2SLP4FQ.isStateNode,
+  lookupByFullName: () => import_chunk_Z2SLP4FQ.lookupByFullName,
+  lookupNext: () => import_chunk_Z2SLP4FQ.lookupNext,
+  lookupResultContains: () => import_chunk_Z2SLP4FQ.lookupResultContains,
+  lookupWithType: () => import_chunk_Z2SLP4FQ.lookupWithType,
+  makeToyboxLink: () => import_chunk_Z2SLP4FQ.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_Z2SLP4FQ.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_Z2SLP4FQ.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_Z2SLP4FQ.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_Z2SLP4FQ.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_Z2SLP4FQ.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_Z2SLP4FQ.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_3H4GE7RU.variableDeclarationName,
-  visitReferences: () => import_chunk_3H4GE7RU.visitReferences,
-  visit_resources: () => import_chunk_3H4GE7RU.visit_resources,
-  visitorNode: () => import_chunk_3H4GE7RU.visitorNode
+  variableDeclarationName: () => import_chunk_Z2SLP4FQ.variableDeclarationName,
+  visitReferences: () => import_chunk_Z2SLP4FQ.visitReferences,
+  visit_resources: () => import_chunk_Z2SLP4FQ.visit_resources,
+  visitorNode: () => import_chunk_Z2SLP4FQ.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_3H4GE7RU = require("./chunk-3H4GE7RU.cjs");
+var import_chunk_Z2SLP4FQ = require("./chunk-Z2SLP4FQ.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_3H4GE7RU.init_api)();
+(0, import_chunk_Z2SLP4FQ.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-3H4GE7RU.cjs → chunk-Z2SLP4FQ.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_3H4GE7RU_exports = {};
-__export(chunk_3H4GE7RU_exports, {
+var chunk_Z2SLP4FQ_exports = {};
+__export(chunk_Z2SLP4FQ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -130,7 +130,7 @@ __export(chunk_3H4GE7RU_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_3H4GE7RU_exports);
+module.exports = __toCommonJS(chunk_Z2SLP4FQ_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -19524,6 +19524,8 @@ function parseCode(view, lineTable) {
       case 20:
       case 54:
       case 47:
+      case 10:
+      case 11:
         return { op, offset, size: 1 };
       case 1:
       case 15:
@@ -19532,8 +19534,6 @@ function parseCode(view, lineTable) {
       case 43:
       case 46:
       case 53:
-      case 10:
-      case 11:
         return { op, arg: view.getUint8(current++), offset, size: 2 };
       case 25:
       case 35:
@@ -19656,10 +19656,18 @@ function opcodeSize(op) {
       unhandledType(op);
   }
 }
-function emitBytecode(bytecode, view, offset, linktable) {
+function emitBytecode(bytecode, view, offset, linktable, shift_hack) {
   view.setUint8(offset++, bytecode.op);
-  if (bytecode.arg == null)
+  if (bytecode.arg == null) {
+    if (shift_hack && (bytecode.op === 10 || bytecode.op === 11)) {
+      view.setUint8(
+        offset++,
+        0
+        /* nop */
+      );
+    }
     return offset;
+  }
   switch (bytecode.op) {
     case 1:
     case 15:
@@ -19668,8 +19676,6 @@ function emitBytecode(bytecode, view, offset, linktable) {
     case 43:
     case 46:
     case 53:
-    case 10:
-    case 11:
       view.setUint8(offset++, bytecode.arg);
       break;
     case 25:
@@ -22678,6 +22684,7 @@ var init_optimize2 = (0, import_chunk_ABYVSU2C.__esm)({
 function emitFunc(func, view, start, updateInfo, context) {
   cleanCfg2(func, context);
   groupBlocks(func);
+  const shift_hack = context.header.ciqVersion < 327680;
   const { liveInLocals } = getLocalsInfo(func);
   const liveLocalRanges = /* @__PURE__ */ new Map();
   const { localRanges, offsetMap } = updateInfo;
@@ -22772,7 +22779,7 @@ function emitFunc(func, view, start, updateInfo, context) {
         bytecode.arg = taken;
         bytecode.op = bytecode.op === 40 ? 41 : 40;
       }
-      offset = emitBytecode(bytecode, view, offset, linktable);
+      offset = emitBytecode(bytecode, view, offset, linktable, shift_hack);
     });
     if (block.next != null && block.next !== blocks[i + 1]?.offset) {
       const bc = {
@@ -22781,7 +22788,7 @@ function emitFunc(func, view, start, updateInfo, context) {
         offset: block.offset,
         size: 3
       };
-      offset = emitBytecode(bc, view, offset, linktable);
+      offset = emitBytecode(bc, view, offset, linktable, shift_hack);
     }
   });
   (0, import_node_assert13.default)(exceptionStack.length === 0);
@@ -28111,7 +28118,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1706308945548 < opt_time) {
+      if (source_time < opt_time && 1706315973765 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -28150,7 +28157,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.39",
+            optimizerVersion: "1.1.40",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

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

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

@@ -115,10 +115,10 @@ export interface Orv extends Argless {
 export interface Modv extends Argless {
     op: Opcodes.modv;
 }
-export interface Shlv extends ByteArg {
+export interface Shlv extends Argless {
     op: Opcodes.shlv;
 }
-export interface Shrv extends ByteArg {
+export interface Shrv extends Argless {
     op: Opcodes.shrv;
 }
 export interface Xorv extends Argless {
@@ -261,7 +261,7 @@ export interface Argc extends ByteArg {
 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 declare function parseCode(view: DataView, lineTable: Map<number, LineNumber>): Bytecode[];
 export declare function opcodeSize(op: Opcodes): 1 | 2 | 3 | 5 | 9;
-export declare function emitBytecode(bytecode: Bytecode, view: DataView, offset: number, linktable: Map<number, number>): number;
+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;
     push: number;

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_3H4GE7RU = require("./chunk-3H4GE7RU.cjs");
+var import_chunk_Z2SLP4FQ = require("./chunk-Z2SLP4FQ.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_3H4GE7RU.init_worker_task)();
+    (0, import_chunk_Z2SLP4FQ.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_3H4GE7RU.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_Z2SLP4FQ.performTask)(task));
       });
     }
   }

package/package.json

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