6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-30 06:38:14 +00:00
Code Issues Projects Releases Wiki Activity

[PPC] Use alias symbols in address computation.

Browse Source 
This seems to match what gcc does for ppc and what every other llvm
backend does.

This is a fixed version of r209638. The difference is to avoid any change
in behavior for functions. The logic for using constant pools for function
addresseses is spread over a few places and we have to keep them in sync.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209821 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-05-29 15:41:38 +00:00
parent f5df18bff0
commit 289a9d75de
3 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Target/PowerPC/PPCAsmPrinter.cpp
View File

@ -380,15 +380,12 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
bool IsAvailExt = false; bool IsAvailExt = false;
if (MO.isGlobal()) { if (MO.isGlobal()) {
const GlobalValue *GValue = MO.getGlobal(); const GlobalValue *GV = MO.getGlobal();
const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); MOSymbol = getSymbol(GV);
const GlobalValue *RealGValue = GAlias ? GAlias->getAliasee() : GValue; IsExternal = GV->isDeclaration();
MOSymbol = getSymbol(RealGValue); IsCommon = GV->hasCommonLinkage();
const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue); IsFunction = GV->getType()->getElementType()->isFunctionTy();
IsExternal = GVar && !GVar->hasInitializer(); IsAvailExt = GV->hasAvailableExternallyLinkage();
IsCommon = GVar && RealGValue->hasCommonLinkage();
IsFunction = !GVar;
IsAvailExt = GVar && RealGValue->hasAvailableExternallyLinkage();
} else if (MO.isCPI()) } else if (MO.isCPI())
MOSymbol = GetCPISymbol(MO.getIndex()); MOSymbol = GetCPISymbol(MO.getIndex());
else if (MO.isJTI()) else if (MO.isJTI())
@ -427,13 +424,10 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
} }
else if (MO.isGlobal()) { else if (MO.isGlobal()) {
const GlobalValue *GValue = MO.getGlobal(); const GlobalValue *GValue = MO.getGlobal();
const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); MOSymbol = getSymbol(GValue);
const GlobalValue *RealGValue = GAlias ? GAlias->getAliasee() : GValue; if (GValue->getType()->getElementType()->isFunctionTy() ||
MOSymbol = getSymbol(RealGValue); GValue->isDeclaration() || GValue->hasCommonLinkage() ||
const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue); GValue->hasAvailableExternallyLinkage() ||
if (!GVar || !GVar->hasInitializer() || RealGValue->hasCommonLinkage() ||
RealGValue->hasAvailableExternallyLinkage() ||
TM.getCodeModel() == CodeModel::Large) TM.getCodeModel() == CodeModel::Large)
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol); MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
} }
@ -460,13 +454,10 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
bool IsFunction = false; bool IsFunction = false;
if (MO.isGlobal()) { if (MO.isGlobal()) {
const GlobalValue *GValue = MO.getGlobal(); const GlobalValue *GV = MO.getGlobal();
const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); MOSymbol = getSymbol(GV);
const GlobalValue *RealGValue = GAlias ? GAlias->getAliasee() : GValue; IsExternal = GV->isDeclaration();
MOSymbol = getSymbol(RealGValue); IsFunction = GV->getType()->getElementType()->isFunctionTy();
const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue);
IsExternal = GVar && !GVar->hasInitializer();
IsFunction = !GVar;
} else if (MO.isCPI()) } else if (MO.isCPI())
MOSymbol = GetCPISymbol(MO.getIndex()); MOSymbol = GetCPISymbol(MO.getIndex());

14
lib/Target/PowerPC/PPCISelDAGToDAG.cpp
View File

@ -1472,17 +1472,9 @@ SDNode *PPCDAGToDAGISel::Select(SDNode *N) {
if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(GA)) { if (GlobalAddressSDNode *G = dyn_cast<GlobalAddressSDNode>(GA)) {
const GlobalValue *GValue = G->getGlobal(); const GlobalValue *GValue = G->getGlobal();
const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); if (GValue->getType()->getElementType()->isFunctionTy() ||
const GlobalValue *RealGValue = GAlias ? GAlias->getAliasee() : GValue; GValue->isDeclaration() || GValue->hasCommonLinkage() ||
const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue); GValue->hasAvailableExternallyLinkage())
assert((GVar || isa<Function>(RealGValue)) &&
"Unexpected global value subclass!");
// An external variable is one without an initializer. For these,
// for variables with common linkage, and for Functions, generate
// the LDtocL form.
if (!GVar || !GVar->hasInitializer() || RealGValue->hasCommonLinkage() ||
RealGValue->hasAvailableExternallyLinkage())
return CurDAG->getMachineNode(PPC::LDtocL, dl, MVT::i64, GA, return CurDAG->getMachineNode(PPC::LDtocL, dl, MVT::i64, GA,
SDValue(Tmp, 0)); SDValue(Tmp, 0));
} }

31
test/CodeGen/PowerPC/alias.ll Normal file
View File

@ -0,0 +1,31 @@
; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -code-model=medium| FileCheck --check-prefix=CHECK --check-prefix=MEDIUM %s
; RUN: llc < %s -mtriple=powerpc64-unknown-linux-gnu -code-model=large | FileCheck --check-prefix=CHECK --check-prefix=LARGE %s
@foo = global i32 42
@fooa = alias i32* @foo
@foo2 = global i64 42
@foo2a = alias i64* @foo2
; CHECK-LABEL: bar:
define i32 @bar() {
; MEDIUM: addis 3, 2, fooa@toc@ha
; LARGE: addis 3, 2, .LC1@toc@ha
%a = load i32* @fooa
ret i32 %a
}
; CHECK-LABEL: bar2:
define i64 @bar2() {
; MEDIUM: addis 3, 2, foo2a@toc@ha
; MEDIUM: addi 3, 3, foo2a@toc@l
; LARGE: addis 3, 2, .LC3@toc@ha
%a = load i64* @foo2a
ret i64 %a
}
; LARGE: .LC1:
; LARGE-NEXT: .tc fooa[TC],fooa
; LARGE: .LC3:
; LARGE-NEXT: .tc foo2a[TC],foo2a