RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

Fix SPARC backend call instruction so that arguments passed through registers

Browse Source 
are correctly marked as used instead of passing all possible argument registers
as used.  

llvm-svn: 123301
This commit is contained in:
Venkatraman Govindaraju 2011-01-12 03:18:21 +00:00
parent e288204194
commit 816f7dfed0
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Target/Sparc/SparcISelLowering.cpp
View File

@ -1,3 +1,4 @@
//===-- SparcISelLowering.cpp - Sparc DAG Lowering Implementation ---------===// //===-- SparcISelLowering.cpp - Sparc DAG Lowering Implementation ---------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
@ -514,11 +515,22 @@ SparcTargetLowering::LowerCall(SDValue Chain, SDValue Callee,
else if (ExternalSymbolSDNode *E = dyn_cast<ExternalSymbolSDNode>(Callee)) else if (ExternalSymbolSDNode *E = dyn_cast<ExternalSymbolSDNode>(Callee))
Callee = DAG.getTargetExternalSymbol(E->getSymbol(), MVT::i32); Callee = DAG.getTargetExternalSymbol(E->getSymbol(), MVT::i32);
std::vector<EVT> NodeTys; // Returns a chain & a flag for retval copy to use
NodeTys.push_back(MVT::Other); // Returns a chain SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue);
NodeTys.push_back(MVT::Glue); // Returns a flag for retval copy to use. SmallVector<SDValue, 8> Ops;
SDValue Ops[] = { Chain, Callee, InFlag }; Ops.push_back(Chain);
Chain = DAG.getNode(SPISD::CALL, dl, NodeTys, Ops, InFlag.getNode() ? 3 : 2); Ops.push_back(Callee);
for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i) {
unsigned Reg = RegsToPass[i].first;
if (Reg >= SP::I0 && Reg <= SP::I7)
Reg = Reg-SP::I0+SP::O0;
Ops.push_back(DAG.getRegister(Reg, RegsToPass[i].second.getValueType()));
}
if (InFlag.getNode())
Ops.push_back(InFlag);
Chain = DAG.getNode(SPISD::CALL, dl, NodeTys, &Ops[0], Ops.size());
InFlag = Chain.getValue(1); InFlag = Chain.getValue(1);
Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(ArgsSize, true), Chain = DAG.getCALLSEQ_END(Chain, DAG.getIntPtrConstant(ArgsSize, true),

13
lib/Target/Sparc/SparcInstrInfo.td
View File

@ -119,9 +119,10 @@ def callseq_start : SDNode<"ISD::CALLSEQ_START", SDT_SPCallSeqStart,
def callseq_end : SDNode<"ISD::CALLSEQ_END", SDT_SPCallSeqEnd, def callseq_end : SDNode<"ISD::CALLSEQ_END", SDT_SPCallSeqEnd,
[SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>; [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>;
def SDT_SPCall : SDTypeProfile<0, 1, [SDTCisVT<0, i32>]>; def SDT_SPCall : SDTypeProfile<0, -1, [SDTCisVT<0, i32>]>;
def call : SDNode<"SPISD::CALL", SDT_SPCall, def call : SDNode<"SPISD::CALL", SDT_SPCall,
[SDNPHasChain, SDNPOptInGlue, SDNPOutGlue]>; [SDNPHasChain, SDNPOptInGlue, SDNPOutGlue,
SDNPVariadic]>;
def retflag : SDNode<"SPISD::RET_FLAG", SDTNone, def retflag : SDNode<"SPISD::RET_FLAG", SDTNone,
[SDNPHasChain, SDNPOptInGlue]>; [SDNPHasChain, SDNPOptInGlue]>;
@ -517,11 +518,11 @@ let Uses = [FCC] in
// Section B.24 - Call and Link Instruction, p. 125 // Section B.24 - Call and Link Instruction, p. 125
// This is the only Format 1 instruction // This is the only Format 1 instruction
let Uses = [O0, O1, O2, O3, O4, O5], let Uses = [O6],
hasDelaySlot = 1, isCall = 1, hasDelaySlot = 1, isCall = 1,
Defs = [O0, O1, O2, O3, O4, O5, O7, G1, G2, G3, G4, G5, G6, G7, Defs = [O0, O1, O2, O3, O4, O5, O7, G1, G2, G3, G4, G5, G6, G7,
D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, D14, D15] in { D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, D13, D14, D15] in {
def CALL : InstSP<(outs), (ins calltarget:$dst), def CALL : InstSP<(outs), (ins calltarget:$dst, variable_ops),
"call $dst", []> { "call $dst", []> {
bits<30> disp; bits<30> disp;
let op = 1; let op = 1;
@ -530,11 +531,11 @@ let Uses = [O0, O1, O2, O3, O4, O5],
// indirect calls // indirect calls
def JMPLrr : F3_1<2, 0b111000, def JMPLrr : F3_1<2, 0b111000,
(outs), (ins MEMrr:$ptr), (outs), (ins MEMrr:$ptr, variable_ops),
"call $ptr", "call $ptr",
[(call ADDRrr:$ptr)]>; [(call ADDRrr:$ptr)]>;
def JMPLri : F3_2<2, 0b111000, def JMPLri : F3_2<2, 0b111000,
(outs), (ins MEMri:$ptr), (outs), (ins MEMri:$ptr, variable_ops),
"call $ptr", "call $ptr",
[(call ADDRri:$ptr)]>; [(call ADDRri:$ptr)]>;
} }

13
test/CodeGen/SPARC/2011-01-11-Call.ll Normal file
View File

@ -0,0 +1,13 @@
; RUN: llc -march=sparc -O0 <%s
define void @test() nounwind {
entry:
%0 = tail call i32 (...)* @foo() nounwind
tail call void (...)* @bar() nounwind
ret void
}
declare i32 @foo(...)
declare void @bar(...)