diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-11-03 14:58:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 14:58:35 -0700 |
| commit | 2b196f1ee90ef04c6434d0694945214d31550aa7 (patch) | |
| tree | 6fb5ece5409c2ced4301fabb4985ebe1a37449aa /src/binary-reader-objdump.cc | |
| parent | 4d9849ffbde861e10193cb15cce502eb49e1cb68 (diff) | |
| download | wabt-2b196f1ee90ef04c6434d0694945214d31550aa7.tar.gz wabt-2b196f1ee90ef04c6434d0694945214d31550aa7.tar.bz2 wabt-2b196f1ee90ef04c6434d0694945214d31550aa7.zip | |
[wasm-objdump] Improve support for displaying imports (#666)
Diffstat (limited to 'src/binary-reader-objdump.cc')
| -rw-r--r-- | src/binary-reader-objdump.cc | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc index 948e705a..9bacba58 100644 --- a/src/binary-reader-objdump.cc +++ b/src/binary-reader-objdump.cc @@ -753,11 +753,13 @@ Result BinaryReaderObjdump::OnImportTable(Index import_index, Index table_index, Type elem_type, const Limits* elem_limits) { - PrintDetails(" - " PRIstringview "." PRIstringview - " -> table elem_type=%s init=%" PRId64 " max=%" PRId64 "\n", + PrintDetails(" - table[%" PRIindex "] elem_type=%s init=%" PRId64 + " max=%" PRId64, + table_index, GetTypeName(elem_type), elem_limits->initial, + elem_limits->max); + PrintDetails(" <- " PRIstringview "." PRIstringview "\n", WABT_PRINTF_STRING_VIEW_ARG(module_name), - WABT_PRINTF_STRING_VIEW_ARG(field_name), GetTypeName(elem_type), - elem_limits->initial, elem_limits->max); + WABT_PRINTF_STRING_VIEW_ARG(field_name)); return Result::Ok; } @@ -766,7 +768,11 @@ Result BinaryReaderObjdump::OnImportMemory(Index import_index, string_view field_name, Index memory_index, const Limits* page_limits) { - PrintDetails(" - " PRIstringview "." PRIstringview " -> memory\n", + PrintDetails(" - memory[%" PRIindex "] pages: initial=%" PRId64, memory_index, + page_limits->initial); + if (page_limits->has_max) + PrintDetails(" max=%" PRId64, page_limits->max); + PrintDetails(" <- " PRIstringview "." PRIstringview "\n", WABT_PRINTF_STRING_VIEW_ARG(module_name), WABT_PRINTF_STRING_VIEW_ARG(field_name)); return Result::Ok; @@ -778,9 +784,9 @@ Result BinaryReaderObjdump::OnImportGlobal(Index import_index, Index global_index, Type type, bool mutable_) { - PrintDetails(" - global[%" PRIindex "] %s mutable=%d <- " PRIstringview - "." PRIstringview "\n", - global_index, GetTypeName(type), mutable_, + PrintDetails(" - global[%" PRIindex "] %s mutable=%d", global_index, + GetTypeName(type), mutable_); + PrintDetails(" <- " PRIstringview "." PRIstringview "\n", WABT_PRINTF_STRING_VIEW_ARG(module_name), WABT_PRINTF_STRING_VIEW_ARG(field_name)); return Result::Ok; |