[llvm] r371185 - [yaml2obj] Rename SHOffset (e_shoff) field to SHOff. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 6 02:23:18 PDT 2019
Author: maskray
Date: Fri Sep 6 02:23:17 2019
New Revision: 371185
URL: http://llvm.org/viewvc/llvm-project?rev=371185&view=rev
Log:
[yaml2obj] Rename SHOffset (e_shoff) field to SHOff. NFC
`struct Elf*_Shdr` has a field `sh_offset`, named `ShOffset` in
llvm::ELFYAML::Section. Rename SHOffset (e_shoff) to SHOff to prevent confusion.
Reviewed By: grimar
Differential Revision: https://reviews.llvm.org/D67254
Modified:
llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h
llvm/trunk/lib/ObjectYAML/ELFEmitter.cpp
llvm/trunk/lib/ObjectYAML/ELFYAML.cpp
llvm/trunk/test/Object/invalid.test
llvm/trunk/test/tools/yaml2obj/elf-header-sh-fields.yaml
llvm/trunk/tools/obj2yaml/elf2yaml.cpp
Modified: llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h?rev=371185&r1=371184&r2=371185&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h (original)
+++ llvm/trunk/include/llvm/ObjectYAML/ELFYAML.h Fri Sep 6 02:23:17 2019
@@ -75,7 +75,7 @@ struct FileHeader {
llvm::yaml::Hex64 Entry;
Optional<llvm::yaml::Hex16> SHEntSize;
- Optional<llvm::yaml::Hex64> SHOffset;
+ Optional<llvm::yaml::Hex64> SHOff;
Optional<llvm::yaml::Hex16> SHNum;
Optional<llvm::yaml::Hex16> SHStrNdx;
};
Modified: llvm/trunk/lib/ObjectYAML/ELFEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/ELFEmitter.cpp?rev=371185&r1=371184&r2=371185&view=diff
==============================================================================
--- llvm/trunk/lib/ObjectYAML/ELFEmitter.cpp (original)
+++ llvm/trunk/lib/ObjectYAML/ELFEmitter.cpp Fri Sep 6 02:23:17 2019
@@ -234,11 +234,10 @@ void ELFState<ELFT>::writeELFHeader(Cont
Doc.Header.SHEntSize ? (uint16_t)*Doc.Header.SHEntSize : sizeof(Elf_Shdr);
// Immediately following the ELF header and program headers.
// Align the start of the section header and write the ELF header.
- uint64_t ShOffset;
- CBA.getOSAndAlignedOffset(ShOffset, sizeof(typename ELFT::uint));
- Header.e_shoff = Doc.Header.SHOffset
- ? typename ELFT::uint(*Doc.Header.SHOffset)
- : ShOffset;
+ uint64_t SHOff;
+ CBA.getOSAndAlignedOffset(SHOff, sizeof(typename ELFT::uint));
+ Header.e_shoff =
+ Doc.Header.SHOff ? typename ELFT::uint(*Doc.Header.SHOff) : SHOff;
Header.e_shnum =
Doc.Header.SHNum ? (uint16_t)*Doc.Header.SHNum : Doc.Sections.size();
Header.e_shstrndx = Doc.Header.SHStrNdx ? (uint16_t)*Doc.Header.SHStrNdx
Modified: llvm/trunk/lib/ObjectYAML/ELFYAML.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/ELFYAML.cpp?rev=371185&r1=371184&r2=371185&view=diff
==============================================================================
--- llvm/trunk/lib/ObjectYAML/ELFYAML.cpp (original)
+++ llvm/trunk/lib/ObjectYAML/ELFYAML.cpp Fri Sep 6 02:23:17 2019
@@ -824,7 +824,7 @@ void MappingTraits<ELFYAML::FileHeader>:
IO.mapOptional("Entry", FileHdr.Entry, Hex64(0));
IO.mapOptional("SHEntSize", FileHdr.SHEntSize);
- IO.mapOptional("SHOffset", FileHdr.SHOffset);
+ IO.mapOptional("SHOff", FileHdr.SHOff);
IO.mapOptional("SHNum", FileHdr.SHNum);
IO.mapOptional("SHStrNdx", FileHdr.SHStrNdx);
}
Modified: llvm/trunk/test/Object/invalid.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/invalid.test?rev=371185&r1=371184&r2=371185&view=diff
==============================================================================
--- llvm/trunk/test/Object/invalid.test (original)
+++ llvm/trunk/test/Object/invalid.test Fri Sep 6 02:23:17 2019
@@ -597,7 +597,7 @@ Sections:
- Type: SHT_NULL
Size: 288230376151711744
-## Check the case when SHOffset is too large. SHOffset + sizeof(Elf_Shdr) overflows the uint64 type.
+## Check the case when SHOff is too large. SHOff + sizeof(Elf_Shdr) overflows the uint64 type.
# RUN: yaml2obj --docnum=28 %s -o %t28
# RUN: not llvm-readobj -h %t28 2>&1 | FileCheck -DFILE=%t28 --check-prefix=INVALID-SEC-NUM3 %s
@@ -610,7 +610,7 @@ FileHeader:
Data: ELFDATA2LSB
Type: ET_REL
Machine: EM_X86_64
- SHOffset: 0xffffffffffffffff
+ SHOff: 0xffffffffffffffff
## Check that llvm-objdump reports an error when it tries to dump a
## symbol name and .strtab is empty.
Modified: llvm/trunk/test/tools/yaml2obj/elf-header-sh-fields.yaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/yaml2obj/elf-header-sh-fields.yaml?rev=371185&r1=371184&r2=371185&view=diff
==============================================================================
--- llvm/trunk/test/tools/yaml2obj/elf-header-sh-fields.yaml (original)
+++ llvm/trunk/test/tools/yaml2obj/elf-header-sh-fields.yaml Fri Sep 6 02:23:17 2019
@@ -35,7 +35,7 @@ FileHeader:
Type: ET_REL
Machine: EM_X86_64
SHEntSize: 64
- SHOffset: 2
+ SHOff: 2
SHNum: 3
SHStrNdx: 4
@@ -56,6 +56,6 @@ FileHeader:
Type: ET_REL
Machine: EM_X86_64
SHEntSize: 1
- SHOffset: 2
+ SHOff: 2
SHNum: 3
SHStrNdx: 4
Modified: llvm/trunk/tools/obj2yaml/elf2yaml.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/elf2yaml.cpp?rev=371185&r1=371184&r2=371185&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/elf2yaml.cpp (original)
+++ llvm/trunk/tools/obj2yaml/elf2yaml.cpp Fri Sep 6 02:23:17 2019
@@ -139,7 +139,7 @@ ELFDumper<ELFT>::getUniquedSymbolName(co
template <class ELFT> Expected<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
auto Y = std::make_unique<ELFYAML::Object>();
- // Dump header. We do not dump SHEntSize, SHOffset, SHNum and SHStrNdx field.
+ // Dump header. We do not dump SHEntSize, SHOff, SHNum and SHStrNdx fields.
// When not explicitly set, the values are set by yaml2obj automatically
// and there is no need to dump them here.
Y->Header.Class = ELFYAML::ELF_ELFCLASS(Obj.getHeader()->getFileClass());
More information about the llvm-commits
mailing list