[Mips] Add more relocation types and MIPS specific e_flags constants.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209201 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Simon Atanasyan 2014-05-20 09:27:49 +00:00
parent 6099306cec
commit 6943f62a41
4 changed files with 32 additions and 2 deletions

View File

@ -824,11 +824,12 @@ enum : unsigned {
EF_MIPS_ARCH_64 = 0x60000000, // MIPS64 instruction set per linux not elf.h
EF_MIPS_ARCH_32R2 = 0x70000000, // mips32r2
EF_MIPS_ARCH_64R2 = 0x80000000, // mips64r2
EF_MIPS_ARCH_32R6 = 0x90000000, // mips32r6
EF_MIPS_ARCH_64R6 = 0xa0000000, // mips64r6
EF_MIPS_ARCH = 0xf0000000 // Mask for applying EF_MIPS_ARCH_ variant
};
// ELF Relocation types for Mips
// .
enum {
R_MIPS_NONE = 0,
R_MIPS_16 = 1,
@ -881,6 +882,12 @@ enum {
R_MIPS_TLS_TPREL_HI16 = 49,
R_MIPS_TLS_TPREL_LO16 = 50,
R_MIPS_GLOB_DAT = 51,
R_MIPS_PC21_S2 = 60,
R_MIPS_PC26_S2 = 61,
R_MIPS_PC18_S3 = 62,
R_MIPS_PC19_S2 = 63,
R_MIPS_PCHI16 = 64,
R_MIPS_PCLO16 = 65,
R_MIPS16_GOT16 = 102,
R_MIPS16_HI16 = 104,
R_MIPS16_LO16 = 105,

View File

@ -159,6 +159,15 @@ StringRef getELFRelocationTypeName(uint32_t Machine, uint32_t Type) {
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_TLS_TPREL_HI16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_TLS_TPREL_LO16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_GLOB_DAT);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PC21_S2);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PC26_S2);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PC18_S3);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PC19_S2);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PCHI16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PCLO16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS16_GOT16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS16_HI16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS16_LO16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_COPY);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_JUMP_SLOT);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MICROMIPS_26_S1);
@ -177,6 +186,7 @@ StringRef getELFRelocationTypeName(uint32_t Machine, uint32_t Type) {
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MICROMIPS_TLS_TPREL_HI16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MICROMIPS_TLS_TPREL_LO16);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_NUM);
LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_MIPS_PC32);
default:
break;
}

View File

@ -275,6 +275,8 @@ void ScalarBitSetTraits<ELFYAML::ELF_EF>::bitset(IO &IO,
BCase(EF_MIPS_ARCH_64)
BCase(EF_MIPS_ARCH_32R2)
BCase(EF_MIPS_ARCH_64R2)
BCase(EF_MIPS_ARCH_32R6)
BCase(EF_MIPS_ARCH_64R6)
break;
case ELF::EM_HEXAGON:
BCase(EF_HEXAGON_MACH_V2)
@ -462,6 +464,15 @@ void ScalarEnumerationTraits<ELFYAML::ELF_REL>::enumeration(
ECase(R_MIPS_TLS_TPREL_HI16)
ECase(R_MIPS_TLS_TPREL_LO16)
ECase(R_MIPS_GLOB_DAT)
ECase(R_MIPS_PC21_S2)
ECase(R_MIPS_PC26_S2)
ECase(R_MIPS_PC18_S3)
ECase(R_MIPS_PC19_S2)
ECase(R_MIPS_PCHI16)
ECase(R_MIPS_PCLO16)
ECase(R_MIPS16_GOT16)
ECase(R_MIPS16_HI16)
ECase(R_MIPS16_LO16)
ECase(R_MIPS_COPY)
ECase(R_MIPS_JUMP_SLOT)
ECase(R_MICROMIPS_26_S1)

View File

@ -455,7 +455,9 @@ static const EnumEntry<unsigned> ElfHeaderMipsFlags[] = {
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_32),
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_64),
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_32R2),
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_64R2)
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_64R2),
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_32R6),
LLVM_READOBJ_ENUM_ENT(ELF, EF_MIPS_ARCH_64R6)
};
template<class ELFT>