From 5baecee28e617f351fb9bea788c522724bc5fd75 Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Tue, 11 Oct 2016 17:52:43 -0700 Subject: Refactor interpreter for linking support * Create WasmInterpreterEnvironment to hold all modules, functions, globals, tables and memories * There are now three index spaces: "module", "environment" and "defined". - The "module" index space matches up w/ the normal WebAssembly index space, which is distinct for functions, globals, tables, etc. - The "environment" index space is a combined index space for all loaded modules. - The "defined" index space only includes defined objects, not imported objects. This is used, for example, when iterating over the code section; the function bodies are only specified for defined functions. * A thread is implicitly associated with a module and environment, so simplify many function signatures to remove those additional arguments * Any importable kind can be imported from a host module. Unfortunately, since the spec tests require polymorphic imports, the importing mechanism must be callback-based * When interpreting spec tests, the environment and all modules must be retained throughout * Move the binding hash code out of wasm-ast.{c,h} => wasm-binding-hash.{c,h} * Add wasm_init_output_buffer, for initializing the environment's instruction stream independently from a WasmMemoryWriter * Add wasm_init_mem_writer_existing for initializing a WasmMemoryWriter given an existing WasmOutputBuffer * Add predefined "spectest" module, with a generic function import. Still need to implement the spectest table, memory and global imports --- src/wasm-binary-reader-interpreter.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/wasm-binary-reader-interpreter.h') diff --git a/src/wasm-binary-reader-interpreter.h b/src/wasm-binary-reader-interpreter.h index bd701b92..2cb26652 100644 --- a/src/wasm-binary-reader-interpreter.h +++ b/src/wasm-binary-reader-interpreter.h @@ -20,6 +20,7 @@ #include "wasm-common.h" struct WasmAllocator; +struct WasmInterpreterEnvironment; struct WasmInterpreterModule; struct WasmReadBinaryOptions; @@ -27,11 +28,12 @@ WASM_EXTERN_C_BEGIN WasmResult wasm_read_binary_interpreter( struct WasmAllocator* allocator, struct WasmAllocator* memory_allocator, + struct WasmInterpreterEnvironment* env, const void* data, size_t size, const struct WasmReadBinaryOptions* options, WasmBinaryErrorHandler*, - struct WasmInterpreterModule* out_module); + struct WasmInterpreterModule** out_module); WASM_EXTERN_C_END #endif /* WASM_BINARY_READER_INTERPRETER_H_ */ -- cgit v1.2.3