[llvm-commits] [llvm] r53951 - in /llvm/trunk/lib/Target/Mips: MipsISelLowering.cpp MipsISelLowering.h MipsInstrInfo.td MipsTargetAsmInfo.cpp MipsTargetAsmInfo.h
Bruno Cardoso Lopes
bruno.cardoso at gmail.com
Wed Jul 23 09:01:52 PDT 2008
Author: bruno
Date: Wed Jul 23 11:01:50 2008
New Revision: 53951
URL: http://llvm.org/viewvc/llvm-project?rev=53951&view=rev
Log:
Minor fixes.
Added ConstantPool support.
Modified:
llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
llvm/trunk/lib/Target/Mips/MipsISelLowering.h
llvm/trunk/lib/Target/Mips/MipsInstrInfo.td
llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h
Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=53951&r1=53950&r2=53951&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Wed Jul 23 11:01:50 2008
@@ -86,7 +86,7 @@
setOperationAction(ISD::GlobalTLSAddress, MVT::i32, Custom);
setOperationAction(ISD::RET, MVT::Other, Custom);
setOperationAction(ISD::JumpTable, MVT::i32, Custom);
- setOperationAction(ISD::ConstantPool, MVT::f32, Custom);
+ setOperationAction(ISD::ConstantPool, MVT::i32, Custom);
setOperationAction(ISD::SELECT_CC, MVT::i32, Custom);
setOperationAction(ISD::SELECT_CC, MVT::f32, Custom);
@@ -234,10 +234,14 @@
return VReg;
}
+// A address must be loaded from a small section if its size is less than the
+// small section size threshold. Data in this section must be addressed using
+// gp_rel operator.
+bool MipsTargetLowering::IsInSmallSection(unsigned Size) {
+ return (Size > 0 && (Size <= Subtarget->getSSectionThreshold()));
+}
+
// Discover if this global address can be placed into small data/bss section.
-// This should happen for globals with size less than small section size
-// threshold in no abicall environments. Data in this section must be addressed
-// using gp_rel operator.
bool MipsTargetLowering::IsGlobalInSmallSection(GlobalValue *GV)
{
const TargetData *TD = getTargetData();
@@ -258,10 +262,7 @@
return false;
}
- if (Size > 0 && (Size <= Subtarget->getSSectionThreshold()))
- return true;
-
- return false;
+ return IsInSmallSection(Size);
}
//===----------------------------------------------------------------------===//
@@ -352,8 +353,24 @@
SDOperand MipsTargetLowering::
LowerConstantPool(SDOperand Op, SelectionDAG &DAG)
{
- assert(0 && "ConstantPool not implemented for MIPS.");
- return SDOperand(); // Not reached
+ SDOperand ResNode;
+ ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op);
+ Constant *C = N->getConstVal();
+ SDOperand CP = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment());
+
+ // gp_rel relocation
+ if (!Subtarget->hasABICall() &&
+ IsInSmallSection(getTargetData()->getABITypeSize(C->getType()))) {
+ SDOperand GPRelNode = DAG.getNode(MipsISD::GPRel, MVT::i32, CP);
+ SDOperand GOT = DAG.getNode(ISD::GLOBAL_OFFSET_TABLE, MVT::i32);
+ ResNode = DAG.getNode(ISD::ADD, MVT::i32, GOT, GPRelNode);
+ } else { // %hi/%lo relocation
+ SDOperand HiPart = DAG.getNode(MipsISD::Hi, MVT::i32, CP);
+ SDOperand Lo = DAG.getNode(MipsISD::Lo, MVT::i32, CP);
+ ResNode = DAG.getNode(ISD::ADD, MVT::i32, HiPart, Lo);
+ }
+
+ return ResNode;
}
//===----------------------------------------------------------------------===//
Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.h?rev=53951&r1=53950&r2=53951&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.h Wed Jul 23 11:01:50 2008
@@ -61,8 +61,6 @@
{
// FrameIndex for return slot.
int ReturnAddrIndex;
-
- // const MipsSubtarget &MipsSubTarget;
public:
explicit MipsTargetLowering(MipsTargetMachine &TM);
@@ -87,6 +85,7 @@
SDNode *LowerCallResult(SDOperand Chain, SDOperand InFlag, SDNode*TheCall,
unsigned CallingConv, SelectionDAG &DAG);
bool IsGlobalInSmallSection(GlobalValue *GV);
+ bool IsInSmallSection(unsigned Size);
// Lower Operand specifics
SDOperand LowerRET(SDOperand Op, SelectionDAG &DAG);
Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.td?rev=53951&r1=53950&r2=53951&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsInstrInfo.td (original)
+++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.td Wed Jul 23 11:01:50 2008
@@ -553,17 +553,24 @@
def : Pat<(MipsJmpLink CPURegs:$dst),
(JALR CPURegs:$dst)>;
-// GlobalAddress, Constant Pool, ExternalSymbol, and JumpTable
+// hi/lo relocs
def : Pat<(MipsHi tglobaladdr:$in), (LUi tglobaladdr:$in)>;
-//def : Pat<(MipsLo tglobaladdr:$in), (ADDiu ZERO, tglobaladdr:$in)>;
def : Pat<(add CPURegs:$hi, (MipsLo tglobaladdr:$lo)),
(ADDiu CPURegs:$hi, tglobaladdr:$lo)>;
+
def : Pat<(MipsHi tjumptable:$in), (LUi tjumptable:$in)>;
-//def : Pat<(MipsLo tjumptable:$in), (ADDiu ZERO, tjumptable:$in)>;
def : Pat<(add CPURegs:$hi, (MipsLo tjumptable:$lo)),
(ADDiu CPURegs:$hi, tjumptable:$lo)>;
+
+def : Pat<(MipsHi tconstpool:$in), (LUi tconstpool:$in)>;
+def : Pat<(add CPURegs:$hi, (MipsLo tconstpool:$lo)),
+ (ADDiu CPURegs:$hi, tconstpool:$lo)>;
+
+// gp_rel relocs
def : Pat<(add CPURegs:$gp, (MipsGPRel tglobaladdr:$in)),
(ADDiu CPURegs:$gp, tglobaladdr:$in)>;
+def : Pat<(add CPURegs:$gp, (MipsGPRel tconstpool:$in)),
+ (ADDiu CPURegs:$gp, tconstpool:$in)>;
// Mips does not have "not", so we expand our way
def : Pat<(not CPURegs:$in),
Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=53951&r1=53950&r2=53951&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Wed Jul 23 11:01:50 2008
@@ -19,7 +19,7 @@
MipsTargetAsmInfo::MipsTargetAsmInfo(const MipsTargetMachine &TM):
ELFTargetAsmInfo(TM) {
- MipsTM = &TM;
+ Subtarget = &TM.getSubtarget<MipsSubtarget>();
AlignmentIsInBytes = false;
COMMDirectiveTakesAlignment = true;
@@ -34,21 +34,25 @@
BSSSection = "\t.section\t.bss";
LCOMMDirective = "\t.lcomm\t";
CStringSection = ".rodata.str";
+ FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\", at progbits,4";
- if (!TM.getSubtarget<MipsSubtarget>().hasABICall())
+ if (!Subtarget->hasABICall()) {
JumpTableDirective = "\t.word\t";
- else
+ SmallDataSection = getNamedSection("\t.sdata", SectionFlags::Writeable);
+ SmallBSSSection = getNamedSection("\t.sbss", SectionFlags::Writeable |
+ SectionFlags::BSS);
+ } else
JumpTableDirective = "\t.gpword\t";
-
- SmallDataSection = getNamedSection("\t.sdata", SectionFlags::Writeable);
- SmallBSSSection = getNamedSection("\t.sbss",
- SectionFlags::Writeable | SectionFlags::BSS);
+
}
SectionKind::Kind
MipsTargetAsmInfo::SectionKindForGlobal(const GlobalValue *GV) const {
SectionKind::Kind K = ELFTargetAsmInfo::SectionKindForGlobal(GV);
+ if (Subtarget->hasABICall())
+ return K;
+
if (K != SectionKind::Data && K != SectionKind::BSS &&
K != SectionKind::RODataMergeConst)
return K;
@@ -56,8 +60,7 @@
if (isa<GlobalVariable>(GV)) {
const TargetData *TD = ETM->getTargetData();
unsigned Size = TD->getABITypeSize(GV->getType()->getElementType());
- unsigned Threshold =
- MipsTM->getSubtarget<MipsSubtarget>().getSSectionThreshold();
+ unsigned Threshold = Subtarget->getSSectionThreshold();
if (Size > 0 && Size <= Threshold) {
if (K == SectionKind::BSS)
Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h?rev=53951&r1=53950&r2=53951&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h Wed Jul 23 11:01:50 2008
@@ -14,11 +14,12 @@
#ifndef MIPSTARGETASMINFO_H
#define MIPSTARGETASMINFO_H
-#include "llvm/Target/TargetAsmInfo.h"
-#include "llvm/Target/ELFTargetAsmInfo.h"
+#include "MipsSubtarget.h"
#include "llvm/DerivedTypes.h"
#include "llvm/GlobalVariable.h"
+#include "llvm/Target/TargetAsmInfo.h"
#include "llvm/Target/TargetOptions.h"
+#include "llvm/Target/ELFTargetAsmInfo.h"
namespace llvm {
@@ -36,8 +37,7 @@
virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
private:
- const MipsTargetMachine *MipsTM;
-
+ const MipsSubtarget *Subtarget;
};
} // namespace llvm
More information about the llvm-commits
mailing list