mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-15 04:30:12 +00:00
[PowerPC] Fix problems with large code model (PR17169).
Large code model on PPC64 requires creating and referencing TOC entries when using the addis/ld form of addressing. This was not being done in all cases. The changes in this patch to PPCAsmPrinter::EmitInstruction() fix this. Two test cases are also modified to reflect this requirement. Fast-isel was not creating correct code for loading floating-point constants using large code model. This also requires the addis/ld form of addressing. Previously we were using the addis/lfd shortcut which is only applicable to medium code model. One test case is modified to reflect this requirement. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190882 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
65457b679a
commit
5bd1dfa2b5
@ -413,7 +413,8 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
|
|||||||
else if (MO.isJTI())
|
else if (MO.isJTI())
|
||||||
MOSymbol = GetJTISymbol(MO.getIndex());
|
MOSymbol = GetJTISymbol(MO.getIndex());
|
||||||
|
|
||||||
if (IsExternal || IsFunction || IsCommon || IsAvailExt || MO.isJTI())
|
if (IsExternal || IsFunction || IsCommon || IsAvailExt || MO.isJTI() ||
|
||||||
|
TM.getCodeModel() == CodeModel::Large)
|
||||||
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
||||||
|
|
||||||
const MCExpr *Exp =
|
const MCExpr *Exp =
|
||||||
@ -438,8 +439,11 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
|
|||||||
|
|
||||||
if (MO.isJTI())
|
if (MO.isJTI())
|
||||||
MOSymbol = lookUpOrCreateTOCEntry(GetJTISymbol(MO.getIndex()));
|
MOSymbol = lookUpOrCreateTOCEntry(GetJTISymbol(MO.getIndex()));
|
||||||
else if (MO.isCPI())
|
else if (MO.isCPI()) {
|
||||||
MOSymbol = GetCPISymbol(MO.getIndex());
|
MOSymbol = GetCPISymbol(MO.getIndex());
|
||||||
|
if (TM.getCodeModel() == CodeModel::Large)
|
||||||
|
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
||||||
|
}
|
||||||
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);
|
const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue);
|
||||||
@ -449,7 +453,8 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
|
|||||||
const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue);
|
const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue);
|
||||||
|
|
||||||
if (!GVar || !GVar->hasInitializer() || RealGValue->hasCommonLinkage() ||
|
if (!GVar || !GVar->hasInitializer() || RealGValue->hasCommonLinkage() ||
|
||||||
RealGValue->hasAvailableExternallyLinkage())
|
RealGValue->hasAvailableExternallyLinkage() ||
|
||||||
|
TM.getCodeModel() == CodeModel::Large)
|
||||||
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -486,7 +491,7 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) {
|
|||||||
} else if (MO.isCPI())
|
} else if (MO.isCPI())
|
||||||
MOSymbol = GetCPISymbol(MO.getIndex());
|
MOSymbol = GetCPISymbol(MO.getIndex());
|
||||||
|
|
||||||
if (IsFunction || IsExternal)
|
if (IsFunction || IsExternal || TM.getCodeModel() == CodeModel::Large)
|
||||||
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
MOSymbol = lookUpOrCreateTOCEntry(MOSymbol);
|
||||||
|
|
||||||
const MCExpr *Exp =
|
const MCExpr *Exp =
|
||||||
|
@ -1821,6 +1821,15 @@ unsigned PPCFastISel::PPCMaterializeFP(const ConstantFP *CFP, MVT VT) {
|
|||||||
// Otherwise we generate LF[SD](Idx[lo], ADDIStocHA(X2, Idx)).
|
// Otherwise we generate LF[SD](Idx[lo], ADDIStocHA(X2, Idx)).
|
||||||
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(PPC::ADDIStocHA),
|
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(PPC::ADDIStocHA),
|
||||||
TmpReg).addReg(PPC::X2).addConstantPoolIndex(Idx);
|
TmpReg).addReg(PPC::X2).addConstantPoolIndex(Idx);
|
||||||
|
// But for large code model, we must generate a LDtocL followed
|
||||||
|
// by the LF[SD].
|
||||||
|
if (CModel == CodeModel::Large) {
|
||||||
|
unsigned TmpReg2 = createResultReg(&PPC::G8RC_and_G8RC_NOX0RegClass);
|
||||||
|
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(PPC::LDtocL),
|
||||||
|
TmpReg2).addConstantPoolIndex(Idx).addReg(TmpReg);
|
||||||
|
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(Opc), DestReg)
|
||||||
|
.addImm(0).addReg(TmpReg2);
|
||||||
|
} else
|
||||||
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(Opc), DestReg)
|
BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(Opc), DestReg)
|
||||||
.addConstantPoolIndex(Idx, 0, PPCII::MO_TOC_LO)
|
.addConstantPoolIndex(Idx, 0, PPCII::MO_TOC_LO)
|
||||||
.addReg(TmpReg)
|
.addReg(TmpReg)
|
||||||
|
@ -31,7 +31,9 @@ entry:
|
|||||||
; LARGE: ld [[REG2:[0-9]+]], [[VAR]]@toc@l([[REG1]])
|
; LARGE: ld [[REG2:[0-9]+]], [[VAR]]@toc@l([[REG1]])
|
||||||
; LARGE: lwz {{[0-9]+}}, 0([[REG2]])
|
; LARGE: lwz {{[0-9]+}}, 0([[REG2]])
|
||||||
; LARGE: stw {{[0-9]+}}, 0([[REG2]])
|
; LARGE: stw {{[0-9]+}}, 0([[REG2]])
|
||||||
; LARGE: .type [[VAR]],@object
|
; LARGE: [[VAR]]:
|
||||||
; LARGE: .local [[VAR]]
|
; LARGE: .tc [[VAR2:[a-z0-9A-Z_.]+]][TC],[[VAR2]]
|
||||||
; LARGE: .comm [[VAR]],4,4
|
; LARGE: .type [[VAR2]],@object
|
||||||
|
; LARGE: .local [[VAR2]]
|
||||||
|
; LARGE: .comm [[VAR2]],4,4
|
||||||
|
|
||||||
|
@ -33,9 +33,11 @@ entry:
|
|||||||
; LARGE: ld [[REG2:[0-9]+]], [[VAR]]@toc@l([[REG1]])
|
; LARGE: ld [[REG2:[0-9]+]], [[VAR]]@toc@l([[REG1]])
|
||||||
; LARGE: lwz {{[0-9]+}}, 0([[REG2]])
|
; LARGE: lwz {{[0-9]+}}, 0([[REG2]])
|
||||||
; LARGE: stw {{[0-9]+}}, 0([[REG2]])
|
; LARGE: stw {{[0-9]+}}, 0([[REG2]])
|
||||||
; LARGE: .type [[VAR]],@object
|
|
||||||
; LARGE: .data
|
|
||||||
; LARGE: .globl [[VAR]]
|
|
||||||
; LARGE: [[VAR]]:
|
; LARGE: [[VAR]]:
|
||||||
|
; LARGE: .tc [[VAR2:[a-z0-9A-Z_.]+]][TC],[[VAR2]]
|
||||||
|
; LARGE: .type [[VAR2]],@object
|
||||||
|
; LARGE: .data
|
||||||
|
; LARGE: .globl [[VAR2]]
|
||||||
|
; LARGE: [[VAR2]]:
|
||||||
; LARGE: .long 5
|
; LARGE: .long 5
|
||||||
|
|
||||||
|
@ -22,6 +22,6 @@ entry:
|
|||||||
; LARGE: [[VAR:[a-z0-9A-Z_.]+]]:
|
; LARGE: [[VAR:[a-z0-9A-Z_.]+]]:
|
||||||
; LARGE: .quad 4562098671269285104
|
; LARGE: .quad 4562098671269285104
|
||||||
; LARGE-LABEL: test_double_const:
|
; LARGE-LABEL: test_double_const:
|
||||||
; LARGE: addis [[REG1:[0-9]+]], 2, [[VAR]]@toc@ha
|
; LARGE: addis [[REG1:[0-9]+]], 2, [[VAR2:[a-z0-9A-Z_.]+]]@toc@ha
|
||||||
; LARGE: ld [[REG2:[0-9]+]], [[VAR]]@toc@l([[REG1]])
|
; LARGE: ld [[REG2:[0-9]+]], [[VAR2]]@toc@l([[REG1]])
|
||||||
; LARGE: lfd {{[0-9]+}}, 0([[REG2]])
|
; LARGE: lfd {{[0-9]+}}, 0([[REG2]])
|
||||||
|
Loading…
Reference in New Issue
Block a user