objdiff-wasm 3.0.0-beta.9 → 3.0.0

package/dist/config-schema.json

@@ -25,6 +25,20 @@
         }
       ]
     },
+    {
+      "id": "analyzeDataFlow",
+      "type": "boolean",
+      "default": false,
+      "name": "(Experimental) Perform data flow analysis",
+      "description": "Use data flow analysis to display known information about register contents where possible"
+    },
+    {
+      "id": "showDataFlow",
+      "type": "boolean",
+      "default": true,
+      "name": "Show data flow",
+      "description": "Show data flow analysis results in place of register name where present"
+    },
     {
       "id": "spaceBetweenArgs",
       "type": "boolean",
@@ -264,7 +278,8 @@
       "id": "ppc",
       "name": "PowerPC",
       "properties": [
-        "ppc.calculatePoolRelocations"
+        "ppc.calculatePoolRelocations",
+        "analyzeDataFlow"
       ]
     },
     {

package/dist/interfaces/objdiff-core-display.d.ts

@@ -146,7 +146,7 @@ export interface DiffTextSpacing {
 export interface DiffTextEol {
   tag: 'eol',
 }
-export type DiffTextColor = DiffTextColorNormal | DiffTextColorDim | DiffTextColorBright | DiffTextColorReplace | DiffTextColorDelete | DiffTextColorInsert | DiffTextColorRotating;
+export type DiffTextColor = DiffTextColorNormal | DiffTextColorDim | DiffTextColorBright | DiffTextColorReplace | DiffTextColorDataFlow | DiffTextColorDelete | DiffTextColorInsert | DiffTextColorRotating;
 export interface DiffTextColorNormal {
   tag: 'normal',
 }
@@ -159,6 +159,9 @@ export interface DiffTextColorBright {
 export interface DiffTextColorReplace {
   tag: 'replace',
 }
+export interface DiffTextColorDataFlow {
+  tag: 'data-flow',
+}
 export interface DiffTextColorDelete {
   tag: 'delete',
 }

package/dist/objdiff.js

@@ -125,7 +125,7 @@ const handleTable0 = [
 ];
 const finalizationRegistry0 = finalizationRegistryCreate((handle)=>{
     const { rep } = rscTableRemove(handleTable0, handle);
-    exports0['3'](rep);
+    exports0['1'](rep);
 });
 handleTables[0] = handleTable0;
 const trampoline0 = rscTableCreateOwn.bind(null, handleTable0);
@@ -145,7 +145,7 @@ const handleTable2 = [
 ];
 const finalizationRegistry2 = finalizationRegistryCreate((handle)=>{
     const { rep } = rscTableRemove(handleTable2, handle);
-    exports0['1'](rep);
+    exports0['3'](rep);
 });
 handleTables[2] = handleTable2;
 const trampoline2 = rscTableCreateOwn.bind(null, handleTable2);
@@ -198,15 +198,15 @@ class DiffConfig {
             writable: true,
             value: handle1
         });
-        finalizationRegistry2.register(rsc0, handle1, rsc0);
+        finalizationRegistry1.register(rsc0, handle1, rsc0);
         Object.defineProperty(rsc0, symbolDispose, {
             writable: true,
             value: function() {
-                finalizationRegistry2.unregister(rsc0);
-                rscTableRemove(handleTable2, handle1);
+                finalizationRegistry1.unregister(rsc0);
+                rscTableRemove(handleTable1, handle1);
                 rsc0[symbolDispose] = emptyFunc;
                 rsc0[symbolRscHandle] = void 0;
-                exports0['1'](handleTable2[(handle1 << 1) + 1] & ~T_FLAG);
+                exports0['2'](handleTable1[(handle1 << 1) + 1] & ~T_FLAG);
             }
         });
         return rsc0;
@@ -215,8 +215,8 @@ class DiffConfig {
 let diffMethodDiffConfigSetProperty;
 DiffConfig.prototype.setProperty = function(arg1, arg2) {
     var handle1 = this[symbolRscHandle];
-    if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
+    if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
     var ptr2 = utf8Encode(arg1, realloc0, memory0);
     var len2 = utf8EncodedLen;
     var ptr3 = utf8Encode(arg2, realloc0, memory0);
@@ -250,8 +250,8 @@ DiffConfig.prototype.setProperty = function(arg1, arg2) {
 let diffMethodDiffConfigGetProperty;
 DiffConfig.prototype.getProperty = function(arg1) {
     var handle1 = this[symbolRscHandle];
-    if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
+    if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
     var ptr2 = utf8Encode(arg1, realloc0, memory0);
     var len2 = utf8EncodedLen;
     const ret = diffMethodDiffConfigGetProperty(handle0, ptr2, len2);
@@ -296,8 +296,8 @@ Object$1.parse = function(arg0, arg1) {
     var src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, +len0);
     new Uint8Array(memory0.buffer, ptr0, +len0).set(src0);
     var handle2 = arg1[symbolRscHandle];
-    if (!handle2 || (handleTable2[(handle2 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle1 = handleTable2[(handle2 << 1) + 1] & ~T_FLAG;
+    if (!handle2 || (handleTable1[(handle2 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle1 = handleTable1[(handle2 << 1) + 1] & ~T_FLAG;
     const ret = diffStaticObjectParse(ptr0, len0, handle1);
     let variant6;
     switch(dataView(memory0).getUint8(ret + 0, true)){
@@ -308,15 +308,15 @@ Object$1.parse = function(arg0, arg1) {
                 writable: true,
                 value: handle4
             });
-            finalizationRegistry1.register(rsc3, handle4, rsc3);
+            finalizationRegistry2.register(rsc3, handle4, rsc3);
             Object.defineProperty(rsc3, symbolDispose, {
                 writable: true,
                 value: function() {
-                    finalizationRegistry1.unregister(rsc3);
-                    rscTableRemove(handleTable1, handle4);
+                    finalizationRegistry2.unregister(rsc3);
+                    rscTableRemove(handleTable2, handle4);
                     rsc3[symbolDispose] = emptyFunc;
                     rsc3[symbolRscHandle] = void 0;
-                    exports0['2'](handleTable1[(handle4 << 1) + 1] & ~T_FLAG);
+                    exports0['3'](handleTable2[(handle4 << 1) + 1] & ~T_FLAG);
                 }
             });
             variant6 = {
@@ -344,8 +344,8 @@ Object$1.parse = function(arg0, arg1) {
 let diffMethodObjectHash;
 Object$1.prototype.hash = function() {
     var handle1 = this[symbolRscHandle];
-    if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
-    var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
+    if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
+    var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
     const ret = diffMethodObjectHash(handle0);
     return BigInt.asUintN(64, ret);
 };
@@ -637,8 +637,8 @@ function runDiff(arg0, arg1, arg2, arg3) {
     } else {
         const e = variant2;
         var handle1 = e[symbolRscHandle];
-        if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
-        var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
+        if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
+        var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
         variant2_0 = 1;
         variant2_1 = handle0;
     }
@@ -651,14 +651,14 @@ function runDiff(arg0, arg1, arg2, arg3) {
     } else {
         const e = variant5;
         var handle4 = e[symbolRscHandle];
-        if (!handle4 || (handleTable1[(handle4 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
-        var handle3 = handleTable1[(handle4 << 1) + 1] & ~T_FLAG;
+        if (!handle4 || (handleTable2[(handle4 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
+        var handle3 = handleTable2[(handle4 << 1) + 1] & ~T_FLAG;
         variant5_0 = 1;
         variant5_1 = handle3;
     }
     var handle7 = arg2[symbolRscHandle];
-    if (!handle7 || (handleTable2[(handle7 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle6 = handleTable2[(handle7 << 1) + 1] & ~T_FLAG;
+    if (!handle7 || (handleTable1[(handle7 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle6 = handleTable1[(handle7 << 1) + 1] & ~T_FLAG;
     var { mappings: v8_0, selectingLeft: v8_1, selectingRight: v8_2 } = arg3;
     var vec12 = v8_0;
     var len12 = vec12.length;
@@ -733,7 +733,7 @@ function runDiff(arg0, arg1, arg2, arg3) {
                                 rscTableRemove(handleTable0, handle18);
                                 rsc17[symbolDispose] = emptyFunc;
                                 rsc17[symbolRscHandle] = void 0;
-                                exports0['3'](handleTable0[(handle18 << 1) + 1] & ~T_FLAG);
+                                exports0['1'](handleTable0[(handle18 << 1) + 1] & ~T_FLAG);
                             }
                         });
                         variant19 = rsc17;
@@ -761,7 +761,7 @@ function runDiff(arg0, arg1, arg2, arg3) {
                                 rscTableRemove(handleTable0, handle21);
                                 rsc20[symbolDispose] = emptyFunc;
                                 rsc20[symbolRscHandle] = void 0;
-                                exports0['3'](handleTable0[(handle21 << 1) + 1] & ~T_FLAG);
+                                exports0['1'](handleTable0[(handle21 << 1) + 1] & ~T_FLAG);
                             }
                         });
                         variant22 = rsc20;
@@ -1029,8 +1029,8 @@ function displayInstructionRow(arg0, arg1, arg2, arg3) {
     if (!handle1 || (handleTable0[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "ObjectDiff" resource.');
     var handle0 = handleTable0[(handle1 << 1) + 1] & ~T_FLAG;
     var handle3 = arg3[symbolRscHandle];
-    if (!handle3 || (handleTable2[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle2 = handleTable2[(handle3 << 1) + 1] & ~T_FLAG;
+    if (!handle3 || (handleTable1[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle2 = handleTable1[(handle3 << 1) + 1] & ~T_FLAG;
     const ret = displayDisplayInstructionRow(handle0, toUint32(arg1), toUint32(arg2), handle2);
     var len12 = dataView(memory0).getInt32(ret + 4, true);
     var base12 = dataView(memory0).getInt32(ret + 0, true);
@@ -1171,15 +1171,20 @@ function displayInstructionRow(arg0, arg1, arg2, arg3) {
                 break;
             case 4:
                 variant11 = {
-                    tag: 'delete'
+                    tag: 'data-flow'
                 };
                 break;
             case 5:
                 variant11 = {
-                    tag: 'insert'
+                    tag: 'delete'
                 };
                 break;
             case 6:
+                variant11 = {
+                    tag: 'insert'
+                };
+                break;
+            case 7:
                 variant11 = {
                     tag: 'rotating',
                     val: clampGuest(dataView(memory0).getUint8(base + 33, true), 0, 255)
@@ -1376,8 +1381,8 @@ function instructionContext(arg0, arg1, arg2, arg3) {
     if (!handle1 || (handleTable0[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "ObjectDiff" resource.');
     var handle0 = handleTable0[(handle1 << 1) + 1] & ~T_FLAG;
     var handle3 = arg3[symbolRscHandle];
-    if (!handle3 || (handleTable2[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle2 = handleTable2[(handle3 << 1) + 1] & ~T_FLAG;
+    if (!handle3 || (handleTable1[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle2 = handleTable1[(handle3 << 1) + 1] & ~T_FLAG;
     const ret = displayInstructionContext(handle0, toUint32(arg1), toUint32(arg2), handle2);
     var len10 = dataView(memory0).getInt32(ret + 4, true);
     var base10 = dataView(memory0).getInt32(ret + 0, true);
@@ -1460,8 +1465,8 @@ function instructionHover(arg0, arg1, arg2, arg3) {
     if (!handle1 || (handleTable0[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "ObjectDiff" resource.');
     var handle0 = handleTable0[(handle1 << 1) + 1] & ~T_FLAG;
     var handle3 = arg3[symbolRscHandle];
-    if (!handle3 || (handleTable2[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle2 = handleTable2[(handle3 << 1) + 1] & ~T_FLAG;
+    if (!handle3 || (handleTable1[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle2 = handleTable1[(handle3 << 1) + 1] & ~T_FLAG;
     const ret = displayInstructionHover(handle0, toUint32(arg1), toUint32(arg2), handle2);
     var len8 = dataView(memory0).getInt32(ret + 4, true);
     var base8 = dataView(memory0).getInt32(ret + 0, true);
@@ -1525,13 +1530,13 @@ function instructionHover(arg0, arg1, arg2, arg3) {
 const $init = (()=>{
     let gen = function*() {
         const module0 = fetchCompile(new URL('./objdiff.core.wasm', import.meta.url));
-        const module1 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwADBQQBAAAABAUBcAEEBAccBQEwAAABMQABATIAAgEzAAMIJGltcG9ydHMBAAoxBBEAIAAgASACIAMgBEEAEQEACwkAIABBAREAAAsJACAAQQIRAAALCQAgAEEDEQAACwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjI5LjA');
-        const module2 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwACJAUAATAAAQABMQAAAAEyAAAAATMAAAAIJGltcG9ydHMBcAEEBAkKAQBBAAsEAAECAwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjI5LjA');
+        const module1 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwADBQQBAAAABAUBcAEEBAccBQEwAAABMQABATIAAgEzAAMIJGltcG9ydHMBAAoxBBEAIAAgASACIAMgBEEAEQEACwkAIABBAREAAAsJACAAQQIRAAALCQAgAEEDEQAACwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjM0LjA');
+        const module2 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwACJAUAATAAAQABMQAAAAEyAAAAATMAAAAIJGltcG9ydHMBcAEEBAkKAQBBAAsEAAECAwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjM0LjA');
         ({ exports: exports0 } = yield instantiateCore((yield module1)));
         ({ exports: exports1 } = yield instantiateCore((yield module0), {
             '[export]objdiff:core/diff': {
-                '[resource-new]diff-config': trampoline2,
-                '[resource-new]object': trampoline1,
+                '[resource-new]diff-config': trampoline1,
+                '[resource-new]object': trampoline2,
                 '[resource-new]object-diff': trampoline0
             },
             'wasi:logging/logging@0.1.0-draft': {
@@ -1543,9 +1548,9 @@ const $init = (()=>{
             '': {
                 $imports: exports0.$imports,
                 0: trampoline3,
-                1: exports1['objdiff:core/diff#[dtor]diff-config'],
-                2: exports1['objdiff:core/diff#[dtor]object'],
-                3: exports1['objdiff:core/diff#[dtor]object-diff']
+                1: exports1['objdiff:core/diff#[dtor]object-diff'],
+                2: exports1['objdiff:core/diff#[dtor]diff-config'],
+                3: exports1['objdiff:core/diff#[dtor]object']
             }
         }));
         postReturn0 = exports1.cabi_post_version;
@@ -1556,7 +1561,7 @@ const $init = (()=>{
         postReturn4 = exports1['cabi_post_objdiff:core/display#display-sections'];
         postReturn5 = exports1['cabi_post_objdiff:core/display#display-symbol'];
         postReturn6 = exports1['cabi_post_objdiff:core/display#display-instruction-row'];
-        postReturn7 = exports1['cabi_post_objdiff:core/display#symbol-context'];
+        postReturn7 = exports1['cabi_post_objdiff:core/display#instruction-context'];
         postReturn8 = exports1['cabi_post_objdiff:core/display#instruction-hover'];
         exports1Init = exports1.init;
         exports1Version = exports1.version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objdiff-wasm",
-  "version": "3.0.0-beta.9",
+  "version": "3.0.0",
   "description": "A local diffing tool for decompilation projects.",
   "author": {
     "name": "Luke Street",