diff options
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelLowering.cpp | 38 | ||||
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelLowering.h | 3 |
2 files changed, 8 insertions, 33 deletions
diff --git a/llvm/lib/Target/Mips/MipsISelLowering.cpp b/llvm/lib/Target/Mips/MipsISelLowering.cpp index 5a20f63b131..aa7a276c8c3 100644 --- a/llvm/lib/Target/Mips/MipsISelLowering.cpp +++ b/llvm/lib/Target/Mips/MipsISelLowering.cpp @@ -140,12 +140,6 @@ public: PreAnalyzeCallOperandsForF128(Outs, FuncArgs, CallNode); } // FIXME: Remove this from a public inteface ASAP. It's a temporary trap door - // to allow analyzeFormalArguments to be removed incrementally. - void - PreAnalyzeFormalArgumentsForF128_(const SmallVectorImpl<ISD::InputArg> &Ins) { - PreAnalyzeFormalArgumentsForF128(Ins); - } - // FIXME: Remove this from a public inteface ASAP. It's a temporary trap door // to clean up after the above functions. void ClearOriginalArgWasF128() { OriginalArgWasF128.clear(); } @@ -153,6 +147,13 @@ public: SmallVectorImpl<CCValAssign> &locs, LLVMContext &C) : CCState(CC, isVarArg, MF, locs, C) {} + void AnalyzeFormalArguments(const SmallVectorImpl<ISD::InputArg> &Ins, + CCAssignFn Fn) { + PreAnalyzeFormalArgumentsForF128(Ins); + CCState::AnalyzeFormalArguments(Ins, Fn); + OriginalArgWasF128.clear(); + } + void AnalyzeCallResult(const SmallVectorImpl<ISD::InputArg> &Ins, CCAssignFn Fn, const TargetLowering::CallLoweringInfo &CLI) { @@ -2885,11 +2886,8 @@ MipsTargetLowering::LowerFormalArguments(SDValue Chain, MipsCC MipsCCInfo(CallConv, Subtarget, CCInfo); Function::const_arg_iterator FuncArg = DAG.getMachineFunction().getFunction()->arg_begin(); - bool UseSoftFloat = Subtarget.abiUsesSoftFloat(); - CCInfo.PreAnalyzeFormalArgumentsForF128_(Ins); - MipsCCInfo.analyzeFormalArguments(Ins, UseSoftFloat, CCInfo); - CCInfo.ClearOriginalArgWasF128(); + CCInfo.AnalyzeFormalArguments(Ins, CC_Mips_FixedArg); MipsFI->setFormalArgInfo(CCInfo.getNextStackOffset(), CCInfo.getInRegsParamsCount() > 0); @@ -3635,26 +3633,6 @@ void MipsTargetLowering::MipsCC::analyzeCallOperands( } } -void MipsTargetLowering::MipsCC::analyzeFormalArguments( - const SmallVectorImpl<ISD::InputArg> &Args, bool IsSoftFloat, - CCState &State) { - unsigned NumArgs = Args.size(); - - for (unsigned I = 0; I != NumArgs; ++I) { - MVT ArgVT = Args[I].VT; - ISD::ArgFlagsTy ArgFlags = Args[I].Flags; - - if (!CC_Mips_FixedArg(I, ArgVT, ArgVT, CCValAssign::Full, ArgFlags, State)) - continue; - -#ifndef NDEBUG - dbgs() << "Formal Arg #" << I << " has unhandled type " - << EVT(ArgVT).getEVTString(); -#endif - llvm_unreachable(nullptr); - } -} - unsigned MipsTargetLowering::MipsCC::reservedArgArea() const { return (Subtarget.isABI_O32() && (CallConv != CallingConv::Fast)) ? 16 : 0; } diff --git a/llvm/lib/Target/Mips/MipsISelLowering.h b/llvm/lib/Target/Mips/MipsISelLowering.h index 0f662a42230..cabe032a160 100644 --- a/llvm/lib/Target/Mips/MipsISelLowering.h +++ b/llvm/lib/Target/Mips/MipsISelLowering.h @@ -372,9 +372,6 @@ namespace llvm { const SDNode *CallNode, std::vector<ArgListEntry> &FuncArgs, CCState &State); - void analyzeFormalArguments(const SmallVectorImpl<ISD::InputArg> &Ins, - bool IsSoftFloat, - CCState &State); /// reservedArgArea - The size of the area the caller reserves for /// register arguments. This is 16-byte if ABI is O32. |
