diff options
| author | Ben Smith <binjimin@gmail.com> | 2017-01-19 17:01:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 17:01:36 -0800 |
| commit | aa49b05e65ebff47fb89c100f2e4e48f080c48a9 (patch) | |
| tree | a20a029cead1c250c6bcc0a0f3214518960527e5 /src/binary-reader-objdump.c | |
| parent | 149b47d0928583bec6aa2abb2272dbde594964c0 (diff) | |
| download | wabt-aa49b05e65ebff47fb89c100f2e4e48f080c48a9.tar.gz wabt-aa49b05e65ebff47fb89c100f2e4e48f080c48a9.tar.bz2 wabt-aa49b05e65ebff47fb89c100f2e4e48f080c48a9.zip | |
Pass import_index to binary reader import callbacks (#283)
It was being passed before as "index", which is confusing because the
other callbacks have recently been changed to pass the
func/global/memory/table index instead.
Diffstat (limited to 'src/binary-reader-objdump.c')
| -rw-r--r-- | src/binary-reader-objdump.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/binary-reader-objdump.c b/src/binary-reader-objdump.c index af516058..0c67e39b 100644 --- a/src/binary-reader-objdump.c +++ b/src/binary-reader-objdump.c @@ -393,19 +393,21 @@ static WasmResult on_import(uint32_t index, return WASM_OK; } -static WasmResult on_import_func(uint32_t index, +static WasmResult on_import_func(uint32_t import_index, + uint32_t func_index, uint32_t sig_index, void* user_data) { Context* ctx = user_data; print_details(user_data, " - func[%d] sig=%d <- " PRIstringslice "." PRIstringslice "\n", - index, sig_index, + func_index, sig_index, WASM_PRINTF_STRING_SLICE_ARG(ctx->import_module_name), WASM_PRINTF_STRING_SLICE_ARG(ctx->import_field_name)); return WASM_OK; } -static WasmResult on_import_table(uint32_t index, +static WasmResult on_import_table(uint32_t import_index, + uint32_t table_index, WasmType elem_type, const WasmLimits* elem_limits, void* user_data) { @@ -419,7 +421,8 @@ static WasmResult on_import_table(uint32_t index, return WASM_OK; } -static WasmResult on_import_memory(uint32_t index, +static WasmResult on_import_memory(uint32_t import_index, + uint32_t memory_index, const WasmLimits* page_limits, void* user_data) { Context* ctx = user_data; @@ -430,14 +433,15 @@ static WasmResult on_import_memory(uint32_t index, return WASM_OK; } -static WasmResult on_import_global(uint32_t index, +static WasmResult on_import_global(uint32_t import_index, + uint32_t global_index, WasmType type, WasmBool mutable_, void* user_data) { Context* ctx = user_data; print_details(user_data, " - global[%d] %s mutable=%d <- " PRIstringslice "." PRIstringslice "\n", - index, wasm_get_type_name(type), mutable_, + global_index, wasm_get_type_name(type), mutable_, WASM_PRINTF_STRING_SLICE_ARG(ctx->import_module_name), WASM_PRINTF_STRING_SLICE_ARG(ctx->import_field_name)); return WASM_OK; |