mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-03 09:21:02 +00:00
Support PIC loading of constant pool entries
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89863 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
5b512fe527
commit
d71cebf575
@ -144,6 +144,7 @@ SelectAddr(SDValue Op, SDValue Addr, SDValue &Offset, SDValue &Base)
|
||||
// on PIC code Load GA
|
||||
if (TM.getRelocationModel() == Reloc::PIC_) {
|
||||
if ((Addr.getOpcode() == ISD::TargetGlobalAddress) ||
|
||||
(Addr.getOpcode() == ISD::TargetConstantPool) ||
|
||||
(Addr.getOpcode() == ISD::TargetJumpTable)){
|
||||
Base = CurDAG->getRegister(Mips::GP, MVT::i32);
|
||||
Offset = Addr;
|
||||
@ -174,23 +175,21 @@ SelectAddr(SDValue Op, SDValue Addr, SDValue &Offset, SDValue &Base)
|
||||
}
|
||||
|
||||
// When loading from constant pools, load the lower address part in
|
||||
// the instruction itself. Instead of:
|
||||
// the instruction itself. Example, instead of:
|
||||
// lui $2, %hi($CPI1_0)
|
||||
// addiu $2, $2, %lo($CPI1_0)
|
||||
// lwc1 $f0, 0($2)
|
||||
// Generate:
|
||||
// lui $2, %hi($CPI1_0)
|
||||
// lwc1 $f0, %lo($CPI1_0)($2)
|
||||
if (Addr.getOperand(0).getOpcode() == MipsISD::Hi &&
|
||||
if ((Addr.getOperand(0).getOpcode() == MipsISD::Hi ||
|
||||
Addr.getOperand(0).getOpcode() == ISD::LOAD) &&
|
||||
Addr.getOperand(1).getOpcode() == MipsISD::Lo) {
|
||||
SDValue LoVal = Addr.getOperand(1);
|
||||
if (ConstantPoolSDNode *CP = dyn_cast<ConstantPoolSDNode>(
|
||||
LoVal.getOperand(0))) {
|
||||
if (!CP->getOffset()) {
|
||||
Base = Addr.getOperand(0);
|
||||
Offset = LoVal.getOperand(0);
|
||||
return true;
|
||||
}
|
||||
if (dyn_cast<ConstantPoolSDNode>(LoVal.getOperand(0))) {
|
||||
Base = Addr.getOperand(0);
|
||||
Offset = LoVal.getOperand(0);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -563,8 +563,6 @@ LowerConstantPool(SDValue Op, SelectionDAG &DAG)
|
||||
SDValue ResNode;
|
||||
ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op);
|
||||
Constant *C = N->getConstVal();
|
||||
SDValue CP = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
|
||||
N->getOffset(), MipsII::MO_ABS_HILO);
|
||||
// FIXME there isn't actually debug info here
|
||||
DebugLoc dl = Op.getDebugLoc();
|
||||
|
||||
@ -577,11 +575,21 @@ LowerConstantPool(SDValue Op, SelectionDAG &DAG)
|
||||
// SDValue GPRelNode = DAG.getNode(MipsISD::GPRel, MVT::i32, CP);
|
||||
// SDValue GOT = DAG.getGLOBAL_OFFSET_TABLE(MVT::i32);
|
||||
// ResNode = DAG.getNode(ISD::ADD, MVT::i32, GOT, GPRelNode);
|
||||
//} else { // %hi/%lo relocation
|
||||
|
||||
if (getTargetMachine().getRelocationModel() != Reloc::PIC_) {
|
||||
SDValue CP = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
|
||||
N->getOffset(), MipsII::MO_ABS_HILO);
|
||||
SDValue HiPart = DAG.getNode(MipsISD::Hi, dl, MVT::i32, CP);
|
||||
SDValue Lo = DAG.getNode(MipsISD::Lo, dl, MVT::i32, CP);
|
||||
ResNode = DAG.getNode(ISD::ADD, dl, MVT::i32, HiPart, Lo);
|
||||
//}
|
||||
} else {
|
||||
SDValue CP = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
|
||||
N->getOffset(), MipsII::MO_GOT);
|
||||
SDValue Load = DAG.getLoad(MVT::i32, dl, DAG.getEntryNode(),
|
||||
CP, NULL, 0);
|
||||
SDValue Lo = DAG.getNode(MipsISD::Lo, dl, MVT::i32, CP);
|
||||
ResNode = DAG.getNode(ISD::ADD, dl, MVT::i32, Load, Lo);
|
||||
}
|
||||
|
||||
return ResNode;
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ target triple = "mips-unknown-linux"
|
||||
|
||||
define float @h() nounwind readnone {
|
||||
entry:
|
||||
; CHECK: lui $2, %hi($CPI1_0)
|
||||
; CHECK: lw $2, %got($CPI1_0)($gp)
|
||||
; CHECK: lwc1 $f0, %lo($CPI1_0)($2)
|
||||
ret float 0x400B333340000000
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user