6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-07 12:28:24 +00:00
Code Issues Projects Releases Wiki Activity

change a bunch of logic in LowerGlobalAddress to leverage the work

Browse Source 
done in ClassifyGlobalReference instead of reconstructing the info
awkwardly.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75240 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2009-07-10 07:34:39 +00:00
parent 7478ab8502
commit 36c2501121
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Target/X86/X86ISelLowering.cpp
View File

@@ -4552,17 +4552,12 @@ SDValue
X86TargetLowering::LowerGlobalAddress(const GlobalValue *GV, DebugLoc dl, X86TargetLowering::LowerGlobalAddress(const GlobalValue *GV, DebugLoc dl,
int64_t Offset, int64_t Offset,
SelectionDAG &DAG) const { SelectionDAG &DAG) const {
bool IsPIC = getTargetMachine().getRelocationModel() == Reloc::PIC_;
// Create the TargetGlobalAddress node, folding in the constant // Create the TargetGlobalAddress node, folding in the constant
// offset if it is legal. // offset if it is legal.
unsigned char OpFlags = unsigned char OpFlags =
Subtarget->ClassifyGlobalReference(GV, getTargetMachine()); Subtarget->ClassifyGlobalReference(GV, getTargetMachine());
bool ExtraLoadRequired = isGlobalStubReference(OpFlags);
SDValue Result; SDValue Result;
if (!IsPIC && !ExtraLoadRequired && isInt32(Offset)) { if (OpFlags == X86II::MO_NO_FLAG && isInt32(Offset)) {
// A direct static reference to a global. // A direct static reference to a global.
Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), Offset); Result = DAG.getTargetGlobalAddress(GV, getPointerTy(), Offset);
Offset = 0; Offset = 0;
@@ -4577,18 +4572,15 @@ X86TargetLowering::LowerGlobalAddress(const GlobalValue *GV, DebugLoc dl,
Result = DAG.getNode(X86ISD::Wrapper, dl, getPointerTy(), Result); Result = DAG.getNode(X86ISD::Wrapper, dl, getPointerTy(), Result);
// With PIC, the address is actually $g + Offset. // With PIC, the address is actually $g + Offset.
if (IsPIC && !Subtarget->is64Bit()) { if (isGlobalRelativeToPICBase(OpFlags)) {
Result = DAG.getNode(ISD::ADD, dl, getPointerTy(), Result = DAG.getNode(ISD::ADD, dl, getPointerTy(),
DAG.getNode(X86ISD::GlobalBaseReg, dl, getPointerTy()), DAG.getNode(X86ISD::GlobalBaseReg, dl, getPointerTy()),
Result); Result);
} }
// For Darwin & Mingw32, external and weak symbols are indirect, so we want to // For globals that require a load from a stub to get the address, emit the
// load the value at address GV, not the value of GV itself. This means that // load.
// the GlobalAddress must be in the base or index register of the address, not if (isGlobalStubReference(OpFlags))
// the GV offset field. Platform check is inside GVRequiresExtraLoad() call
// The same applies for external symbols during PIC codegen
if (ExtraLoadRequired)
Result = DAG.getLoad(getPointerTy(), dl, DAG.getEntryNode(), Result, Result = DAG.getLoad(getPointerTy(), dl, DAG.getEntryNode(), Result,
PseudoSourceValue::getGOT(), 0); PseudoSourceValue::getGOT(), 0);
@@ -8810,16 +8802,17 @@ void X86TargetLowering::LowerAsmOperandForConstraint(SDValue Op,
return; return;
} }
GlobalValue *GV = GA->getGlobal();
// If we require an extra load to get this address, as in PIC mode, we // If we require an extra load to get this address, as in PIC mode, we
// can't accept it. // can't accept it.
if (Subtarget->GVRequiresExtraLoad(GA->getGlobal(), getTargetMachine())) if (isGlobalStubReference(Subtarget->ClassifyGlobalReference(GV,
getTargetMachine())))
return; return;
if (hasMemory) if (hasMemory)
Op = LowerGlobalAddress(GA->getGlobal(), Op.getDebugLoc(), Offset, DAG); Op = LowerGlobalAddress(GV, Op.getDebugLoc(), Offset, DAG);
else else
Op = DAG.getTargetGlobalAddress(GA->getGlobal(), GA->getValueType(0), Op = DAG.getTargetGlobalAddress(GV, GA->getValueType(0), Offset);
Offset);
Result = Op; Result = Op;
break; break;
} }