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

Remove COFFYAML::Relocation.

Browse Source 
Use MappingNormalization to read a COFF::relocation directly.

No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179891 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-04-19 21:28:07 +00:00
parent 9c32678668
commit 7a7e83ae59
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/yaml2obj/yaml2obj.cpp
View File

@ -114,16 +114,10 @@ static bool hexStringToByteArray(StringRef Str, ContainerOut &Out) {
// The structure of the yaml files is not an exact 1:1 match to COFF. In order
// to use yaml::IO, we use these structures which are closer to the source.
namespace COFFYAML {
struct Relocation {
uint32_t VirtualAddress;
uint32_t SymbolTableIndex;
COFF::RelocationTypeX86 Type;
};
struct Section {
COFF::SectionCharacteristics Characteristics;
StringRef SectionData;
std::vector<Relocation> Relocations;
std::vector<COFF::relocation> Relocations;
StringRef Name;
};
@ -407,7 +401,7 @@ void writeCOFF(COFFParser &CP, raw_ostream &OS) {
OS.write(&CP.StringTable[0], CP.StringTable.size());
}
LLVM_YAML_IS_SEQUENCE_VECTOR(COFFYAML::Relocation)
LLVM_YAML_IS_SEQUENCE_VECTOR(COFF::relocation)
LLVM_YAML_IS_SEQUENCE_VECTOR(COFFYAML::Section)
LLVM_YAML_IS_SEQUENCE_VECTOR(COFFYAML::Symbol)
@ -646,9 +640,23 @@ struct MappingTraits<COFFYAML::Header> {
};
template <>
struct MappingTraits<COFFYAML::Relocation> {
static void mapping(IO &IO, COFFYAML::Relocation &Rel) {
IO.mapRequired("Type", Rel.Type);
struct MappingTraits<COFF::relocation> {
struct NormalizedType {
public:
NormalizedType(IO &) : Type(COFF::RelocationTypeX86(0)) {
}
NormalizedType(IO &, uint16_t T) : Type(COFF::RelocationTypeX86(T)) {
}
uint16_t denormalize(IO &) {
return Type;
}
COFF::RelocationTypeX86 Type;
};
static void mapping(IO &IO, COFF::relocation &Rel) {
MappingNormalization<NormalizedType, uint16_t> foo(IO, Rel.Type);
IO.mapRequired("Type", foo->Type);
IO.mapRequired("VirtualAddress", Rel.VirtualAddress);
IO.mapRequired("SymbolTableIndex", Rel.SymbolTableIndex);
}