6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-09 10:29:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix dubious type name similar to member name.

Browse Source 
Should bring bots back to life.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183715 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sean Silva 2013-06-11 00:13:52 +00:00
parent 981aec814c
commit 457c8ebfd0
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/Object/ELFYAML.h
View File

@ -39,7 +39,7 @@ LLVM_YAML_STRONG_TYPEDEF(uint8_t, ELF_ELFDATA)
// For now, hardcode 64 bits everywhere that 32 or 64 would be needed
// since 64-bit can hold 32-bit values too.
struct Header {
struct FileHeader {
ELF_ELFCLASS Class;
ELF_ELFDATA Data;
ELF_ET Type;
@ -47,7 +47,7 @@ struct Header {
llvm::yaml::Hex64 Entry;
};
struct Object {
Header Header;
FileHeader Header;
};
} // end namespace ELFYAML
@ -77,8 +77,8 @@ struct ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA> {
};
template <>
struct MappingTraits<ELFYAML::Header> {
static void mapping(IO &IO, ELFYAML::Header &Header);
struct MappingTraits<ELFYAML::FileHeader> {
static void mapping(IO &IO, ELFYAML::FileHeader &FileHdr);
};
template <>

14
lib/Object/ELFYAML.cpp
View File

@ -212,16 +212,16 @@ void ScalarEnumerationTraits<ELFYAML::ELF_ELFDATA>::enumeration(
#undef ECase
}
void MappingTraits<ELFYAML::Header>::mapping(IO &IO, ELFYAML::Header &Header) {
IO.mapRequired("Class", Header.Class);
IO.mapRequired("Data", Header.Data);
IO.mapRequired("Type", Header.Type);
IO.mapRequired("Machine", Header.Machine);
IO.mapOptional("Entry", Header.Entry, Hex64(0));
void MappingTraits<ELFYAML::FileHeader>::mapping(IO &IO, ELFYAML::FileHeader &FileHdr) {
IO.mapRequired("Class", FileHdr.Class);
IO.mapRequired("Data", FileHdr.Data);
IO.mapRequired("Type", FileHdr.Type);
IO.mapRequired("Machine", FileHdr.Machine);
IO.mapOptional("Entry", FileHdr.Entry, Hex64(0));
}
void MappingTraits<ELFYAML::Object>::mapping(IO &IO, ELFYAML::Object &Object) {
IO.mapRequired("Header", Object.Header);
IO.mapRequired("FileHeader", Object.Header);
}
} // end namespace yaml

2
test/Object/Inputs/ELF/BE32.yaml
View File

@ -1,5 +1,5 @@
!ELF
Header: !Header
FileHeader: !FileHeader
Class: ELFCLASS32
Data: ELFDATA2MSB
Type: ET_EXEC

2
test/Object/Inputs/ELF/BE64.yaml
View File

@ -1,5 +1,5 @@
!ELF
Header: !Header
FileHeader: !FileHeader
Class: ELFCLASS64
Data: ELFDATA2MSB
Type: ET_EXEC

2
test/Object/Inputs/ELF/Header.yaml
View File

@ -1,5 +1,5 @@
!ELF
Header: !Header
FileHeader: !FileHeader
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC

2
test/Object/Inputs/ELF/LE32.yaml
View File

@ -1,5 +1,5 @@
!ELF
Header: !Header
FileHeader: !FileHeader
Class: ELFCLASS32
Data: ELFDATA2LSB
Type: ET_EXEC

2
test/Object/Inputs/ELF/LE64.yaml
View File

@ -1,5 +1,5 @@
!ELF
Header: !Header
FileHeader: !FileHeader
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC

2
tools/yaml2obj/yaml2elf.cpp
View File

@ -24,7 +24,7 @@ using namespace llvm;
template <class ELFT>
static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) {
const ELFYAML::Header &Hdr = Doc.Header;
const ELFYAML::FileHeader &Hdr = Doc.Header;
using namespace llvm::ELF;
using namespace llvm::object;
typename ELFObjectFile<ELFT>::Elf_Ehdr Header;