This is an archive of the discontinued LLVM Phabricator instance.

Differential D95661

[yaml2obj][wasm] Support numeric relocation type
ClosedPublic

Authored by MaskRay on Jan 28 2021, 8:52 PM.

Details

Reviewers
sbc100
Commits
rGfb7c36636ded: [yaml2obj][wasm] Support numeric relocation type

Diff Detail

Event Timeline

MaskRay created this revision.Jan 28 2021, 8:52 PM
Herald added subscribers: sunfish, hiraditya. · View Herald TranscriptJan 28 2021, 8:52 PM
MaskRay requested review of this revision.Jan 28 2021, 8:52 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 28 2021, 8:52 PM
Herald added subscribers: llvm-commits, aheejin. · View Herald Transcript
MaskRay mentioned this in D95163: [WebAssembly] Test that invalid symbol/relocation types generate errors.Jan 28 2021, 8:53 PM
Harbormaster completed remote builds in B87118: Diff 320039.Jan 28 2021, 9:26 PM
sbc100 accepted this revision.Feb 2 2021, 6:07 PM

Oh nice! Thanks.

I'll use this to remove the checked in binaries where possible.

This revision is now accepted and ready to land.Feb 2 2021, 6:07 PM
This revision was landed with ongoing or failed builds.Feb 2 2021, 6:28 PM
Closed by commit rGfb7c36636ded: [yaml2obj][wasm] Support numeric relocation type (authored by MaskRay). · Explain Why
This revision was automatically updated to reflect the committed changes.
MaskRay added a commit: rGfb7c36636ded: [yaml2obj][wasm] Support numeric relocation type.

Revision Contents

PathSize
llvm/
lib/
ObjectYAML/
1 line
test/
ObjectYAML/
wasm/
6 lines

Diff 320964

llvm/lib/ObjectYAML/WasmYAML.cpp

Show First 20 Lines • Show All 608 Lines • ▼ Show 20 Lines
#undef ECase #undef ECase
} }
void ScalarEnumerationTraits<WasmYAML::RelocType>::enumeration( void ScalarEnumerationTraits<WasmYAML::RelocType>::enumeration(
IO &IO, WasmYAML::RelocType &Type) { IO &IO, WasmYAML::RelocType &Type) {
#define WASM_RELOC(name, value) IO.enumCase(Type, #name, wasm::name); #define WASM_RELOC(name, value) IO.enumCase(Type, #name, wasm::name);
#include "llvm/BinaryFormat/WasmRelocs.def" #include "llvm/BinaryFormat/WasmRelocs.def"
#undef WASM_RELOC #undef WASM_RELOC
IO.enumFallback<Hex32>(Type);
} }
} // end namespace yaml } // end namespace yaml
} // end namespace llvm } // end namespace llvm

llvm/test/ObjectYAML/wasm/event_section.yaml

Show All 21 Lines Events:
- Index: 0 - Index: 0
Attribute: 0 Attribute: 0
SigIndex: 1 SigIndex: 1
- Type: CODE - Type: CODE
Relocations: Relocations:
- Type: R_WASM_EVENT_INDEX_LEB - Type: R_WASM_EVENT_INDEX_LEB
Index: 1 Index: 1
Offset: 0x00000006 Offset: 0x00000006
- Type: 10
Index: 1
Offset: 0x00000006
Functions: Functions:
- Index: 0 - Index: 0
Locals: Locals:
Body: 200008808080800041000B Body: 200008808080800041000B
- Type: CUSTOM - Type: CUSTOM
Name: linking Name: linking
Version: 2 Version: 2
SymbolTable: SymbolTable:
Show All 31 Lines
# CHECK-NEXT: - Index: 0 # CHECK-NEXT: - Index: 0
# CHECK-NEXT: Attribute: 0 # CHECK-NEXT: Attribute: 0
# CHECK-NEXT: SigIndex: 1 # CHECK-NEXT: SigIndex: 1
# CHECK-NEXT: - Type: CODE # CHECK-NEXT: - Type: CODE
# CHECK-NEXT: Relocations: # CHECK-NEXT: Relocations:
# CHECK-NEXT: - Type: R_WASM_EVENT_INDEX_LEB # CHECK-NEXT: - Type: R_WASM_EVENT_INDEX_LEB
# CHECK-NEXT: Index: 1 # CHECK-NEXT: Index: 1
# CHECK-NEXT: Offset: 0x6 # CHECK-NEXT: Offset: 0x6
# CHECK-NEXT: - Type: R_WASM_EVENT_INDEX_LEB
# CHECK-NEXT: Index: 1
# CHECK-NEXT: Offset: 0x6
# CHECK-NEXT: Functions: # CHECK-NEXT: Functions:
# CHECK-NEXT: - Index: 0 # CHECK-NEXT: - Index: 0
# CHECK-NEXT: Locals: # CHECK-NEXT: Locals:
# CHECK-NEXT: Body: 200008808080800041000B # CHECK-NEXT: Body: 200008808080800041000B
# CHECK-NEXT: - Type: CUSTOM # CHECK-NEXT: - Type: CUSTOM
# CHECK-NEXT: Name: linking # CHECK-NEXT: Name: linking
# CHECK-NEXT: Version: 2 # CHECK-NEXT: Version: 2
# CHECK-NEXT: SymbolTable: # CHECK-NEXT: SymbolTable:
Show All 10 Lines