6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-19 20:34:38 +00:00
Code Issues Projects Releases Wiki Activity

[mips] Clean up code in MipsTargetLowering::LowerCall. No functional change

Browse Source 
intended



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@173189 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Akira Hatanaka 2013-01-22 20:05:56 +00:00
parent aaf483ff17
commit bf6a77b987
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Target/Mips/MipsISelLowering.cpp
View File

@ -2810,7 +2810,7 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
getPointerTy()); getPointerTy());
// With EABI is it possible to have 16 args on registers. // With EABI is it possible to have 16 args on registers.
SmallVector<std::pair<unsigned, SDValue>, 16> RegsToPass; std::deque< std::pair<unsigned, SDValue> > RegsToPass;
SmallVector<SDValue, 8> MemOpChains; SmallVector<SDValue, 8> MemOpChains;
MipsCC::byval_iterator ByValArg = MipsCCInfo.byval_begin(); MipsCC::byval_iterator ByValArg = MipsCCInfo.byval_begin();
@ -2928,23 +2928,16 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
GlobalOrExternal = true; GlobalOrExternal = true;
} }
SDValue InFlag; SDValue JumpTarget = Callee;
// T9 register operand.
SDValue T9;
// T9 should contain the address of the callee function if // T9 should contain the address of the callee function if
// -reloction-model=pic or it is an indirect call. // -reloction-model=pic or it is an indirect call.
if (IsPICCall || !GlobalOrExternal) { if (IsPICCall || !GlobalOrExternal) {
// copy to T9
unsigned T9Reg = IsN64 ? Mips::T9_64 : Mips::T9; unsigned T9Reg = IsN64 ? Mips::T9_64 : Mips::T9;
Chain = DAG.getCopyToReg(Chain, dl, T9Reg, Callee, SDValue(0, 0)); RegsToPass.push_front(std::make_pair(T9Reg, Callee));
InFlag = Chain.getValue(1);
if (Subtarget->inMips16Mode()) if (!Subtarget->inMips16Mode())
T9 = DAG.getRegister(T9Reg, getPointerTy()); JumpTarget = SDValue();
else
Callee = DAG.getRegister(T9Reg, getPointerTy());
} }
// Insert node "GP copy globalreg" before call to function. // Insert node "GP copy globalreg" before call to function.
@ -2962,6 +2955,8 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
// chain and flag operands which copy the outgoing args into registers. // chain and flag operands which copy the outgoing args into registers.
// The InFlag in necessary since all emitted instructions must be // The InFlag in necessary since all emitted instructions must be
// stuck together. // stuck together.
SDValue InFlag;
for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i) { for (unsigned i = 0, e = RegsToPass.size(); i != e; ++i) {
Chain = DAG.getCopyToReg(Chain, dl, RegsToPass[i].first, Chain = DAG.getCopyToReg(Chain, dl, RegsToPass[i].first,
RegsToPass[i].second, InFlag); RegsToPass[i].second, InFlag);
@ -2973,9 +2968,10 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
// //
// Returns a chain & a flag for retval copy to use. // Returns a chain & a flag for retval copy to use.
SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue); SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue);
SmallVector<SDValue, 8> Ops; SmallVector<SDValue, 8> Ops(1, Chain);
Ops.push_back(Chain);
Ops.push_back(Callee); if (JumpTarget.getNode())
Ops.push_back(JumpTarget);
// Add argument registers to the end of the list so that they are // Add argument registers to the end of the list so that they are
// known live into the call. // known live into the call.
@ -2983,10 +2979,6 @@ MipsTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
Ops.push_back(DAG.getRegister(RegsToPass[i].first, Ops.push_back(DAG.getRegister(RegsToPass[i].first,
RegsToPass[i].second.getValueType())); RegsToPass[i].second.getValueType()));
// Add T9 register operand.
if (T9.getNode())
Ops.push_back(T9);
// Add a register mask operand representing the call-preserved registers. // Add a register mask operand representing the call-preserved registers.
const TargetRegisterInfo *TRI = getTargetMachine().getRegisterInfo(); const TargetRegisterInfo *TRI = getTargetMachine().getRegisterInfo();
const uint32_t *Mask = TRI->getCallPreservedMask(CallConv); const uint32_t *Mask = TRI->getCallPreservedMask(CallConv);
@ -3726,7 +3718,7 @@ copyByValRegs(SDValue Chain, DebugLoc DL, std::vector<SDValue> &OutChains,
// Copy byVal arg to registers and stack. // Copy byVal arg to registers and stack.
void MipsTargetLowering:: void MipsTargetLowering::
passByValArg(SDValue Chain, DebugLoc DL, passByValArg(SDValue Chain, DebugLoc DL,
SmallVector<std::pair<unsigned, SDValue>, 16> &RegsToPass, std::deque< std::pair<unsigned, SDValue> > &RegsToPass,
SmallVector<SDValue, 8> &MemOpChains, SDValue StackPtr, SmallVector<SDValue, 8> &MemOpChains, SDValue StackPtr,
MachineFrameInfo *MFI, SelectionDAG &DAG, SDValue Arg, MachineFrameInfo *MFI, SelectionDAG &DAG, SDValue Arg,
const MipsCC &CC, const ByValArgInfo &ByVal, const MipsCC &CC, const ByValArgInfo &ByVal,

3
lib/Target/Mips/MipsISelLowering.h
View File

@ -20,6 +20,7 @@
#include "llvm/CodeGen/CallingConvLower.h" #include "llvm/CodeGen/CallingConvLower.h"
#include "llvm/CodeGen/SelectionDAG.h" #include "llvm/CodeGen/SelectionDAG.h"
#include "llvm/Target/TargetLowering.h" #include "llvm/Target/TargetLowering.h"
#include <deque>
namespace llvm { namespace llvm {
namespace MipsISD { namespace MipsISD {
@ -294,7 +295,7 @@ namespace llvm {
/// passByValArg - Pass a byval argument in registers or on stack. /// passByValArg - Pass a byval argument in registers or on stack.
void passByValArg(SDValue Chain, DebugLoc DL, void passByValArg(SDValue Chain, DebugLoc DL,
SmallVector<std::pair<unsigned, SDValue>, 16> &RegsToPass, std::deque< std::pair<unsigned, SDValue> > &RegsToPass,
SmallVector<SDValue, 8> &MemOpChains, SDValue StackPtr, SmallVector<SDValue, 8> &MemOpChains, SDValue StackPtr,
MachineFrameInfo *MFI, SelectionDAG &DAG, SDValue Arg, MachineFrameInfo *MFI, SelectionDAG &DAG, SDValue Arg,
const MipsCC &CC, const ByValArgInfo &ByVal, const MipsCC &CC, const ByValArgInfo &ByVal,