summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/binary-reader-objdump.cc6
-rw-r--r--src/binary-reader.cc6
-rw-r--r--src/binary-writer.cc6
-rw-r--r--src/common.cc15
-rw-r--r--src/common.h16
-rw-r--r--test/dump/relocations.txt6
-rw-r--r--test/link/export.txt8
-rw-r--r--test/link/function_calls.txt20
-rw-r--r--test/link/function_calls_incremental.txt24
-rw-r--r--test/link/globals.txt28
-rw-r--r--test/link/incremental.txt38
-rw-r--r--test/link/interp.txt8
-rw-r--r--test/link/large_code_section.txt4
-rw-r--r--test/link/names.txt12
-rw-r--r--test/link/table.txt14
15 files changed, 104 insertions, 107 deletions
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc
index 0b5cb5a4..836bf7fa 100644
--- a/src/binary-reader-objdump.cc
+++ b/src/binary-reader-objdump.cc
@@ -129,9 +129,9 @@ void BinaryReaderObjdumpBase::PrintRelocation(const Reloc& reloc,
printf(" %06" PRIzx ": %-18s %" PRIindex "", offset,
GetRelocTypeName(reloc.type), reloc.index);
switch (reloc.type) {
- case RelocType::GlobalAddressLEB:
- case RelocType::GlobalAddressSLEB:
- case RelocType::GlobalAddressI32:
+ case RelocType::MemoryAddressLEB:
+ case RelocType::MemoryAddressSLEB:
+ case RelocType::MemoryAddressI32:
printf(" + %d", reloc.addend);
break;
case RelocType::FuncIndexLEB:
diff --git a/src/binary-reader.cc b/src/binary-reader.cc
index 2ae82315..d17751c1 100644
--- a/src/binary-reader.cc
+++ b/src/binary-reader.cc
@@ -1205,9 +1205,9 @@ Result BinaryReader::ReadRelocSection(Offset section_size) {
CHECK_RESULT(ReadIndex(&index, "index"));
RelocType type = static_cast<RelocType>(reloc_type);
switch (type) {
- case RelocType::GlobalAddressLEB:
- case RelocType::GlobalAddressSLEB:
- case RelocType::GlobalAddressI32:
+ case RelocType::MemoryAddressLEB:
+ case RelocType::MemoryAddressSLEB:
+ case RelocType::MemoryAddressI32:
CHECK_RESULT(ReadI32Leb128(&addend, "addend"));
break;
default:
diff --git a/src/binary-writer.cc b/src/binary-writer.cc
index 128f8afa..7be8ecb8 100644
--- a/src/binary-writer.cc
+++ b/src/binary-writer.cc
@@ -718,9 +718,9 @@ void BinaryWriter::WriteRelocSection(const RelocSection* reloc_section) {
WriteU32Leb128(&stream_, reloc.offset, "reloc offset");
WriteU32Leb128(&stream_, reloc.index, "reloc index");
switch (reloc.type) {
- case RelocType::GlobalAddressLEB:
- case RelocType::GlobalAddressSLEB:
- case RelocType::GlobalAddressI32:
+ case RelocType::MemoryAddressLEB:
+ case RelocType::MemoryAddressSLEB:
+ case RelocType::MemoryAddressI32:
WriteU32Leb128(&stream_, reloc.addend, "reloc addend");
break;
default:
diff --git a/src/common.cc b/src/common.cc
index 922489be..65b2e15c 100644
--- a/src/common.cc
+++ b/src/common.cc
@@ -37,15 +37,12 @@ Reloc::Reloc(RelocType type, Offset offset, Index index, int32_t addend)
const char* g_kind_name[] = {"func", "table", "memory", "global", "except"};
WABT_STATIC_ASSERT(WABT_ARRAY_SIZE(g_kind_name) == kExternalKindCount);
-const char* g_reloc_type_name[] = {"R_FUNC_INDEX_LEB",
- "R_TABLE_INDEX_SLEB",
- "R_TABLE_INDEX_I32",
- "R_GLOBAL_ADDR_LEB",
- "R_GLOBAL_ADDR_SLEB",
- "R_GLOBAL_ADDR_I32",
- "R_TYPE_INDEX_LEB",
- "R_GLOBAL_INDEX_LEB",
- };
+const char* g_reloc_type_name[] = {
+ "R_WEBASSEMBLY_FUNCTION_INDEX_LEB", "R_WEBASSEMBLY_TABLE_INDEX_SLEB",
+ "R_WEBASSEMBLY_TABLE_INDEX_I32", "R_WEBASSEMBLY_MEMORY_ADDR_LEB",
+ "R_WEBASSEMBLY_MEMORY_ADDR_SLEB", "R_WEBASSEMBLY_MEMORY_ADDR_I32",
+ "R_WEBASSEMBLY_TYPE_INDEX_LEB", "R_WEBASSEMBLY_GLOBAL_INDEX_LEB",
+};
WABT_STATIC_ASSERT(WABT_ARRAY_SIZE(g_reloc_type_name) == kRelocTypeCount);
Result ReadFile(const char* filename, std::vector<uint8_t>* out_data) {
diff --git a/src/common.h b/src/common.h
index 90754063..78fe710f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -199,14 +199,14 @@ enum class Type {
typedef std::vector<Type> TypeVector;
enum class RelocType {
- FuncIndexLEB = 0, /* e.g. immediate of call instruction */
- TableIndexSLEB = 1, /* e.g. loading address of function */
- TableIndexI32 = 2, /* e.g. function address in DATA */
- GlobalAddressLEB = 3,
- GlobalAddressSLEB = 4,
- GlobalAddressI32 = 5,
- TypeIndexLEB = 6, /* e.g immediate type in call_indirect */
- GlobalIndexLEB = 7, /* e.g immediate of get_global inst */
+ FuncIndexLEB = 0, // e.g. Immediate of call instruction
+ TableIndexSLEB = 1, // e.g. Loading address of function
+ TableIndexI32 = 2, // e.g. Function address in DATA
+ MemoryAddressLEB = 3, // e.g. Memory address in load/store offset immediate
+ MemoryAddressSLEB = 4, // e.g. Memory address in i32.const
+ MemoryAddressI32 = 5, // e.g. Memory address in DATA
+ TypeIndexLEB = 6, // e.g. Immediate type in call_indirect
+ GlobalIndexLEB = 7, // e.g. Immediate of get_global inst
First = FuncIndexLEB,
Last = GlobalIndexLEB,
diff --git a/test/dump/relocations.txt b/test/dump/relocations.txt
index b6355f2a..5b074f71 100644
--- a/test/dump/relocations.txt
+++ b/test/dump/relocations.txt
@@ -31,10 +31,10 @@ Code Disassembly:
000050 func[1]:
000052: 23 80 80 80 80 00 | get_global 0
- 000053: R_GLOBAL_INDEX_LEB 0
+ 000053: R_WEBASSEMBLY_GLOBAL_INDEX_LEB 0
000058: 10 81 80 80 80 00 | call 1
- 000059: R_FUNC_INDEX_LEB 1
+ 000059: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1
00005e: 10 80 80 80 80 00 | call 0
- 00005f: R_FUNC_INDEX_LEB 0
+ 00005f: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0
000064: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/export.txt b/test/link/export.txt
index a41fc426..fd7936b8 100644
--- a/test/link/export.txt
+++ b/test/link/export.txt
@@ -38,19 +38,19 @@ Export:
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x000037) index=0
- - R_FUNC_INDEX_LEB offset=0x000011(file=0x000042) index=1
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x000037) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000011(file=0x000042) index=1
Code Disassembly:
000032 func[0]:
000034: 41 01 | i32.const 1
000036: 10 80 80 80 80 00 | call 0
- 000037: R_FUNC_INDEX_LEB 0
+ 000037: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0
00003c: 0b | end
00003d func[1]:
00003f: 41 02 | i32.const 2
000041: 10 81 80 80 80 00 | call 1
- 000042: R_FUNC_INDEX_LEB 1
+ 000042: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1
000047: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/function_calls.txt b/test/link/function_calls.txt
index d1f75359..46312816 100644
--- a/test/link/function_calls.txt
+++ b/test/link/function_calls.txt
@@ -56,29 +56,29 @@ Custom:
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x00005f) index=2
- - R_FUNC_INDEX_LEB offset=0x00000c(file=0x000065) index=3
- - R_FUNC_INDEX_LEB offset=0x000012(file=0x00006b) index=0
- - R_FUNC_INDEX_LEB offset=0x000024(file=0x00007d) index=1
- - R_FUNC_INDEX_LEB offset=0x00002c(file=0x000085) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x00005f) index=2
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00000c(file=0x000065) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000012(file=0x00006b) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000024(file=0x00007d) index=1
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00002c(file=0x000085) index=3
Code Disassembly:
00005a <local_func>:
00005c: 20 00 | get_local 0
00005e: 10 82 80 80 80 00 | call 2 <local_func>
- 00005f: R_FUNC_INDEX_LEB 2 <local_func>
+ 00005f: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 2 <local_func>
000064: 10 83 80 80 80 00 | call 3 <m2_local_func>
- 000065: R_FUNC_INDEX_LEB 3 <m2_local_func>
+ 000065: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3 <m2_local_func>
00006a: 10 80 80 80 80 00 | call 0 <import1>
- 00006b: R_FUNC_INDEX_LEB 0 <import1>
+ 00006b: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0 <import1>
000070: 0b | end
000071 <m2_local_func>:
000073: 44 00 00 00 00 00 00 f0 3f | f64.const 0x1p+0
00007c: 10 81 80 80 80 00 | call 1 <m2_import0>
- 00007d: R_FUNC_INDEX_LEB 1 <m2_import0>
+ 00007d: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1 <m2_import0>
000082: 42 0a | i64.const 10
000084: 10 83 80 80 80 00 | call 3 <m2_local_func>
- 000085: R_FUNC_INDEX_LEB 3 <m2_local_func>
+ 000085: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3 <m2_local_func>
00008a: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/function_calls_incremental.txt b/test/link/function_calls_incremental.txt
index 47bda37a..0a7c8a02 100644
--- a/test/link/function_calls_incremental.txt
+++ b/test/link/function_calls_incremental.txt
@@ -55,36 +55,36 @@ Function:
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x00007b) index=0
- - R_FUNC_INDEX_LEB offset=0x00000c(file=0x000081) index=3
- - R_FUNC_INDEX_LEB offset=0x00001e(file=0x000093) index=1
- - R_FUNC_INDEX_LEB offset=0x000026(file=0x00009b) index=4
- - R_FUNC_INDEX_LEB offset=0x000034(file=0x0000a9) index=2
- - R_FUNC_INDEX_LEB offset=0x00003c(file=0x0000b1) index=5
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x00007b) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00000c(file=0x000081) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00001e(file=0x000093) index=1
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000026(file=0x00009b) index=4
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000034(file=0x0000a9) index=2
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00003c(file=0x0000b1) index=5
Code Disassembly:
000076 func[3]:
000078: 20 00 | get_local 0
00007a: 10 80 80 80 80 00 | call 0
- 00007b: R_FUNC_INDEX_LEB 0
+ 00007b: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0
000080: 10 83 80 80 80 00 | call 3
- 000081: R_FUNC_INDEX_LEB 3
+ 000081: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3
000086: 0b | end
000087 func[4]:
000089: 44 00 00 00 00 00 00 f0 3f | f64.const 0x1p+0
000092: 10 81 80 80 80 00 | call 1
- 000093: R_FUNC_INDEX_LEB 1
+ 000093: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1
000098: 42 0a | i64.const 10
00009a: 10 84 80 80 80 00 | call 4
- 00009b: R_FUNC_INDEX_LEB 4
+ 00009b: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 4
0000a0: 0b | end
0000a1 func[5]:
0000a3: 43 00 00 80 3f | f32.const 0x1p+0
0000a8: 10 82 80 80 80 00 | call 2
- 0000a9: R_FUNC_INDEX_LEB 2
+ 0000a9: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 2
0000ae: 41 0a | i32.const 10
0000b0: 10 85 80 80 80 00 | call 5
- 0000b1: R_FUNC_INDEX_LEB 5
+ 0000b1: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 5
0000b6: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/globals.txt b/test/link/globals.txt
index 3c468c95..b5c5dc76 100644
--- a/test/link/globals.txt
+++ b/test/link/globals.txt
@@ -51,34 +51,34 @@ Global:
Custom:
- name: "reloc.Code"
- section: Code
- - R_GLOBAL_INDEX_LEB offset=0x000004(file=0x00005c) index=3
- - R_GLOBAL_INDEX_LEB offset=0x00000a(file=0x000062) index=2
- - R_GLOBAL_INDEX_LEB offset=0x000011(file=0x000069) index=0
- - R_FUNC_INDEX_LEB offset=0x000018(file=0x000070) index=0
- - R_GLOBAL_INDEX_LEB offset=0x000021(file=0x000079) index=1
- - R_GLOBAL_INDEX_LEB offset=0x000027(file=0x00007f) index=4
- - R_FUNC_INDEX_LEB offset=0x00002d(file=0x000085) index=1
+ - R_WEBASSEMBLY_GLOBAL_INDEX_LEB offset=0x000004(file=0x00005c) index=3
+ - R_WEBASSEMBLY_GLOBAL_INDEX_LEB offset=0x00000a(file=0x000062) index=2
+ - R_WEBASSEMBLY_GLOBAL_INDEX_LEB offset=0x000011(file=0x000069) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000018(file=0x000070) index=0
+ - R_WEBASSEMBLY_GLOBAL_INDEX_LEB offset=0x000021(file=0x000079) index=1
+ - R_WEBASSEMBLY_GLOBAL_INDEX_LEB offset=0x000027(file=0x00007f) index=4
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00002d(file=0x000085) index=1
Code Disassembly:
000059 func[0]:
00005b: 23 83 80 80 80 00 | get_global 3
- 00005c: R_GLOBAL_INDEX_LEB 3
+ 00005c: R_WEBASSEMBLY_GLOBAL_INDEX_LEB 3
000061: 23 82 80 80 80 00 | get_global 2
- 000062: R_GLOBAL_INDEX_LEB 2
+ 000062: R_WEBASSEMBLY_GLOBAL_INDEX_LEB 2
000067: 6a | i32.add
000068: 23 80 80 80 80 00 | get_global 0
- 000069: R_GLOBAL_INDEX_LEB 0
+ 000069: R_WEBASSEMBLY_GLOBAL_INDEX_LEB 0
00006e: 6a | i32.add
00006f: 10 80 80 80 80 00 | call 0
- 000070: R_FUNC_INDEX_LEB 0
+ 000070: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0
000075: 0b | end
000076 func[1]:
000078: 23 81 80 80 80 00 | get_global 1
- 000079: R_GLOBAL_INDEX_LEB 1
+ 000079: R_WEBASSEMBLY_GLOBAL_INDEX_LEB 1
00007e: 23 84 80 80 80 00 | get_global 4
- 00007f: R_GLOBAL_INDEX_LEB 4
+ 00007f: R_WEBASSEMBLY_GLOBAL_INDEX_LEB 4
000084: 10 81 80 80 80 00 | call 1
- 000085: R_FUNC_INDEX_LEB 1
+ 000085: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1
00008a: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/incremental.txt b/test/link/incremental.txt
index bca82d07..00063cf1 100644
--- a/test/link/incremental.txt
+++ b/test/link/incremental.txt
@@ -79,46 +79,46 @@ Custom:
Custom:
- name: "reloc.Elem"
- section: Elem
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x00008a) index=3
- - R_FUNC_INDEX_LEB offset=0x00000b(file=0x00008f) index=3
- - R_FUNC_INDEX_LEB offset=0x000010(file=0x000094) index=3
- - R_FUNC_INDEX_LEB offset=0x000015(file=0x000099) index=4
- - R_FUNC_INDEX_LEB offset=0x00001a(file=0x00009e) index=4
- - R_FUNC_INDEX_LEB offset=0x00001f(file=0x0000a3) index=5
- - R_FUNC_INDEX_LEB offset=0x000024(file=0x0000a8) index=5
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x00008a) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00000b(file=0x00008f) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000010(file=0x000094) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000015(file=0x000099) index=4
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00001a(file=0x00009e) index=4
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00001f(file=0x0000a3) index=5
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000024(file=0x0000a8) index=5
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x0000b5) index=0
- - R_FUNC_INDEX_LEB offset=0x00000c(file=0x0000bb) index=3
- - R_FUNC_INDEX_LEB offset=0x00001e(file=0x0000cd) index=1
- - R_FUNC_INDEX_LEB offset=0x000026(file=0x0000d5) index=4
- - R_FUNC_INDEX_LEB offset=0x000034(file=0x0000e3) index=2
- - R_FUNC_INDEX_LEB offset=0x00003c(file=0x0000eb) index=5
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x0000b5) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00000c(file=0x0000bb) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00001e(file=0x0000cd) index=1
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000026(file=0x0000d5) index=4
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000034(file=0x0000e3) index=2
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00003c(file=0x0000eb) index=5
Code Disassembly:
0000b0 <func1>:
0000b2: 20 00 | get_local 0
0000b4: 10 80 80 80 80 00 | call 0
- 0000b5: R_FUNC_INDEX_LEB 0
+ 0000b5: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0
0000ba: 10 83 80 80 80 00 | call 3 <func1>
- 0000bb: R_FUNC_INDEX_LEB 3 <func1>
+ 0000bb: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3 <func1>
0000c0: 0b | end
0000c1 <func2>:
0000c3: 44 00 00 00 00 00 00 f0 3f | f64.const 0x1p+0
0000cc: 10 81 80 80 80 00 | call 1
- 0000cd: R_FUNC_INDEX_LEB 1
+ 0000cd: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1
0000d2: 42 0a | i64.const 10
0000d4: 10 84 80 80 80 00 | call 4 <func2>
- 0000d5: R_FUNC_INDEX_LEB 4 <func2>
+ 0000d5: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 4 <func2>
0000da: 0b | end
0000db <func3>:
0000dd: 43 00 00 80 3f | f32.const 0x1p+0
0000e2: 10 82 80 80 80 00 | call 2
- 0000e3: R_FUNC_INDEX_LEB 2
+ 0000e3: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 2
0000e8: 41 0a | i32.const 10
0000ea: 10 85 80 80 80 00 | call 5 <func3>
- 0000eb: R_FUNC_INDEX_LEB 5 <func3>
+ 0000eb: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 5 <func3>
0000f0: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/interp.txt b/test/link/interp.txt
index ab850b40..15feb8d6 100644
--- a/test/link/interp.txt
+++ b/test/link/interp.txt
@@ -85,8 +85,8 @@ Custom:
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x00000d(file=0x000084) index=3
- - R_FUNC_INDEX_LEB offset=0x000017(file=0x00008e) index=4
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00000d(file=0x000084) index=3
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000017(file=0x00008e) index=4
Code Disassembly:
@@ -96,12 +96,12 @@ Code Disassembly:
000080: 0b | end
000081 <call_import1>:
000083: 10 83 80 80 80 00 | call 3 <export2>
- 000084: R_FUNC_INDEX_LEB 3 <export2>
+ 000084: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3 <export2>
000089: 0f | return
00008a: 0b | end
00008b <call_import2>:
00008d: 10 84 80 80 80 00 | call 4 <export3>
- 00008e: R_FUNC_INDEX_LEB 4 <export3>
+ 00008e: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 4 <export3>
000093: 0f | return
000094: 0b | end
000095 <export2>:
diff --git a/test/link/large_code_section.txt b/test/link/large_code_section.txt
index c35a8a51..befe77c7 100644
--- a/test/link/large_code_section.txt
+++ b/test/link/large_code_section.txt
@@ -93,13 +93,13 @@ Custom:
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x000005(file=0x00001f) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000005(file=0x00001f) index=0
Code Disassembly:
00001b <local_func>:
00001e: 10 80 80 80 80 00 | call 0 <local_func>
- 00001f: R_FUNC_INDEX_LEB 0 <local_func>
+ 00001f: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0 <local_func>
000024: 21 00 | set_local 0
000026: 20 00 | get_local 0
000028: 21 00 | set_local 0
diff --git a/test/link/names.txt b/test/link/names.txt
index cb4979d6..d271ea17 100644
--- a/test/link/names.txt
+++ b/test/link/names.txt
@@ -63,27 +63,27 @@ Custom:
Custom:
- name: "reloc.Code"
- section: Code
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x000082) index=6
- - R_FUNC_INDEX_LEB offset=0x000011(file=0x00008d) index=2
- - R_FUNC_INDEX_LEB offset=0x00001f(file=0x00009b) index=6
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x000082) index=6
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000011(file=0x00008d) index=2
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00001f(file=0x00009b) index=6
Code Disassembly:
00007d <name1>:
00007f: 41 01 | i32.const 1
000081: 10 86 80 80 80 00 | call 6 <name3>
- 000082: R_FUNC_INDEX_LEB 6 <name3>
+ 000082: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 6 <name3>
000087: 0b | end
000088 <name2>:
00008a: 42 01 | i64.const 1
00008c: 10 82 80 80 80 00 | call 2 <import_func2>
- 00008d: R_FUNC_INDEX_LEB 2 <import_func2>
+ 00008d: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 2 <import_func2>
000092: 0b | end
000093 func[5]:
000095: 0b | end
000096 <name3>:
000098: 41 02 | i32.const 2
00009a: 10 86 80 80 80 00 | call 6 <name3>
- 00009b: R_FUNC_INDEX_LEB 6 <name3>
+ 00009b: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 6 <name3>
0000a0: 0b | end
;;; STDOUT ;;)
diff --git a/test/link/table.txt b/test/link/table.txt
index dce480a2..0c222f47 100644
--- a/test/link/table.txt
+++ b/test/link/table.txt
@@ -60,15 +60,15 @@ Custom:
Custom:
- name: "reloc.Elem"
- section: Elem
- - R_FUNC_INDEX_LEB offset=0x000006(file=0x00003c) index=0
- - R_FUNC_INDEX_LEB offset=0x00000b(file=0x000041) index=0
- - R_FUNC_INDEX_LEB offset=0x000010(file=0x000046) index=2
- - R_FUNC_INDEX_LEB offset=0x000015(file=0x00004b) index=1
- - R_FUNC_INDEX_LEB offset=0x00001a(file=0x000050) index=1
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000006(file=0x00003c) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00000b(file=0x000041) index=0
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000010(file=0x000046) index=2
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x000015(file=0x00004b) index=1
+ - R_WEBASSEMBLY_FUNCTION_INDEX_LEB offset=0x00001a(file=0x000050) index=1
Custom:
- name: "reloc.Code"
- section: Code
- - R_TYPE_INDEX_LEB offset=0x00000f(file=0x000066) index=1
+ - R_WEBASSEMBLY_TYPE_INDEX_LEB offset=0x00000f(file=0x000066) index=1
Code Disassembly:
@@ -81,6 +81,6 @@ Code Disassembly:
000061 <func4>:
000063: 42 07 | i64.const 7
000065: 11 81 80 80 80 00 00 | call_indirect 1 0
- 000066: R_TYPE_INDEX_LEB 1
+ 000066: R_WEBASSEMBLY_TYPE_INDEX_LEB 1
00006c: 0b | end
;;; STDOUT ;;)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-07 14:14:42 +0000