diff options
| author | Rod Vagg <rod@vagg.org> | 2024-01-04 17:11:25 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 22:11:25 -0800 |
| commit | 118fb9b274dd11f7a896412046f9e599e1a58681 (patch) | |
| tree | 03dc63f0e79d27cc8bd444e07a744aa385ada1ef | |
| parent | b85ecbec261ff7e84351505da3b2c45d9ea8d3c7 (diff) | |
| download | wabt-118fb9b274dd11f7a896412046f9e599e1a58681.tar.gz wabt-118fb9b274dd11f7a896412046f9e599e1a58681.tar.bz2 wabt-118fb9b274dd11f7a896412046f9e599e1a58681.zip | |
Handle zero local count in disassembly (#2359)
Previously: local[0..4294967295]
Current: local[]
| -rw-r--r-- | src/binary-reader-objdump.cc | 12 | ||||
| -rw-r--r-- | test/binary/function-local-count-zero.txt | 27 |
2 files changed, 34 insertions, 5 deletions
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc index b1335f68..488ff1d2 100644 --- a/src/binary-reader-objdump.cc +++ b/src/binary-reader-objdump.cc @@ -635,13 +635,15 @@ Result BinaryReaderObjdumpDisassemble::OnLocalDecl(Index decl_index, for (size_t i = data_size; i < IMMEDIATE_OCTET_COUNT; i++) { printf(" "); } - printf(" | local[%" PRIindex, local_index_); + printf(" | local["); + if (count > 0) { + printf("%" PRIindex, local_index_); - if (count != 1) { - printf("..%" PRIindex "", local_index_ + count - 1); + if (count != 1) { + printf("..%" PRIindex "", local_index_ + count - 1); + } + local_index_ += count; } - local_index_ += count; - printf("] type=%s\n", type.GetName().c_str()); last_opcode_end = current_opcode_offset + data_size; diff --git a/test/binary/function-local-count-zero.txt b/test/binary/function-local-count-zero.txt index f70a50f6..e3571131 100644 --- a/test/binary/function-local-count-zero.txt +++ b/test/binary/function-local-count-zero.txt @@ -1,4 +1,6 @@ ;;; TOOL: run-gen-wasm +;;; TOOL: run-objdump-gen-wasm +;;; ARGS: -x magic version section(TYPE) { count[1] function params[0] results[0] } @@ -23,4 +25,29 @@ section(CODE) { (func (;0;) (type 0)) (func (;1;) (type 0) (local i64 f64 f64))) + +function-local-count-zero.wasm: file format wasm 0x1 + +Section Details: + +Type[1]: + - type[0] () -> nil +Function[2]: + - func[0] sig=0 + - func[1] sig=0 +Code[2]: + - func[0] size=4 + - func[1] size=10 + +Code Disassembly: + +000017 func[0]: + 000018: 00 7f | local[] type=i32 + 00001a: 0b | end +00001c func[1]: + 00001d: 01 7e | local[0] type=i64 + 00001f: 00 7f | local[] type=i32 + 000021: 02 7c | local[1..2] type=f64 + 000023: 00 7d | local[] type=f32 + 000025: 0b | end ;;; STDOUT ;;) |