Index: test/wasm/Inputs/globals.yaml =================================================================== --- test/wasm/Inputs/globals.yaml +++ test/wasm/Inputs/globals.yaml @@ -29,7 +29,7 @@ Locals: Body: 2381808080000B Relocations: - - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB + - Type: R_WASM_GLOBAL_INDEX_LEB Index: 1 Offset: 0x00000004 - Type: CUSTOM Index: test/wasm/Inputs/undefined-globals.yaml =================================================================== --- test/wasm/Inputs/undefined-globals.yaml +++ test/wasm/Inputs/undefined-globals.yaml @@ -27,7 +27,7 @@ Locals: Body: 2381808080000B Relocations: - - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB + - Type: R_WASM_GLOBAL_INDEX_LEB Index: 1 Offset: 0x00000004 - Type: CUSTOM Index: test/wasm/data-layout.ll =================================================================== --- test/wasm/data-layout.ll +++ test/wasm/data-layout.ll @@ -84,10 +84,10 @@ ; RELOC: - Type: DATA ; RELOC-NEXT: Relocations: -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; RELOC-NEXT: Index: 3 ; RELOC-NEXT: Offset: 0x00000018 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; RELOC-NEXT: Index: 4 ; RELOC-NEXT: Offset: 0x0000002E ; RELOC-NEXT: Addend: 4 Index: test/wasm/locals-duplicate.test =================================================================== --- test/wasm/locals-duplicate.test +++ test/wasm/locals-duplicate.test @@ -269,40 +269,40 @@ ; RELOC-NEXT: Functions: [ 0, 1, 2, 9, 10, 11 ] ; RELOC-NEXT: - Type: CODE ; RELOC-NEXT: Relocations: -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; RELOC-NEXT: Index: 18 ; RELOC-NEXT: Offset: 0x00000013 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; RELOC-NEXT: Index: 3 ; RELOC-NEXT: Offset: 0x0000001C -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; RELOC-NEXT: Index: 19 ; RELOC-NEXT: Offset: 0x00000025 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 16 ; RELOC-NEXT: Offset: 0x0000002E -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 0 ; RELOC-NEXT: Offset: 0x00000037 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 17 ; RELOC-NEXT: Offset: 0x00000040 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; RELOC-NEXT: Index: 10 ; RELOC-NEXT: Offset: 0x00000058 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; RELOC-NEXT: Index: 22 ; RELOC-NEXT: Offset: 0x00000061 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; RELOC-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; RELOC-NEXT: Index: 23 ; RELOC-NEXT: Offset: 0x0000006A -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 8 ; RELOC-NEXT: Offset: 0x00000073 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 20 ; RELOC-NEXT: Offset: 0x0000007C -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 21 ; RELOC-NEXT: Offset: 0x00000085 ; RELOC-NEXT: Functions: Index: test/wasm/many-functions.ll =================================================================== --- test/wasm/many-functions.ll +++ test/wasm/many-functions.ll @@ -18,394 +18,394 @@ ; CHECK: - Type: CODE ; CHECK-NEXT: Relocations: -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000008 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000014 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000020 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000002C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000038 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000044 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000050 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000005C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000068 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000074 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000080 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000008C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000098 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000A4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000B0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000BC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000C8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000D4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000E0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000EC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000000F8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000104 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000110 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000011C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000128 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000134 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000140 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000014C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000158 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000164 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000170 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000017C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000188 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000194 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001A0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001AC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001B8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001C4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001D0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001DC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001E8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000001F4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000200 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000020C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000218 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000224 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000230 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000023C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000248 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000254 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000260 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000026C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000278 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000284 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000290 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000029C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002A8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002B4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002C0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002CC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002D8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002E4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002F0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000002FC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000308 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000314 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000320 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000032C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000338 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000344 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000350 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000035C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000368 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000374 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000380 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000038C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000398 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003A4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003B0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003BC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003C8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003D4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003E0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003EC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000003F8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000404 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000410 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000041C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000428 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000434 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000440 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000044C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000458 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000464 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000470 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000047C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000488 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000494 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004A0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004AC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004B8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004C4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004D0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004DC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004E8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000004F4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000500 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000050C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000518 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000524 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000530 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000053C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000548 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000554 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000560 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000056C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000578 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000584 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000590 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x0000059C -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005A8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005B4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005C0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005CC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005D8 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005E4 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x000005F0 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 129 ; CHECK-NEXT: Offset: 0x000005FC -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_LEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_LEB ; CHECK-NEXT: Index: 129 ; CHECK-NEXT: Offset: 0x00000608 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; CHECK-NEXT: Index: 131 ; CHECK-NEXT: Offset: 0x00000611 ; CHECK-NEXT: Functions: Index: test/wasm/reloc-addend.ll =================================================================== --- test/wasm/reloc-addend.ll +++ test/wasm/reloc-addend.ll @@ -13,7 +13,7 @@ ; CHECK: - Type: DATA ; CHECK-NEXT: Relocations: -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; CHECK-NEXT: Index: 0 ; CHECK-NEXT: Offset: 0x0000013D ; CHECK-NEXT: Addend: 64 Index: test/wasm/relocatable.ll =================================================================== --- test/wasm/relocatable.ll +++ test/wasm/relocatable.ll @@ -79,19 +79,19 @@ ; CHECK-NEXT: Functions: [ 4, 1, 2 ] ; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: Relocations: -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000004 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; CHECK-NEXT: Index: 2 ; CHECK-NEXT: Offset: 0x0000000A -; CHECK-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; CHECK-NEXT: Index: 4 ; CHECK-NEXT: Offset: 0x00000013 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; CHECK-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; CHECK-NEXT: Index: 5 ; CHECK-NEXT: Offset: 0x0000001A -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_SLEB ; CHECK-NEXT: Index: 7 ; CHECK-NEXT: Offset: 0x00000026 ; CHECK-NEXT: Functions: @@ -106,16 +106,16 @@ ; CHECK-NEXT: Body: 419C808080000B ; CHECK-NEXT: - Type: DATA ; CHECK-NEXT: Relocations: -; CHECK-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_I32 +; CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_I32 ; CHECK-NEXT: Index: 3 ; CHECK-NEXT: Offset: 0x00000012 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_I32 +; CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_I32 ; CHECK-NEXT: Index: 4 ; CHECK-NEXT: Offset: 0x0000001B -; CHECK-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_I32 +; CHECK-NEXT: - Type: R_WASM_TABLE_INDEX_I32 ; CHECK-NEXT: Index: 5 ; CHECK-NEXT: Offset: 0x00000024 -; CHECK-NEXT: - Type: R_WEBASSEMBLY_MEMORY_ADDR_I32 +; CHECK-NEXT: - Type: R_WASM_MEMORY_ADDR_I32 ; CHECK-NEXT: Index: 12 ; CHECK-NEXT: Offset: 0x0000002D ; CHECK-NEXT: Segments: Index: test/wasm/stack-pointer.ll =================================================================== --- test/wasm/stack-pointer.ll +++ test/wasm/stack-pointer.ll @@ -41,7 +41,7 @@ ; CHECK-NEXT: - Initial: 0x00000000 ; CHECK-NEXT: - Type: CODE ; CHECK-NEXT: Relocations: -; CHECK-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; CHECK-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; CHECK-NEXT: Index: 1 ; CHECK-NEXT: Offset: 0x00000004 ; CHECK-NEXT: Functions: Index: test/wasm/weak-alias.ll =================================================================== --- test/wasm/weak-alias.ll +++ test/wasm/weak-alias.ll @@ -186,43 +186,43 @@ ; RELOC-NEXT: Functions: [ 1 ] ; RELOC-NEXT: - Type: CODE ; RELOC-NEXT: Relocations: -; RELOC-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; RELOC-NEXT: Index: 1 ; RELOC-NEXT: Offset: 0x00000004 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; RELOC-NEXT: Index: 2 ; RELOC-NEXT: Offset: 0x00000013 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; RELOC-NEXT: Index: 1 ; RELOC-NEXT: Offset: 0x0000001C -; RELOC-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; RELOC-NEXT: Index: 6 ; RELOC-NEXT: Offset: 0x00000027 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; RELOC-NEXT: Index: 6 ; RELOC-NEXT: Offset: 0x00000032 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 1 ; RELOC-NEXT: Offset: 0x0000003A -; RELOC-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; RELOC-NEXT: Index: 1 ; RELOC-NEXT: Offset: 0x00000043 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; RELOC-NEXT: Index: 6 ; RELOC-NEXT: Offset: 0x00000050 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; RELOC-NEXT: Index: 6 ; RELOC-NEXT: Offset: 0x0000005D -; RELOC-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; RELOC-NEXT: Index: 6 ; RELOC-NEXT: Offset: 0x00000068 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_TABLE_INDEX_SLEB +; RELOC-NEXT: - Type: R_WASM_TABLE_INDEX_SLEB ; RELOC-NEXT: Index: 2 ; RELOC-NEXT: Offset: 0x00000070 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_FUNCTION_INDEX_LEB ; RELOC-NEXT: Index: 2 ; RELOC-NEXT: Offset: 0x00000079 -; RELOC-NEXT: - Type: R_WEBASSEMBLY_GLOBAL_INDEX_LEB +; RELOC-NEXT: - Type: R_WASM_GLOBAL_INDEX_LEB ; RELOC-NEXT: Index: 6 ; RELOC-NEXT: Offset: 0x00000086 ; RELOC-NEXT: Functions: Index: wasm/InputChunks.cpp =================================================================== --- wasm/InputChunks.cpp +++ wasm/InputChunks.cpp @@ -51,21 +51,21 @@ uint32_t Offset = Rel.Offset - getInputSectionOffset(); const uint8_t *Loc = data().data() + Offset; switch (Rel.Type) { - case R_WEBASSEMBLY_TYPE_INDEX_LEB: - case R_WEBASSEMBLY_FUNCTION_INDEX_LEB: - case R_WEBASSEMBLY_GLOBAL_INDEX_LEB: - case R_WEBASSEMBLY_EVENT_INDEX_LEB: - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: + case R_WASM_TYPE_INDEX_LEB: + case R_WASM_FUNCTION_INDEX_LEB: + case R_WASM_GLOBAL_INDEX_LEB: + case R_WASM_EVENT_INDEX_LEB: + case R_WASM_MEMORY_ADDR_LEB: ExistingValue = decodeULEB128(Loc, &BytesRead); break; - case R_WEBASSEMBLY_TABLE_INDEX_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: + case R_WASM_TABLE_INDEX_SLEB: + case R_WASM_MEMORY_ADDR_SLEB: ExistingValue = static_cast(decodeSLEB128(Loc, &BytesRead)); break; - case R_WEBASSEMBLY_TABLE_INDEX_I32: - case R_WEBASSEMBLY_MEMORY_ADDR_I32: - case R_WEBASSEMBLY_FUNCTION_OFFSET_I32: - case R_WEBASSEMBLY_SECTION_OFFSET_I32: + case R_WASM_TABLE_INDEX_I32: + case R_WASM_MEMORY_ADDR_I32: + case R_WASM_FUNCTION_OFFSET_I32: + case R_WASM_SECTION_OFFSET_I32: ExistingValue = static_cast(read32le(Loc)); break; default: @@ -108,21 +108,21 @@ << "\n"); switch (Rel.Type) { - case R_WEBASSEMBLY_TYPE_INDEX_LEB: - case R_WEBASSEMBLY_FUNCTION_INDEX_LEB: - case R_WEBASSEMBLY_GLOBAL_INDEX_LEB: - case R_WEBASSEMBLY_EVENT_INDEX_LEB: - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: + case R_WASM_TYPE_INDEX_LEB: + case R_WASM_FUNCTION_INDEX_LEB: + case R_WASM_GLOBAL_INDEX_LEB: + case R_WASM_EVENT_INDEX_LEB: + case R_WASM_MEMORY_ADDR_LEB: encodeULEB128(Value, Loc, 5); break; - case R_WEBASSEMBLY_TABLE_INDEX_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: + case R_WASM_TABLE_INDEX_SLEB: + case R_WASM_MEMORY_ADDR_SLEB: encodeSLEB128(static_cast(Value), Loc, 5); break; - case R_WEBASSEMBLY_TABLE_INDEX_I32: - case R_WEBASSEMBLY_MEMORY_ADDR_I32: - case R_WEBASSEMBLY_FUNCTION_OFFSET_I32: - case R_WEBASSEMBLY_SECTION_OFFSET_I32: + case R_WASM_TABLE_INDEX_I32: + case R_WASM_MEMORY_ADDR_I32: + case R_WASM_FUNCTION_OFFSET_I32: + case R_WASM_SECTION_OFFSET_I32: write32le(Loc, Value); break; default: @@ -148,11 +148,11 @@ writeUleb128(OS, File->calcNewIndex(Rel), "reloc index"); switch (Rel.Type) { - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_I32: - case R_WEBASSEMBLY_FUNCTION_OFFSET_I32: - case R_WEBASSEMBLY_SECTION_OFFSET_I32: + case R_WASM_MEMORY_ADDR_LEB: + case R_WASM_MEMORY_ADDR_SLEB: + case R_WASM_MEMORY_ADDR_I32: + case R_WASM_FUNCTION_OFFSET_I32: + case R_WASM_SECTION_OFFSET_I32: writeSleb128(OS, File->calcNewAddend(Rel), "reloc addend"); break; } @@ -178,14 +178,14 @@ static unsigned writeCompressedReloc(uint8_t *Buf, const WasmRelocation &Rel, uint32_t Value) { switch (Rel.Type) { - case R_WEBASSEMBLY_TYPE_INDEX_LEB: - case R_WEBASSEMBLY_FUNCTION_INDEX_LEB: - case R_WEBASSEMBLY_GLOBAL_INDEX_LEB: - case R_WEBASSEMBLY_EVENT_INDEX_LEB: - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: + case R_WASM_TYPE_INDEX_LEB: + case R_WASM_FUNCTION_INDEX_LEB: + case R_WASM_GLOBAL_INDEX_LEB: + case R_WASM_EVENT_INDEX_LEB: + case R_WASM_MEMORY_ADDR_LEB: return encodeULEB128(Value, Buf); - case R_WEBASSEMBLY_TABLE_INDEX_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: + case R_WASM_TABLE_INDEX_SLEB: + case R_WASM_MEMORY_ADDR_SLEB: return encodeSLEB128(static_cast(Value), Buf); default: llvm_unreachable("unexpected relocation type"); @@ -194,13 +194,13 @@ static unsigned getRelocWidthPadded(const WasmRelocation &Rel) { switch (Rel.Type) { - case R_WEBASSEMBLY_TYPE_INDEX_LEB: - case R_WEBASSEMBLY_FUNCTION_INDEX_LEB: - case R_WEBASSEMBLY_GLOBAL_INDEX_LEB: - case R_WEBASSEMBLY_EVENT_INDEX_LEB: - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: - case R_WEBASSEMBLY_TABLE_INDEX_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: + case R_WASM_TYPE_INDEX_LEB: + case R_WASM_FUNCTION_INDEX_LEB: + case R_WASM_GLOBAL_INDEX_LEB: + case R_WASM_EVENT_INDEX_LEB: + case R_WASM_MEMORY_ADDR_LEB: + case R_WASM_TABLE_INDEX_SLEB: + case R_WASM_MEMORY_ADDR_SLEB: return 5; default: llvm_unreachable("unexpected relocation type"); Index: wasm/InputFiles.cpp =================================================================== --- wasm/InputFiles.cpp +++ wasm/InputFiles.cpp @@ -65,7 +65,7 @@ // relocation and returns relocated index (i.e. translates from the input // symbol/type space to the output symbol/type space). uint32_t ObjFile::calcNewIndex(const WasmRelocation &Reloc) const { - if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB) { + if (Reloc.Type == R_WASM_TYPE_INDEX_LEB) { assert(TypeIsUsed[Reloc.Index]); return TypeMap[Reloc.Index]; } @@ -76,12 +76,12 @@ // relocation and returns updated addend by offset in the output section. uint32_t ObjFile::calcNewAddend(const WasmRelocation &Reloc) const { switch (Reloc.Type) { - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_I32: - case R_WEBASSEMBLY_FUNCTION_OFFSET_I32: + case R_WASM_MEMORY_ADDR_LEB: + case R_WASM_MEMORY_ADDR_SLEB: + case R_WASM_MEMORY_ADDR_I32: + case R_WASM_FUNCTION_OFFSET_I32: return Reloc.Addend; - case R_WEBASSEMBLY_SECTION_OFFSET_I32: + case R_WASM_SECTION_OFFSET_I32: return getSectionSymbol(Reloc.Index)->Section->OutputOffset + Reloc.Addend; default: llvm_unreachable("unexpected relocation type"); @@ -93,14 +93,14 @@ // location. It is useful for catching bugs in the compiler and linker. uint32_t ObjFile::calcExpectedValue(const WasmRelocation &Reloc) const { switch (Reloc.Type) { - case R_WEBASSEMBLY_TABLE_INDEX_I32: - case R_WEBASSEMBLY_TABLE_INDEX_SLEB: { + case R_WASM_TABLE_INDEX_I32: + case R_WASM_TABLE_INDEX_SLEB: { const WasmSymbol &Sym = WasmObj->syms()[Reloc.Index]; return TableEntries[Sym.Info.ElementIndex]; } - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_I32: - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: { + case R_WASM_MEMORY_ADDR_SLEB: + case R_WASM_MEMORY_ADDR_I32: + case R_WASM_MEMORY_ADDR_LEB: { const WasmSymbol &Sym = WasmObj->syms()[Reloc.Index]; if (Sym.isUndefined()) return 0; @@ -109,19 +109,19 @@ return Segment.Data.Offset.Value.Int32 + Sym.Info.DataRef.Offset + Reloc.Addend; } - case R_WEBASSEMBLY_FUNCTION_OFFSET_I32: + case R_WASM_FUNCTION_OFFSET_I32: if (auto *Sym = dyn_cast(getFunctionSymbol(Reloc.Index))) { return Sym->Function->getFunctionInputOffset() + Sym->Function->getFunctionCodeOffset() + Reloc.Addend; } return 0; - case R_WEBASSEMBLY_SECTION_OFFSET_I32: + case R_WASM_SECTION_OFFSET_I32: return Reloc.Addend; - case R_WEBASSEMBLY_TYPE_INDEX_LEB: + case R_WASM_TYPE_INDEX_LEB: return Reloc.Index; - case R_WEBASSEMBLY_FUNCTION_INDEX_LEB: - case R_WEBASSEMBLY_GLOBAL_INDEX_LEB: - case R_WEBASSEMBLY_EVENT_INDEX_LEB: { + case R_WASM_FUNCTION_INDEX_LEB: + case R_WASM_GLOBAL_INDEX_LEB: + case R_WASM_EVENT_INDEX_LEB: { const WasmSymbol &Sym = WasmObj->syms()[Reloc.Index]; return Sym.Info.ElementIndex; } @@ -133,32 +133,32 @@ // Translate from the relocation's index into the final linked output value. uint32_t ObjFile::calcNewValue(const WasmRelocation &Reloc) const { switch (Reloc.Type) { - case R_WEBASSEMBLY_TABLE_INDEX_I32: - case R_WEBASSEMBLY_TABLE_INDEX_SLEB: + case R_WASM_TABLE_INDEX_I32: + case R_WASM_TABLE_INDEX_SLEB: return getFunctionSymbol(Reloc.Index)->getTableIndex(); - case R_WEBASSEMBLY_MEMORY_ADDR_SLEB: - case R_WEBASSEMBLY_MEMORY_ADDR_I32: - case R_WEBASSEMBLY_MEMORY_ADDR_LEB: + case R_WASM_MEMORY_ADDR_SLEB: + case R_WASM_MEMORY_ADDR_I32: + case R_WASM_MEMORY_ADDR_LEB: if (auto *Sym = dyn_cast(getDataSymbol(Reloc.Index))) if (Sym->isLive()) return Sym->getVirtualAddress() + Reloc.Addend; return 0; - case R_WEBASSEMBLY_TYPE_INDEX_LEB: + case R_WASM_TYPE_INDEX_LEB: return TypeMap[Reloc.Index]; - case R_WEBASSEMBLY_FUNCTION_INDEX_LEB: + case R_WASM_FUNCTION_INDEX_LEB: return getFunctionSymbol(Reloc.Index)->getFunctionIndex(); - case R_WEBASSEMBLY_GLOBAL_INDEX_LEB: + case R_WASM_GLOBAL_INDEX_LEB: return getGlobalSymbol(Reloc.Index)->getGlobalIndex(); - case R_WEBASSEMBLY_EVENT_INDEX_LEB: + case R_WASM_EVENT_INDEX_LEB: return getEventSymbol(Reloc.Index)->getEventIndex(); - case R_WEBASSEMBLY_FUNCTION_OFFSET_I32: + case R_WASM_FUNCTION_OFFSET_I32: if (auto *Sym = dyn_cast(getFunctionSymbol(Reloc.Index))) { if (Sym->isLive()) return Sym->Function->OutputOffset + Sym->Function->getFunctionCodeOffset() + Reloc.Addend; } return 0; - case R_WEBASSEMBLY_SECTION_OFFSET_I32: + case R_WASM_SECTION_OFFSET_I32: return getSectionSymbol(Reloc.Index)->Section->OutputOffset + Reloc.Addend; default: llvm_unreachable("unknown relocation type"); Index: wasm/MarkLive.cpp =================================================================== --- wasm/MarkLive.cpp +++ wasm/MarkLive.cpp @@ -71,7 +71,7 @@ InputChunk *C = Q.pop_back_val(); for (const WasmRelocation Reloc : C->getRelocations()) { - if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB) + if (Reloc.Type == R_WASM_TYPE_INDEX_LEB) continue; Symbol *Sym = C->File->getSymbol(Reloc.Index); @@ -82,8 +82,8 @@ // zero is only reachable via "call", not via "call_indirect". The stub // functions used for weak-undefined symbols have this behaviour (compare // equal to null pointer, only reachable via direct call). - if (Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_SLEB || - Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_I32) { + if (Reloc.Type == R_WASM_TABLE_INDEX_SLEB || + Reloc.Type == R_WASM_TABLE_INDEX_I32) { FunctionSymbol *FuncSym = cast(Sym); if (FuncSym->hasTableIndex() && FuncSym->getTableIndex() == 0) continue; Index: wasm/Writer.cpp =================================================================== --- wasm/Writer.cpp +++ wasm/Writer.cpp @@ -1019,14 +1019,14 @@ ObjFile *File = Chunk->File; ArrayRef Types = File->getWasmObj()->types(); for (const WasmRelocation &Reloc : Chunk->getRelocations()) { - if (Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_I32 || - Reloc.Type == R_WEBASSEMBLY_TABLE_INDEX_SLEB) { + if (Reloc.Type == R_WASM_TABLE_INDEX_I32 || + Reloc.Type == R_WASM_TABLE_INDEX_SLEB) { FunctionSymbol *Sym = File->getFunctionSymbol(Reloc.Index); if (Sym->hasTableIndex() || !Sym->hasFunctionIndex()) continue; Sym->setTableIndex(TableIndex++); IndirectFunctions.emplace_back(Sym); - } else if (Reloc.Type == R_WEBASSEMBLY_TYPE_INDEX_LEB) { + } else if (Reloc.Type == R_WASM_TYPE_INDEX_LEB) { // Mark target type as live File->TypeMap[Reloc.Index] = registerType(Types[Reloc.Index]); File->TypeIsUsed[Reloc.Index] = true;