RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-22 05:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This allows hello world to be compiled for Mips 64 direct object.

Browse Source 
It takes advantage of r159299 which introduces relocation support for N64. 
elf-dump needed to be upgraded to support N64 relocations as well.

This passes make check.

Jack


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159301 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jack Carter 2012-06-27 22:48:25 +00:00
parent 36b8fed61d
commit 0140e55393
5 changed files with 83 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp
View File

@ -36,6 +36,10 @@ static unsigned adjustFixupValue(unsigned Kind, uint64_t Value) {
case FK_GPRel_4:
case FK_Data_4:
case Mips::fixup_Mips_LO16:
case Mips::fixup_Mips_GPOFF_HI:
case Mips::fixup_Mips_GPOFF_LO:
case Mips::fixup_Mips_GOT_PAGE:
case Mips::fixup_Mips_GOT_OFST:
break;
case Mips::fixup_Mips_PC16:
// So far we are only using this type for branches.
@ -157,7 +161,11 @@ public:
{ "fixup_Mips_TLSLDM", 0, 16, 0 },
{ "fixup_Mips_DTPREL_HI", 0, 16, 0 },
{ "fixup_Mips_DTPREL_LO", 0, 16, 0 },
{ "fixup_Mips_Branch_PCRel", 0, 16, MCFixupKindInfo::FKF_IsPCRel }
{ "fixup_Mips_Branch_PCRel", 0, 16, MCFixupKindInfo::FKF_IsPCRel },
{ "fixup_Mips_GPOFF_HI", 0, 16, 0 },
{ "fixup_Mips_GPOFF_LO", 0, 16, 0 },
{ "fixup_Mips_GOT_PAGE", 0, 16, 0 },
{ "fixup_Mips_GOT_OFST", 0, 16, 0 }
};
if (Kind < FirstTargetFixupKind)

16
lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
View File

@ -150,6 +150,22 @@ unsigned MipsELFObjectWriter::GetRelocType(const MCValue &Target,
case Mips::fixup_Mips_PC16:
Type = ELF::R_MIPS_PC16;
break;
case Mips::fixup_Mips_GOT_PAGE:
Type = ELF::R_MIPS_GOT_PAGE;
break;
case Mips::fixup_Mips_GOT_OFST:
Type = ELF::R_MIPS_GOT_OFST;
break;
case Mips::fixup_Mips_GPOFF_HI:
Type = setRType((unsigned)ELF::R_MIPS_GPREL16, Type);
Type = setRType2((unsigned)ELF::R_MIPS_SUB, Type);
Type = setRType3((unsigned)ELF::R_MIPS_HI16, Type);
break;
case Mips::fixup_Mips_GPOFF_LO:
Type = setRType((unsigned)ELF::R_MIPS_GPREL16, Type);
Type = setRType2((unsigned)ELF::R_MIPS_SUB, Type);
Type = setRType3((unsigned)ELF::R_MIPS_LO16, Type);
break;
}
return Type;
}

12
lib/Target/Mips/MCTargetDesc/MipsFixupKinds.h
View File

@ -95,6 +95,18 @@ namespace Mips {
// PC relative branch fixup resulting in - R_MIPS_PC16
fixup_Mips_Branch_PCRel,
// resulting in - R_MIPS_GPREL16/R_MIPS_SUB/R_MIPS_HI16
fixup_Mips_GPOFF_HI,
// resulting in - R_MIPS_GPREL16/R_MIPS_SUB/R_MIPS_LO16
fixup_Mips_GPOFF_LO,
// resulting in - R_MIPS_PAGE
fixup_Mips_GOT_PAGE,
// resulting in - R_MIPS_GOT_OFST
fixup_Mips_GOT_OFST,
// Marker
LastTargetFixupKind,
NumTargetFixupKinds = LastTargetFixupKind - FirstTargetFixupKind

19
lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
View File

@ -199,6 +199,23 @@ getMachineOpValue(const MCInst &MI, const MCOperand &MO,
Mips::Fixups FixupKind = Mips::Fixups(0);
switch(cast<MCSymbolRefExpr>(Expr)->getKind()) {
default: llvm_unreachable("Unknown fixup kind!");
break;
case MCSymbolRefExpr::VK_Mips_GOT_DISP :
llvm_unreachable("fixup kind VK_Mips_GOT_DISP not supported for direct object!");
break;
case MCSymbolRefExpr::VK_Mips_GPOFF_HI :
FixupKind = Mips::fixup_Mips_GPOFF_HI;
break;
case MCSymbolRefExpr::VK_Mips_GPOFF_LO :
FixupKind = Mips::fixup_Mips_GPOFF_LO;
break;
case MCSymbolRefExpr::VK_Mips_GOT_PAGE :
FixupKind = Mips::fixup_Mips_GOT_PAGE;
break;
case MCSymbolRefExpr::VK_Mips_GOT_OFST :
FixupKind = Mips::fixup_Mips_GOT_OFST;
break;
case MCSymbolRefExpr::VK_Mips_GPREL:
FixupKind = Mips::fixup_Mips_GPREL16;
break;
@ -238,8 +255,6 @@ getMachineOpValue(const MCInst &MI, const MCOperand &MO,
case MCSymbolRefExpr::VK_Mips_TPREL_LO:
FixupKind = Mips::fixup_Mips_TPREL_LO;
break;
default:
break;
} // switch
Fixups.push_back(MCFixup::Create(0, MO.getExpr(), MCFixupKind(FixupKind)));

38
test/Scripts/elf-dump
View File

@ -15,6 +15,7 @@ class Reader:
self.file = open(path, "rb")
self.isLSB = None
self.is64Bit = None
self.isN64 = False
def seek(self, pos):
self.file.seek(pos)
@ -122,15 +123,28 @@ def dumpRel(f, section, dumprela = False):
f.seek(section.sh_offset[0] + index * section.sh_entsize[0])
print " # Relocation %s" % index
print " (('r_offset', %s)" % common_dump.HexDump(f.readWord())
r_info = f.readWord()[0]
if f.is64Bit:
r_sym = (r_info >> 32, 32)
r_type = (r_info & 0xffffffff, 32)
if f.isN64:
r_sym = f.read32()
r_ssym = f.read8()
r_type3 = f.read8()
r_type2 = f.read8()
r_type = f.read8()
print " ('r_sym', %s)" % common_dump.HexDump(r_sym)
print " ('r_ssym', %s)" % common_dump.HexDump(r_ssym)
print " ('r_type3', %s)" % common_dump.HexDump(r_type3)
print " ('r_type2', %s)" % common_dump.HexDump(r_type2)
print " ('r_type', %s)" % common_dump.HexDump(r_type)
else:
r_sym = (r_info >> 8, 24)
r_type = (r_info & 0xff, 8)
print " ('r_sym', %s)" % common_dump.HexDump(r_sym)
print " ('r_type', %s)" % common_dump.HexDump(r_type)
r_info = f.readWord()[0]
if f.is64Bit:
r_sym = (r_info >> 32, 32)
r_type = (r_info & 0xffffffff, 32)
else:
r_sym = (r_info >> 8, 24)
r_type = (r_info & 0xff, 8)
print " ('r_sym', %s)" % common_dump.HexDump(r_sym)
print " ('r_type', %s)" % common_dump.HexDump(r_type)
if dumprela:
print " ('r_addend', %s)" % common_dump.HexDump(f.readWord())
print " ),"
@ -166,7 +180,13 @@ def dumpELF(path, opts):
f.seek(16) # Seek to end of e_ident.
print "('e_type', %s)" % common_dump.HexDump(f.read16())
print "('e_machine', %s)" % common_dump.HexDump(f.read16())
# Does any other architecture use N64?
e_machine = f.read16()
if e_machine[0] == 0x0008 and f.is64Bit: # EM_MIPS && 64 bit
f.isN64 = True
print "('e_machine', %s)" % common_dump.HexDump(e_machine)
print "('e_version', %s)" % common_dump.HexDump(f.read32())
print "('e_entry', %s)" % common_dump.HexDump(f.readWord())
print "('e_phoff', %s)" % common_dump.HexDump(f.readWord())