summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/binary-reader-objdump.cc42
-rw-r--r--src/binary-reader-objdump.h1
-rw-r--r--test/dump/callindirect.txt2
-rw-r--r--test/dump/extended-names.txt591
-rw-r--r--test/dump/no-canonicalize.txt2
-rw-r--r--test/dump/relocations-all-features.txt2
-rw-r--r--test/dump/relocations.txt2
-rw-r--r--test/dump/symbol-tables-all-features.txt2
-rw-r--r--test/dump/symbol-tables.txt2
9 files changed, 358 insertions, 288 deletions
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc
index adae0761..9c46f878 100644
--- a/src/binary-reader-objdump.cc
+++ b/src/binary-reader-objdump.cc
@@ -54,6 +54,7 @@ class BinaryReaderObjdumpBase : public BinaryReaderNop {
Result OnRelocCount(Index count, Index section_index) override;
protected:
+ std::string_view GetTypeName(Index index) const;
std::string_view GetFunctionName(Index index) const;
std::string_view GetGlobalName(Index index) const;
std::string_view GetLocalName(Index function_index, Index local_index) const;
@@ -141,6 +142,10 @@ Result BinaryReaderObjdumpBase::BeginModule(uint32_t version) {
return Result::Ok;
}
+std::string_view BinaryReaderObjdumpBase::GetTypeName(Index index) const {
+ return objdump_state_->type_names.Get(index);
+}
+
std::string_view BinaryReaderObjdumpBase::GetFunctionName(Index index) const {
return objdump_state_->function_names.Get(index);
}
@@ -276,6 +281,9 @@ class BinaryReaderObjdumpPrepass : public BinaryReaderObjdumpBase {
SetFunctionName(index, name);
break;
*/
+ case NameSectionSubsection::Type:
+ SetTypeName(index, name);
+ break;
case NameSectionSubsection::Global:
SetGlobalName(index, name);
break;
@@ -445,6 +453,7 @@ class BinaryReaderObjdumpPrepass : public BinaryReaderObjdumpBase {
}
protected:
+ void SetTypeName(Index index, std::string_view name);
void SetFunctionName(Index index, std::string_view name);
void SetGlobalName(Index index, std::string_view name);
void SetLocalName(Index function_index,
@@ -455,6 +464,11 @@ class BinaryReaderObjdumpPrepass : public BinaryReaderObjdumpBase {
void SetSegmentName(Index index, std::string_view name);
};
+void BinaryReaderObjdumpPrepass::SetTypeName(Index index,
+ std::string_view name) {
+ objdump_state_->type_names.Set(index, name);
+}
+
void BinaryReaderObjdumpPrepass::SetFunctionName(Index index,
std::string_view name) {
objdump_state_->function_names.Set(index, name);
@@ -517,6 +531,7 @@ class BinaryReaderObjdumpDisassemble : public BinaryReaderObjdumpBase {
Result OnOpcodeIndexIndex(Index value, Index value2) override;
Result OnOpcodeUint32(uint32_t value) override;
Result OnOpcodeUint32Uint32(uint32_t value, uint32_t value2) override;
+ Result OnCallIndirectExpr(uint32_t sig_indix, uint32_t table_index) override;
Result OnOpcodeUint32Uint32Uint32(uint32_t value,
uint32_t value2,
uint32_t value3) override;
@@ -543,6 +558,7 @@ class BinaryReaderObjdumpDisassemble : public BinaryReaderObjdumpBase {
Index current_function_index = 0;
Index local_index_ = 0;
bool in_function_body = false;
+ bool skip_next_opcode_ = false;
};
std::string BinaryReaderObjdumpDisassemble::BlockSigToString(Type type) const {
@@ -630,6 +646,10 @@ void BinaryReaderObjdumpDisassemble::LogOpcode(const char* fmt, ...) {
// so this should never be called for instructions outside of function bodies
// (i.e. init expresions).
assert(in_function_body);
+ if (skip_next_opcode_) {
+ skip_next_opcode_ = false;
+ return;
+ }
const Offset immediate_len = state->offset - current_opcode_offset;
const Offset opcode_size = current_opcode.GetLength();
const Offset total_size = opcode_size + immediate_len;
@@ -776,6 +796,28 @@ Result BinaryReaderObjdumpDisassemble::OnOpcodeUint32Uint32(uint32_t value,
return Result::Ok;
}
+Result BinaryReaderObjdumpDisassemble::OnCallIndirectExpr(
+ uint32_t sig_index,
+ uint32_t table_index) {
+ std::string_view table_name = GetTableName(table_index);
+ std::string_view type_name = GetTypeName(sig_index);
+ if (!type_name.empty() && !table_name.empty()) {
+ LogOpcode("%u <" PRIstringview "> (type %u <" PRIstringview ">)",
+ table_index, WABT_PRINTF_STRING_VIEW_ARG(table_name), sig_index,
+ WABT_PRINTF_STRING_VIEW_ARG(type_name));
+ } else if (!table_name.empty()) {
+ LogOpcode("%u <" PRIstringview "> (type %u)", table_index,
+ WABT_PRINTF_STRING_VIEW_ARG(table_name), sig_index);
+ } else if (!type_name.empty()) {
+ LogOpcode("%u (type %u <" PRIstringview ">)", table_index, sig_index,
+ WABT_PRINTF_STRING_VIEW_ARG(type_name));
+ } else {
+ LogOpcode("%u (type %u)", table_index, sig_index);
+ }
+ skip_next_opcode_ = true;
+ return Result::Ok;
+}
+
Result BinaryReaderObjdumpDisassemble::OnOpcodeUint32Uint32Uint32(
uint32_t value,
uint32_t value2,
diff --git a/src/binary-reader-objdump.h b/src/binary-reader-objdump.h
index 43f34a1e..3b859160 100644
--- a/src/binary-reader-objdump.h
+++ b/src/binary-reader-objdump.h
@@ -76,6 +76,7 @@ struct ObjdumpLocalNames {
struct ObjdumpState {
std::vector<Reloc> code_relocations;
std::vector<Reloc> data_relocations;
+ ObjdumpNames type_names;
ObjdumpNames function_names;
ObjdumpNames global_names;
ObjdumpNames section_names;
diff --git a/test/dump/callindirect.txt b/test/dump/callindirect.txt
index 1660f746..2b6503b9 100644
--- a/test/dump/callindirect.txt
+++ b/test/dump/callindirect.txt
@@ -75,6 +75,6 @@ Code Disassembly:
000027 func[0]:
000028: 41 00 | i32.const 0
00002a: 41 00 | i32.const 0
- 00002c: 11 00 00 | call_indirect 0 0
+ 00002c: 11 00 00 | call_indirect 0 (type 0)
00002f: 0b | end
;;; STDOUT ;;)
diff --git a/test/dump/extended-names.txt b/test/dump/extended-names.txt
index 9ec7db64..c3c78f62 100644
--- a/test/dump/extended-names.txt
+++ b/test/dump/extended-names.txt
@@ -2,8 +2,8 @@
;;; ARGS0: -v --debug-names --enable-all
;;; ARGS1: -x
(type $type1 (func (param i32)))
-(table $t1 1 funcref)
-(table $t2 1 funcref)
+(table $table1 1 funcref)
+(table $table2 1 funcref)
(memory $mem2 1 1)
(data $data1 "hello")
(tag $mytag1 (param i64))
@@ -13,6 +13,11 @@
throw $mytag2
data.drop 0
)
+(func
+ i32.const 0
+ i32.const 0
+ call_indirect $table1 (type $type1)
+)
;; A function with locals but no params
(func
(local $local1 i32)
@@ -78,258 +83,273 @@
; section "Function" (3)
0000016: 03 ; section code
0000017: 00 ; section size (guess)
-0000018: 03 ; num functions
+0000018: 04 ; num functions
0000019: 02 ; function 0 signature index
000001a: 02 ; function 1 signature index
000001b: 02 ; function 2 signature index
-0000017: 04 ; FIXUP section size
+000001c: 02 ; function 3 signature index
+0000017: 05 ; FIXUP section size
; section "Table" (4)
-000001c: 04 ; section code
-000001d: 00 ; section size (guess)
-000001e: 02 ; num tables
+000001d: 04 ; section code
+000001e: 00 ; section size (guess)
+000001f: 02 ; num tables
; table 0
-000001f: 70 ; funcref
-0000020: 00 ; limits: flags
-0000021: 01 ; limits: initial
+0000020: 70 ; funcref
+0000021: 00 ; limits: flags
+0000022: 01 ; limits: initial
; table 1
-0000022: 70 ; funcref
-0000023: 00 ; limits: flags
-0000024: 01 ; limits: initial
-000001d: 07 ; FIXUP section size
+0000023: 70 ; funcref
+0000024: 00 ; limits: flags
+0000025: 01 ; limits: initial
+000001e: 07 ; FIXUP section size
; section "Memory" (5)
-0000025: 05 ; section code
-0000026: 00 ; section size (guess)
-0000027: 01 ; num memories
+0000026: 05 ; section code
+0000027: 00 ; section size (guess)
+0000028: 01 ; num memories
; memory 0
-0000028: 01 ; limits: flags
-0000029: 01 ; limits: initial
-000002a: 01 ; limits: max
-0000026: 04 ; FIXUP section size
+0000029: 01 ; limits: flags
+000002a: 01 ; limits: initial
+000002b: 01 ; limits: max
+0000027: 04 ; FIXUP section size
; section "Tag" (13)
-000002b: 0d ; section code
-000002c: 00 ; section size (guess)
-000002d: 02 ; tag count
+000002c: 0d ; section code
+000002d: 00 ; section size (guess)
+000002e: 02 ; tag count
; tag 0
-000002e: 00 ; tag attribute
-000002f: 01 ; tag signature index
+000002f: 00 ; tag attribute
+0000030: 01 ; tag signature index
; tag 1
-0000030: 00 ; tag attribute
-0000031: 00 ; tag signature index
-000002c: 05 ; FIXUP section size
+0000031: 00 ; tag attribute
+0000032: 00 ; tag signature index
+000002d: 05 ; FIXUP section size
; section "Global" (6)
-0000032: 06 ; section code
-0000033: 00 ; section size (guess)
-0000034: 02 ; num globals
-0000035: 7f ; i32
-0000036: 01 ; global mutability
-0000037: 41 ; i32.const
-0000038: 01 ; i32 literal
-0000039: 0b ; end
-000003a: 7f ; i32
-000003b: 00 ; global mutability
-000003c: 41 ; i32.const
-000003d: 02 ; i32 literal
-000003e: 0b ; end
-0000033: 0b ; FIXUP section size
+0000033: 06 ; section code
+0000034: 00 ; section size (guess)
+0000035: 02 ; num globals
+0000036: 7f ; i32
+0000037: 01 ; global mutability
+0000038: 41 ; i32.const
+0000039: 01 ; i32 literal
+000003a: 0b ; end
+000003b: 7f ; i32
+000003c: 00 ; global mutability
+000003d: 41 ; i32.const
+000003e: 02 ; i32 literal
+000003f: 0b ; end
+0000034: 0b ; FIXUP section size
; section "Elem" (9)
-000003f: 09 ; section code
-0000040: 00 ; section size (guess)
-0000041: 01 ; num elem segments
+0000040: 09 ; section code
+0000041: 00 ; section size (guess)
+0000042: 01 ; num elem segments
; elem segment header 0
-0000042: 01 ; segment flags
-0000043: 00 ; elem list type
-0000044: 01 ; num elems
-0000045: 00 ; elem function index
-0000040: 05 ; FIXUP section size
+0000043: 01 ; segment flags
+0000044: 00 ; elem list type
+0000045: 01 ; num elems
+0000046: 00 ; elem function index
+0000041: 05 ; FIXUP section size
; section "DataCount" (12)
-0000046: 0c ; section code
-0000047: 00 ; section size (guess)
-0000048: 01 ; data count
-0000047: 01 ; FIXUP section size
+0000047: 0c ; section code
+0000048: 00 ; section size (guess)
+0000049: 01 ; data count
+0000048: 01 ; FIXUP section size
; section "Code" (10)
-0000049: 0a ; section code
-000004a: 00 ; section size (guess)
-000004b: 03 ; num functions
+000004a: 0a ; section code
+000004b: 00 ; section size (guess)
+000004c: 04 ; num functions
; function body 0
-000004c: 00 ; func body size (guess)
-000004d: 00 ; local decl count
-000004e: 41 ; i32.const
-000004f: 00 ; i32 literal
-0000050: 08 ; throw
-0000051: 01 ; throw tag
-0000052: fc ; prefix
-0000053: 09 ; data.drop
-0000054: 00 ; data.drop segment
-0000055: 0b ; end
-000004c: 09 ; FIXUP func body size
+000004d: 00 ; func body size (guess)
+000004e: 00 ; local decl count
+000004f: 41 ; i32.const
+0000050: 00 ; i32 literal
+0000051: 08 ; throw
+0000052: 01 ; throw tag
+0000053: fc ; prefix
+0000054: 09 ; data.drop
+0000055: 00 ; data.drop segment
+0000056: 0b ; end
+000004d: 09 ; FIXUP func body size
; function body 1
-0000056: 00 ; func body size (guess)
-0000057: 02 ; local decl count
-0000058: 01 ; local type count
-0000059: 7f ; i32
-000005a: 01 ; local type count
-000005b: 7e ; i64
-000005c: 41 ; i32.const
-000005d: 00 ; i32 literal
-000005e: 21 ; local.set
-000005f: 00 ; local index
-0000060: 20 ; local.get
-0000061: 00 ; local index
-0000062: 1a ; drop
-0000063: 42 ; i64.const
-0000064: 00 ; i64 literal
-0000065: 21 ; local.set
-0000066: 01 ; local index
-0000067: 20 ; local.get
-0000068: 01 ; local index
-0000069: 1a ; drop
-000006a: 0b ; end
-0000056: 14 ; FIXUP func body size
+0000057: 00 ; func body size (guess)
+0000058: 00 ; local decl count
+0000059: 41 ; i32.const
+000005a: 00 ; i32 literal
+000005b: 41 ; i32.const
+000005c: 00 ; i32 literal
+000005d: 11 ; call_indirect
+000005e: 00 ; signature index
+000005f: 00 ; table index
+0000060: 0b ; end
+0000057: 09 ; FIXUP func body size
; function body 2
-000006b: 00 ; func body size (guess)
-000006c: 04 ; local decl count
-000006d: 01 ; local type count
-000006e: 7f ; i32
-000006f: 01 ; local type count
-0000070: 7e ; i64
-0000071: 01 ; local type count
-0000072: 7f ; i32
-0000073: 01 ; local type count
-0000074: 7e ; i64
-0000075: 41 ; i32.const
-0000076: 00 ; i32 literal
-0000077: 21 ; local.set
-0000078: 00 ; local index
-0000079: 20 ; local.get
-000007a: 00 ; local index
-000007b: 1a ; drop
-000007c: 42 ; i64.const
-000007d: 00 ; i64 literal
-000007e: 21 ; local.set
-000007f: 01 ; local index
-0000080: 20 ; local.get
-0000081: 01 ; local index
-0000082: 1a ; drop
-0000083: 41 ; i32.const
-0000084: 00 ; i32 literal
-0000085: 21 ; local.set
-0000086: 02 ; local index
-0000087: 20 ; local.get
-0000088: 02 ; local index
-0000089: 1a ; drop
-000008a: 42 ; i64.const
-000008b: 00 ; i64 literal
-000008c: 21 ; local.set
-000008d: 03 ; local index
-000008e: 20 ; local.get
-000008f: 03 ; local index
-0000090: 1a ; drop
-0000091: 0b ; end
-000006b: 26 ; FIXUP func body size
-000004a: 47 ; FIXUP section size
+0000061: 00 ; func body size (guess)
+0000062: 02 ; local decl count
+0000063: 01 ; local type count
+0000064: 7f ; i32
+0000065: 01 ; local type count
+0000066: 7e ; i64
+0000067: 41 ; i32.const
+0000068: 00 ; i32 literal
+0000069: 21 ; local.set
+000006a: 00 ; local index
+000006b: 20 ; local.get
+000006c: 00 ; local index
+000006d: 1a ; drop
+000006e: 42 ; i64.const
+000006f: 00 ; i64 literal
+0000070: 21 ; local.set
+0000071: 01 ; local index
+0000072: 20 ; local.get
+0000073: 01 ; local index
+0000074: 1a ; drop
+0000075: 0b ; end
+0000061: 14 ; FIXUP func body size
+; function body 3
+0000076: 00 ; func body size (guess)
+0000077: 04 ; local decl count
+0000078: 01 ; local type count
+0000079: 7f ; i32
+000007a: 01 ; local type count
+000007b: 7e ; i64
+000007c: 01 ; local type count
+000007d: 7f ; i32
+000007e: 01 ; local type count
+000007f: 7e ; i64
+0000080: 41 ; i32.const
+0000081: 00 ; i32 literal
+0000082: 21 ; local.set
+0000083: 00 ; local index
+0000084: 20 ; local.get
+0000085: 00 ; local index
+0000086: 1a ; drop
+0000087: 42 ; i64.const
+0000088: 00 ; i64 literal
+0000089: 21 ; local.set
+000008a: 01 ; local index
+000008b: 20 ; local.get
+000008c: 01 ; local index
+000008d: 1a ; drop
+000008e: 41 ; i32.const
+000008f: 00 ; i32 literal
+0000090: 21 ; local.set
+0000091: 02 ; local index
+0000092: 20 ; local.get
+0000093: 02 ; local index
+0000094: 1a ; drop
+0000095: 42 ; i64.const
+0000096: 00 ; i64 literal
+0000097: 21 ; local.set
+0000098: 03 ; local index
+0000099: 20 ; local.get
+000009a: 03 ; local index
+000009b: 1a ; drop
+000009c: 0b ; end
+0000076: 26 ; FIXUP func body size
+000004b: 51 ; FIXUP section size
; section "Data" (11)
-0000092: 0b ; section code
-0000093: 00 ; section size (guess)
-0000094: 01 ; num data segments
+000009d: 0b ; section code
+000009e: 00 ; section size (guess)
+000009f: 01 ; num data segments
; data segment header 0
-0000095: 01 ; segment flags
-0000096: 05 ; data segment size
+00000a0: 01 ; segment flags
+00000a1: 05 ; data segment size
; data segment data 0
-0000097: 6865 6c6c 6f ; data segment data
-0000093: 08 ; FIXUP section size
+00000a2: 6865 6c6c 6f ; data segment data
+000009e: 08 ; FIXUP section size
; section "name"
-000009c: 00 ; section code
-000009d: 00 ; section size (guess)
-000009e: 04 ; string length
-000009f: 6e61 6d65 name ; custom section name
-00000a3: 02 ; local name type
-00000a4: 00 ; subsection size (guess)
-00000a5: 03 ; num functions
-00000a6: 00 ; function index
-00000a7: 00 ; num locals
-00000a8: 01 ; function index
-00000a9: 02 ; num locals
-00000aa: 00 ; local index
-00000ab: 06 ; string length
-00000ac: 6c6f 6361 6c31 local1 ; local name 0
-00000b2: 01 ; local index
-00000b3: 06 ; string length
-00000b4: 6c6f 6361 6c32 local2 ; local name 1
-00000ba: 02 ; function index
-00000bb: 04 ; num locals
-00000bc: 00 ; local index
-00000bd: 06 ; string length
-00000be: 7061 7261 6d31 param1 ; local name 0
-00000c4: 01 ; local index
-00000c5: 06 ; string length
-00000c6: 7061 7261 6d32 param2 ; local name 1
-00000cc: 02 ; local index
-00000cd: 06 ; string length
-00000ce: 6c6f 6361 6c31 local1 ; local name 2
-00000d4: 03 ; local index
-00000d5: 06 ; string length
-00000d6: 6c6f 6361 6c32 local2 ; local name 3
-00000a4: 37 ; FIXUP subsection size
-00000dc: 04 ; name subsection type
-00000dd: 00 ; subsection size (guess)
-00000de: 01 ; num names
-00000df: 00 ; elem index
-00000e0: 05 ; string length
-00000e1: 7479 7065 31 type1 ; elem name 0
-00000dd: 08 ; FIXUP subsection size
-00000e6: 05 ; name subsection type
-00000e7: 00 ; subsection size (guess)
-00000e8: 02 ; num names
-00000e9: 00 ; elem index
-00000ea: 02 ; string length
-00000eb: 7431 t1 ; elem name 0
-00000ed: 01 ; elem index
-00000ee: 02 ; string length
-00000ef: 7432 t2 ; elem name 1
-00000e7: 09 ; FIXUP subsection size
-00000f1: 06 ; name subsection type
-00000f2: 00 ; subsection size (guess)
-00000f3: 01 ; num names
-00000f4: 00 ; elem index
-00000f5: 04 ; string length
-00000f6: 6d65 6d32 mem2 ; elem name 0
-00000f2: 07 ; FIXUP subsection size
-00000fa: 07 ; name subsection type
-00000fb: 00 ; subsection size (guess)
-00000fc: 02 ; num names
-00000fd: 00 ; elem index
-00000fe: 02 ; string length
-00000ff: 6731 g1 ; elem name 0
-0000101: 01 ; elem index
-0000102: 02 ; string length
-0000103: 6732 g2 ; elem name 1
-00000fb: 09 ; FIXUP subsection size
-0000105: 08 ; name subsection type
-0000106: 00 ; subsection size (guess)
-0000107: 01 ; num names
-0000108: 00 ; elem index
-0000109: 05 ; string length
-000010a: 656c 656d 31 elem1 ; elem name 0
-0000106: 08 ; FIXUP subsection size
-000010f: 09 ; name subsection type
+00000a7: 00 ; section code
+00000a8: 00 ; section size (guess)
+00000a9: 04 ; string length
+00000aa: 6e61 6d65 name ; custom section name
+00000ae: 02 ; local name type
+00000af: 00 ; subsection size (guess)
+00000b0: 04 ; num functions
+00000b1: 00 ; function index
+00000b2: 00 ; num locals
+00000b3: 01 ; function index
+00000b4: 00 ; num locals
+00000b5: 02 ; function index
+00000b6: 02 ; num locals
+00000b7: 00 ; local index
+00000b8: 06 ; string length
+00000b9: 6c6f 6361 6c31 local1 ; local name 0
+00000bf: 01 ; local index
+00000c0: 06 ; string length
+00000c1: 6c6f 6361 6c32 local2 ; local name 1
+00000c7: 03 ; function index
+00000c8: 04 ; num locals
+00000c9: 00 ; local index
+00000ca: 06 ; string length
+00000cb: 7061 7261 6d31 param1 ; local name 0
+00000d1: 01 ; local index
+00000d2: 06 ; string length
+00000d3: 7061 7261 6d32 param2 ; local name 1
+00000d9: 02 ; local index
+00000da: 06 ; string length
+00000db: 6c6f 6361 6c31 local1 ; local name 2
+00000e1: 03 ; local index
+00000e2: 06 ; string length
+00000e3: 6c6f 6361 6c32 local2 ; local name 3
+00000af: 39 ; FIXUP subsection size
+00000e9: 04 ; name subsection type
+00000ea: 00 ; subsection size (guess)
+00000eb: 01 ; num names
+00000ec: 00 ; elem index
+00000ed: 05 ; string length
+00000ee: 7479 7065 31 type1 ; elem name 0
+00000ea: 08 ; FIXUP subsection size
+00000f3: 05 ; name subsection type
+00000f4: 00 ; subsection size (guess)
+00000f5: 02 ; num names
+00000f6: 00 ; elem index
+00000f7: 06 ; string length
+00000f8: 7461 626c 6531 table1 ; elem name 0
+00000fe: 01 ; elem index
+00000ff: 06 ; string length
+0000100: 7461 626c 6532 table2 ; elem name 1
+00000f4: 11 ; FIXUP subsection size
+0000106: 06 ; name subsection type
+0000107: 00 ; subsection size (guess)
+0000108: 01 ; num names
+0000109: 00 ; elem index
+000010a: 04 ; string length
+000010b: 6d65 6d32 mem2 ; elem name 0
+0000107: 07 ; FIXUP subsection size
+000010f: 07 ; name subsection type
0000110: 00 ; subsection size (guess)
-0000111: 01 ; num names
+0000111: 02 ; num names
0000112: 00 ; elem index
-0000113: 05 ; string length
-0000114: 6461 7461 31 data1 ; elem name 0
-0000110: 08 ; FIXUP subsection size
-0000119: 0a ; name subsection type
-000011a: 00 ; subsection size (guess)
-000011b: 02 ; num names
-000011c: 00 ; elem index
-000011d: 06 ; string length
-000011e: 6d79 7461 6731 mytag1 ; elem name 0
-0000124: 01 ; elem index
-0000125: 06 ; string length
-0000126: 6d79 7461 6732 mytag2 ; elem name 1
-000011a: 11 ; FIXUP subsection size
-; move data: [9e, 12c) -> [9f, 12d)
-000009d: 8e01 ; FIXUP section size
+0000113: 02 ; string length
+0000114: 6731 g1 ; elem name 0
+0000116: 01 ; elem index
+0000117: 02 ; string length
+0000118: 6732 g2 ; elem name 1
+0000110: 09 ; FIXUP subsection size
+000011a: 08 ; name subsection type
+000011b: 00 ; subsection size (guess)
+000011c: 01 ; num names
+000011d: 00 ; elem index
+000011e: 05 ; string length
+000011f: 656c 656d 31 elem1 ; elem name 0
+000011b: 08 ; FIXUP subsection size
+0000124: 09 ; name subsection type
+0000125: 00 ; subsection size (guess)
+0000126: 01 ; num names
+0000127: 00 ; elem index
+0000128: 05 ; string length
+0000129: 6461 7461 31 data1 ; elem name 0
+0000125: 08 ; FIXUP subsection size
+000012e: 0a ; name subsection type
+000012f: 00 ; subsection size (guess)
+0000130: 02 ; num names
+0000131: 00 ; elem index
+0000132: 06 ; string length
+0000133: 6d79 7461 6731 mytag1 ; elem name 0
+0000139: 01 ; elem index
+000013a: 06 ; string length
+000013b: 6d79 7461 6732 mytag2 ; elem name 1
+000012f: 11 ; FIXUP subsection size
+; move data: [a9, 141) -> [aa, 142)
+00000a8: 9801 ; FIXUP section size
;;; STDERR ;;)
(;; STDOUT ;;;
@@ -341,13 +361,14 @@ Type[3]:
- type[0] (i32) -> nil
- type[1] (i64) -> nil
- type[2] () -> nil
-Function[3]:
+Function[4]:
- func[0] sig=2
- func[1] sig=2
- func[2] sig=2
+ - func[3] sig=2
Table[2]:
- - table[0] type=funcref initial=1 <t1>
- - table[1] type=funcref initial=1 <t2>
+ - table[0] type=funcref initial=1 <table1>
+ - table[1] type=funcref initial=1 <table2>
Memory[1]:
- memory[0] pages: initial=1 max=1
Tag[2]:
@@ -361,24 +382,25 @@ Elem[1]:
- elem[0] = func[0]
DataCount:
- data count: 1
-Code[3]:
+Code[4]:
- func[0] size=9
- - func[1] size=20
- - func[2] size=38
+ - func[1] size=9
+ - func[2] size=20
+ - func[3] size=38
Data[1]:
- segment[0] <data1> passive size=5
- 0000000: 6865 6c6c 6f hello
Custom:
- name: "name"
- - func[1] local[0] <local1>
- - func[1] local[1] <local2>
- - func[2] local[0] <param1>
- - func[2] local[1] <param2>
- - func[2] local[2] <local1>
- - func[2] local[3] <local2>
+ - func[2] local[0] <local1>
+ - func[2] local[1] <local2>
+ - func[3] local[0] <param1>
+ - func[3] local[1] <param2>
+ - func[3] local[2] <local1>
+ - func[3] local[3] <local2>
- type[0] <type1>
- - table[0] <t1>
- - table[1] <t2>
+ - table[0] <table1>
+ - table[1] <table2>
- memory[0] <mem2>
- global[0] <g1>
- global[1] <g2>
@@ -389,43 +411,48 @@ Custom:
Code Disassembly:
-00004d func[0]:
- 00004e: 41 00 | i32.const 0
- 000050: 08 01 | throw 1 <mytag2>
- 000052: fc 09 00 | data.drop 0 <data1>
- 000055: 0b | end
-000057 func[1]:
- 000058: 01 7f | local[1] type=i32
- 00005a: 01 7e | local[2] type=i64
- 00005c: 41 00 | i32.const 0
- 00005e: 21 00 | local.set 0 <local1>
- 000060: 20 00 | local.get 0 <local1>
- 000062: 1a | drop
- 000063: 42 00 | i64.const 0
- 000065: 21 01 | local.set 1 <local2>
- 000067: 20 01 | local.get 1 <local2>
- 000069: 1a | drop
- 00006a: 0b | end
-00006c func[2]:
- 00006d: 01 7f | local[0] type=i32
- 00006f: 01 7e | local[1] type=i64
- 000071: 01 7f | local[2] type=i32
- 000073: 01 7e | local[3] type=i64
- 000075: 41 00 | i32.const 0
- 000077: 21 00 | local.set 0 <param1>
- 000079: 20 00 | local.get 0 <param1>
- 00007b: 1a | drop
- 00007c: 42 00 | i64.const 0
- 00007e: 21 01 | local.set 1 <param2>
- 000080: 20 01 | local.get 1 <param2>
- 000082: 1a | drop
- 000083: 41 00 | i32.const 0
- 000085: 21 02 | local.set 2 <local1>
- 000087: 20 02 | local.get 2 <local1>
- 000089: 1a | drop
- 00008a: 42 00 | i64.const 0
- 00008c: 21 03 | local.set 3 <local2>
- 00008e: 20 03 | local.get 3 <local2>
- 000090: 1a | drop
- 000091: 0b | end
+00004e func[0]:
+ 00004f: 41 00 | i32.const 0
+ 000051: 08 01 | throw 1 <mytag2>
+ 000053: fc 09 00 | data.drop 0 <data1>
+ 000056: 0b | end
+000058 func[1]:
+ 000059: 41 00 | i32.const 0
+ 00005b: 41 00 | i32.const 0
+ 00005d: 11 00 00 | call_indirect 0 <table1> (type 0 <type1>)
+ 000060: 0b | end
+000062 func[2]:
+ 000063: 01 7f | local[0] type=i32
+ 000065: 01 7e | local[1] type=i64
+ 000067: 41 00 | i32.const 0
+ 000069: 21 00 | local.set 0 <local1>
+ 00006b: 20 00 | local.get 0 <local1>
+ 00006d: 1a | drop
+ 00006e: 42 00 | i64.const 0
+ 000070: 21 01 | local.set 1 <local2>
+ 000072: 20 01 | local.get 1 <local2>
+ 000074: 1a | drop
+ 000075: 0b | end
+000077 func[3]:
+ 000078: 01 7f | local[0] type=i32
+ 00007a: 01 7e | local[1] type=i64
+ 00007c: 01 7f | local[2] type=i32
+ 00007e: 01 7e | local[3] type=i64
+ 000080: 41 00 | i32.const 0
+ 000082: 21 00 | local.set 0 <param1>
+ 000084: 20 00 | local.get 0 <param1>
+ 000086: 1a | drop
+ 000087: 42 00 | i64.const 0
+ 000089: 21 01 | local.set 1 <param2>
+ 00008b: 20 01 | local.get 1 <param2>
+ 00008d: 1a | drop
+ 00008e: 41 00 | i32.const 0
+ 000090: 21 02 | local.set 2 <local1>
+ 000092: 20 02 | local.get 2 <local1>
+ 000094: 1a | drop
+ 000095: 42 00 | i64.const 0
+ 000097: 21 03 | local.set 3 <local2>
+ 000099: 20 03 | local.get 3 <local2>
+ 00009b: 1a | drop
+ 00009c: 0b | end
;;; STDOUT ;;)
diff --git a/test/dump/no-canonicalize.txt b/test/dump/no-canonicalize.txt
index de3196ec..138cff66 100644
--- a/test/dump/no-canonicalize.txt
+++ b/test/dump/no-canonicalize.txt
@@ -156,7 +156,7 @@ Code Disassembly:
000076 func[1] <f1>:
000077: 20 00 | local.get 0
000079: 20 01 | local.get 1
- 00007b: 11 00 00 | call_indirect 0 0
+ 00007b: 11 00 00 | call_indirect 0 (type 0)
00007e: 1a | drop
00007f: 0b | end
000085 func[2]:
diff --git a/test/dump/relocations-all-features.txt b/test/dump/relocations-all-features.txt
index e6a0f9b5..d85c6215 100644
--- a/test/dump/relocations-all-features.txt
+++ b/test/dump/relocations-all-features.txt
@@ -82,7 +82,7 @@ Code Disassembly:
000070: R_WASM_FUNCTION_INDEX_LEB 0 <__extern.foo>
000075: 41 d2 09 | i32.const 1234
000078: 41 00 | i32.const 0
- 00007a: 11 82 80 80 80 00 80 80 80 | call_indirect 2 0
+ 00007a: 11 82 80 80 80 00 80 80 80 | call_indirect 0 (type 2)
000083: 80 00 |
00007b: R_WASM_TYPE_INDEX_LEB 2
000085: 0b | end
diff --git a/test/dump/relocations.txt b/test/dump/relocations.txt
index 58679803..cb3570b6 100644
--- a/test/dump/relocations.txt
+++ b/test/dump/relocations.txt
@@ -82,7 +82,7 @@ Code Disassembly:
000070: R_WASM_FUNCTION_INDEX_LEB 0 <__extern.foo>
000075: 41 d2 09 | i32.const 1234
000078: 41 00 | i32.const 0
- 00007a: 11 82 80 80 80 00 80 80 80 | call_indirect 2 0
+ 00007a: 11 82 80 80 80 00 80 80 80 | call_indirect 0 (type 2)
000083: 80 00 |
00007b: R_WASM_TYPE_INDEX_LEB 2
000085: 0b | end
diff --git a/test/dump/symbol-tables-all-features.txt b/test/dump/symbol-tables-all-features.txt
index 96473f99..5aaa07bf 100644
--- a/test/dump/symbol-tables-all-features.txt
+++ b/test/dump/symbol-tables-all-features.txt
@@ -64,7 +64,7 @@ Code Disassembly:
000040: 0b | end
000042 func[3] <b>:
000043: 41 00 | i32.const 0
- 000045: 11 80 80 80 80 00 80 80 80 | call_indirect 0 0
+ 000045: 11 80 80 80 80 00 80 80 80 | call_indirect 0 <t> (type 0)
00004e: 80 00 |
000046: R_WASM_TYPE_INDEX_LEB 0
000050: 10 80 80 80 80 00 | call 0 <env.b>
diff --git a/test/dump/symbol-tables.txt b/test/dump/symbol-tables.txt
index 127ad61d..04a2085d 100644
--- a/test/dump/symbol-tables.txt
+++ b/test/dump/symbol-tables.txt
@@ -67,7 +67,7 @@ Code Disassembly:
000050: 0b | end
000052 func[3] <b>:
000053: 41 00 | i32.const 0
- 000055: 11 80 80 80 80 00 80 80 80 | call_indirect 0 0
+ 000055: 11 80 80 80 80 00 80 80 80 | call_indirect 0 <env.timport> (type 0)
00005e: 80 00 |
000056: R_WASM_TYPE_INDEX_LEB 0
000060: 10 80 80 80 80 00 | call 0 <env.b>
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-05 23:42:56 +0000