diff options
author | Ben Smith <binji@chromium.org> | 2016-10-11 17:52:43 -0700 |
---|---|---|
committer | Ben Smith <binji@chromium.org> | 2016-10-21 15:16:43 -0700 |
commit | 5baecee28e617f351fb9bea788c522724bc5fd75 (patch) | |
tree | a26edd3fc4f9b5c624ceaa8ce68d2387fec050e2 /src/wasm-binding-hash.h | |
parent | 7d8c366a9baddadfd655f1cd33748883cf11563c (diff) | |
download | wabt-5baecee28e617f351fb9bea788c522724bc5fd75.tar.gz wabt-5baecee28e617f351fb9bea788c522724bc5fd75.tar.bz2 wabt-5baecee28e617f351fb9bea788c522724bc5fd75.zip |
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
Diffstat (limited to 'src/wasm-binding-hash.h')
-rw-r--r-- | src/wasm-binding-hash.h | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/src/wasm-binding-hash.h b/src/wasm-binding-hash.h new file mode 100644 index 00000000..2897e44a --- /dev/null +++ b/src/wasm-binding-hash.h @@ -0,0 +1,54 @@ +/* + * Copyright 2016 WebAssembly Community Group participants + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WASM_BINDING_HASH_H_ +#define WASM_BINDING_HASH_H_ + +#include "wasm-common.h" +#include "wasm-vector.h" + +struct WasmAllocator; + +typedef struct WasmBinding { + WasmLocation loc; + WasmStringSlice name; + int index; +} WasmBinding; + +typedef struct WasmBindingHashEntry { + WasmBinding binding; + struct WasmBindingHashEntry* next; + struct WasmBindingHashEntry* prev; /* only valid when this entry is unused */ +} WasmBindingHashEntry; +WASM_DEFINE_VECTOR(binding_hash_entry, WasmBindingHashEntry); + +typedef struct WasmBindingHash { + WasmBindingHashEntryVector entries; + WasmBindingHashEntry* free_head; +} WasmBindingHash; + +WASM_EXTERN_C_BEGIN +WasmBinding* wasm_insert_binding(struct WasmAllocator*, + WasmBindingHash*, + const WasmStringSlice*); +WasmBool wasm_hash_entry_is_free(const WasmBindingHashEntry*); +/* returns -1 if the name is not in the hash */ +int wasm_find_binding_index_by_name(const WasmBindingHash*, + const WasmStringSlice* name); +void wasm_destroy_binding_hash(struct WasmAllocator*, WasmBindingHash*); +WASM_EXTERN_C_END + +#endif /* WASM_BINDING_HASH_H_ */ |