update wasabi and adjust to the api change

sola-st · Nov 27, 2023 · b6a77c7 · b6a77c7
1 parent 5dd0051
commit b6a77c7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/benchmark.cts b/src/benchmark.cts
@@ -72,7 +72,7 @@ export default class Benchmark {
 
     instrumentBinaries(): WasabiRuntime[] {
         return this.record.map((r, i) => {
-            const { instrumented, js } = instrument_wasm({ original: r.binary })
+            const { instrumented, js } = instrument_wasm(r.binary)
             this.record[i].binary = instrumented
             return js
         })
@@ -85,4 +85,4 @@ export default class Benchmark {
     getPerformance() {
         return this.performanceTrace
     }
-}
+}
diff --git a/src/runtime.js b/src/runtime.js
@@ -64,7 +64,7 @@ function setup() {
         printWelcome()
         self.originalWasmBuffer.push(Array.from(new Uint8Array(buffer)))
         const p_instrumenting = performanceEvent(`instrumentation of wasm binary ${this_i}`)
-        const { instrumented, js } = instrument_wasm({ original: new Uint8Array(buffer) });
+        const { instrumented, js } = instrument_wasm(new Uint8Array(buffer));
         self.performanceList.push(p_instrumenting.stop())
         wasabis.push(eval(js + '\nWasabi'))
         buffer = new Uint8Array(instrumented)
@@ -86,4 +86,4 @@ function setup() {
         return WebAssembly.instantiate(body, obj);
     }
 }
-setup()
+setup()
diff --git a/tests/run-tests.cts b/tests/run-tests.cts
@@ -67,7 +67,7 @@ async function runNodeTest(name: string): Promise<TestReport> {
   // const wabtModule = await wabt()
   // const binary = wabtModule.parseWat(watPath, wat).toBinary({})
   const binary = await fs.readFile(wasmPath)
-  let { instrumented, js } = instrument_wasm({ original: binary })
+  let { instrumented, js } = instrument_wasm(binary)
   await fs.writeFile(wasmPath, Buffer.from(instrumented))
 
   // 2. Execute test and generate trace

diff --git a/wasabi b/wasabi
+64 −50		crates/wasabi/src/instrument/add_hooks/mod.rs
+11 −0		crates/wasabi/src/instrument/add_hooks/static_info.rs
+41 −6		crates/wasabi/src/instrument/add_hooks/type_stack.rs
+5 −1		crates/wasabi/src/options.rs
+6 −0		crates/wasabi_js/README.md
+2 −2		crates/wasabi_js/example/index.html
+15 −17		crates/wasabi_js/example/wasabi.test.js
+8 −0		crates/wasabi_js/package-lock.json
+8 −4		crates/wasabi_js/package.json
+25 −0		crates/wasabi_js/src/js/instrument.js
+3 −8		crates/wasabi_js/src/lib.rs
+26 −6		crates/wasabi_wasm/src/ast.rs
+9 −20		crates/wasabi_wasm/src/parse.rs