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

In the calling convention logic, ValVT is always a legal type,

Browse Source 
and as such can be represented by an MVT - the more complicated
EVT is not needed.  Use MVT for ValVT everywhere.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118245 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan Sands 2010-11-04 10:49:57 +00:00
parent 416941d50f
commit 1e96bab329
9 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/llvm/CodeGen/CallingConvLower.h
View File

@ -57,13 +57,13 @@ private:
LocInfo HTP : 6; LocInfo HTP : 6;
/// ValVT - The type of the value being assigned. /// ValVT - The type of the value being assigned.
EVT ValVT; MVT ValVT;
/// LocVT - The type of the location being assigned to. /// LocVT - The type of the location being assigned to.
MVT LocVT; MVT LocVT;
public: public:
static CCValAssign getReg(unsigned ValNo, EVT ValVT, static CCValAssign getReg(unsigned ValNo, MVT ValVT,
unsigned RegNo, MVT LocVT, unsigned RegNo, MVT LocVT,
LocInfo HTP) { LocInfo HTP) {
CCValAssign Ret; CCValAssign Ret;
@ -77,7 +77,7 @@ public:
return Ret; return Ret;
} }
static CCValAssign getCustomReg(unsigned ValNo, EVT ValVT, static CCValAssign getCustomReg(unsigned ValNo, MVT ValVT,
unsigned RegNo, MVT LocVT, unsigned RegNo, MVT LocVT,
LocInfo HTP) { LocInfo HTP) {
CCValAssign Ret; CCValAssign Ret;
@ -86,7 +86,7 @@ public:
return Ret; return Ret;
} }
static CCValAssign getMem(unsigned ValNo, EVT ValVT, static CCValAssign getMem(unsigned ValNo, MVT ValVT,
unsigned Offset, MVT LocVT, unsigned Offset, MVT LocVT,
LocInfo HTP) { LocInfo HTP) {
CCValAssign Ret; CCValAssign Ret;
@ -100,7 +100,7 @@ public:
return Ret; return Ret;
} }
static CCValAssign getCustomMem(unsigned ValNo, EVT ValVT, static CCValAssign getCustomMem(unsigned ValNo, MVT ValVT,
unsigned Offset, MVT LocVT, unsigned Offset, MVT LocVT,
LocInfo HTP) { LocInfo HTP) {
CCValAssign Ret; CCValAssign Ret;
@ -110,7 +110,7 @@ public:
} }
unsigned getValNo() const { return ValNo; } unsigned getValNo() const { return ValNo; }
EVT getValVT() const { return ValVT; } MVT getValVT() const { return ValVT; }
bool isRegLoc() const { return !isMem; } bool isRegLoc() const { return !isMem; }
bool isMemLoc() const { return isMem; } bool isMemLoc() const { return isMem; }
@ -130,14 +130,14 @@ public:
/// CCAssignFn - This function assigns a location for Val, updating State to /// CCAssignFn - This function assigns a location for Val, updating State to
/// reflect the change. It returns 'true' if it failed to handle Val. /// reflect the change. It returns 'true' if it failed to handle Val.
typedef bool CCAssignFn(unsigned ValNo, EVT ValVT, typedef bool CCAssignFn(unsigned ValNo, MVT ValVT,
MVT LocVT, CCValAssign::LocInfo LocInfo, MVT LocVT, CCValAssign::LocInfo LocInfo,
ISD::ArgFlagsTy ArgFlags, CCState &State); ISD::ArgFlagsTy ArgFlags, CCState &State);
/// CCCustomFn - This function assigns a location for Val, possibly updating /// CCCustomFn - This function assigns a location for Val, possibly updating
/// all args to reflect changes and indicates if it handled it. It must set /// all args to reflect changes and indicates if it handled it. It must set
/// isCustom if it handles the arg and returns true. /// isCustom if it handles the arg and returns true.
typedef bool CCCustomFn(unsigned &ValNo, EVT &ValVT, typedef bool CCCustomFn(unsigned &ValNo, MVT &ValVT,
MVT &LocVT, CCValAssign::LocInfo &LocInfo, MVT &LocVT, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, CCState &State); ISD::ArgFlagsTy &ArgFlags, CCState &State);
@ -284,7 +284,7 @@ public:
// HandleByVal - Allocate a stack slot large enough to pass an argument by // HandleByVal - Allocate a stack slot large enough to pass an argument by
// value. The size and alignment information of the argument is encoded in its // value. The size and alignment information of the argument is encoded in its
// parameter attribute. // parameter attribute.
void HandleByVal(unsigned ValNo, EVT ValVT, void HandleByVal(unsigned ValNo, MVT ValVT,
MVT LocVT, CCValAssign::LocInfo LocInfo, MVT LocVT, CCValAssign::LocInfo LocInfo,
int MinSize, int MinAlign, ISD::ArgFlagsTy ArgFlags); int MinSize, int MinAlign, ISD::ArgFlagsTy ArgFlags);

2
lib/CodeGen/CallingConvLower.cpp
View File

@ -34,7 +34,7 @@ CCState::CCState(CallingConv::ID CC, bool isVarArg, const TargetMachine &tm,
// HandleByVal - Allocate a stack slot large enough to pass an argument by // HandleByVal - Allocate a stack slot large enough to pass an argument by
// value. The size and alignment information of the argument is encoded in its // value. The size and alignment information of the argument is encoded in its
// parameter attribute. // parameter attribute.
void CCState::HandleByVal(unsigned ValNo, EVT ValVT, void CCState::HandleByVal(unsigned ValNo, MVT ValVT,
MVT LocVT, CCValAssign::LocInfo LocInfo, MVT LocVT, CCValAssign::LocInfo LocInfo,
int MinSize, int MinAlign, int MinSize, int MinAlign,
ISD::ArgFlagsTy ArgFlags) { ISD::ArgFlagsTy ArgFlags) {

14
lib/Target/ARM/ARMCallingConv.h
View File

@ -26,7 +26,7 @@
namespace llvm { namespace llvm {
// APCS f64 is in register pairs, possibly split to stack // APCS f64 is in register pairs, possibly split to stack
static bool f64AssignAPCS(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool f64AssignAPCS(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
CCState &State, bool CanFail) { CCState &State, bool CanFail) {
static const unsigned RegList[] = { ARM::R0, ARM::R1, ARM::R2, ARM::R3 }; static const unsigned RegList[] = { ARM::R0, ARM::R1, ARM::R2, ARM::R3 };
@ -56,7 +56,7 @@ static bool f64AssignAPCS(unsigned &ValNo, EVT &ValVT, MVT &LocVT,
return true; return true;
} }
static bool CC_ARM_APCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool CC_ARM_APCS_Custom_f64(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State) { CCState &State) {
@ -69,7 +69,7 @@ static bool CC_ARM_APCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT,
} }
// AAPCS f64 is in aligned register pairs // AAPCS f64 is in aligned register pairs
static bool f64AssignAAPCS(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool f64AssignAAPCS(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
CCState &State, bool CanFail) { CCState &State, bool CanFail) {
static const unsigned HiRegList[] = { ARM::R0, ARM::R2 }; static const unsigned HiRegList[] = { ARM::R0, ARM::R2 };
@ -104,7 +104,7 @@ static bool f64AssignAAPCS(unsigned &ValNo, EVT &ValVT, MVT &LocVT,
return true; return true;
} }
static bool CC_ARM_AAPCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool CC_ARM_AAPCS_Custom_f64(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State) { CCState &State) {
@ -116,7 +116,7 @@ static bool CC_ARM_AAPCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT,
return true; // we handled it return true; // we handled it
} }
static bool f64RetAssign(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool f64RetAssign(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCState &State) { CCValAssign::LocInfo &LocInfo, CCState &State) {
static const unsigned HiRegList[] = { ARM::R0, ARM::R2 }; static const unsigned HiRegList[] = { ARM::R0, ARM::R2 };
static const unsigned LoRegList[] = { ARM::R1, ARM::R3 }; static const unsigned LoRegList[] = { ARM::R1, ARM::R3 };
@ -136,7 +136,7 @@ static bool f64RetAssign(unsigned &ValNo, EVT &ValVT, MVT &LocVT,
return true; return true;
} }
static bool RetCC_ARM_APCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool RetCC_ARM_APCS_Custom_f64(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State) { CCState &State) {
@ -147,7 +147,7 @@ static bool RetCC_ARM_APCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT,
return true; // we handled it return true; // we handled it
} }
static bool RetCC_ARM_AAPCS_Custom_f64(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool RetCC_ARM_AAPCS_Custom_f64(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State) { CCState &State) {

2
lib/Target/ARM/ARMFastISel.cpp
View File

@ -1567,7 +1567,7 @@ bool ARMFastISel::SelectRet(const Instruction *I) {
return false; return false;
// TODO: For now, don't try to handle cases where getLocInfo() // TODO: For now, don't try to handle cases where getLocInfo()
// says Full but the types don't match. // says Full but the types don't match.
if (VA.getValVT() != TLI.getValueType(RV->getType())) if (TLI.getValueType(RV->getType()) != VA.getValVT())
return false; return false;
// Make the copy. // Make the copy.

6
lib/Target/MBlaze/MBlazeISelLowering.cpp
View File

@ -468,7 +468,7 @@ SDValue MBlazeTargetLowering::LowerVASTART(SDValue Op,
#include "MBlazeGenCallingConv.inc" #include "MBlazeGenCallingConv.inc"
static bool CC_MBlaze2(unsigned ValNo, EVT ValVT, static bool CC_MBlaze2(unsigned ValNo, MVT ValVT,
MVT LocVT, CCValAssign::LocInfo LocInfo, MVT LocVT, CCValAssign::LocInfo LocInfo,
ISD::ArgFlagsTy ArgFlags, CCState &State) { ISD::ArgFlagsTy ArgFlags, CCState &State) {
static const unsigned RegsSize=6; static const unsigned RegsSize=6;
@ -553,7 +553,7 @@ LowerCall(SDValue Chain, SDValue Callee, CallingConv::ID CallConv,
// Walk the register/memloc assignments, inserting copies/loads. // Walk the register/memloc assignments, inserting copies/loads.
for (unsigned i = 0, e = ArgLocs.size(); i != e; ++i) { for (unsigned i = 0, e = ArgLocs.size(); i != e; ++i) {
CCValAssign &VA = ArgLocs[i]; CCValAssign &VA = ArgLocs[i];
EVT RegVT = VA.getLocVT(); MVT RegVT = VA.getLocVT();
SDValue Arg = OutVals[i]; SDValue Arg = OutVals[i];
// Promote the value if needed. // Promote the value if needed.
@ -720,7 +720,7 @@ LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
// Arguments stored on registers // Arguments stored on registers
if (VA.isRegLoc()) { if (VA.isRegLoc()) {
EVT RegVT = VA.getLocVT(); MVT RegVT = VA.getLocVT();
ArgRegEnd = VA.getLocReg(); ArgRegEnd = VA.getLocReg();
TargetRegisterClass *RC = 0; TargetRegisterClass *RC = 0;

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

@ -629,7 +629,7 @@ SDValue MipsTargetLowering::LowerVASTART(SDValue Op, SelectionDAG &DAG) const {
// go to stack. // go to stack.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
static bool CC_MipsO32(unsigned ValNo, EVT ValVT, static bool CC_MipsO32(unsigned ValNo, MVT ValVT,
MVT LocVT, CCValAssign::LocInfo LocInfo, MVT LocVT, CCValAssign::LocInfo LocInfo,
ISD::ArgFlagsTy ArgFlags, CCState &State) { ISD::ArgFlagsTy ArgFlags, CCState &State) {
@ -695,7 +695,7 @@ static bool CC_MipsO32(unsigned ValNo, EVT ValVT,
return false; // CC must always match return false; // CC must always match
} }
static bool CC_MipsO32_VarArgs(unsigned ValNo, EVT ValVT, static bool CC_MipsO32_VarArgs(unsigned ValNo, MVT ValVT,
MVT LocVT, CCValAssign::LocInfo LocInfo, MVT LocVT, CCValAssign::LocInfo LocInfo,
ISD::ArgFlagsTy ArgFlags, CCState &State) { ISD::ArgFlagsTy ArgFlags, CCState &State) {
@ -789,7 +789,7 @@ MipsTargetLowering::LowerCall(SDValue Chain, SDValue Callee,
// To meet O32 ABI, Mips must always allocate 16 bytes on // To meet O32 ABI, Mips must always allocate 16 bytes on
// the stack (even if less than 4 are used as arguments) // the stack (even if less than 4 are used as arguments)
if (Subtarget->isABI_O32()) { if (Subtarget->isABI_O32()) {
int VTsize = EVT(MVT::i32).getSizeInBits()/8; int VTsize = MVT(MVT::i32).getSizeInBits()/8;
MFI->CreateFixedObject(VTsize, (VTsize*3), true); MFI->CreateFixedObject(VTsize, (VTsize*3), true);
CCInfo.AnalyzeCallOperands(Outs, CCInfo.AnalyzeCallOperands(Outs,
isVarArg ? CC_MipsO32_VarArgs : CC_MipsO32); isVarArg ? CC_MipsO32_VarArgs : CC_MipsO32);

12
lib/Target/PowerPC/PPCISelLowering.cpp
View File

@ -38,16 +38,16 @@
#include "llvm/DerivedTypes.h" #include "llvm/DerivedTypes.h"
using namespace llvm; using namespace llvm;
static bool CC_PPC_SVR4_Custom_Dummy(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool CC_PPC_SVR4_Custom_Dummy(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State); CCState &State);
static bool CC_PPC_SVR4_Custom_AlignArgRegs(unsigned &ValNo, EVT &ValVT, static bool CC_PPC_SVR4_Custom_AlignArgRegs(unsigned &ValNo, MVT &ValVT,
MVT &LocVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State); CCState &State);
static bool CC_PPC_SVR4_Custom_AlignFPArgRegs(unsigned &ValNo, EVT &ValVT, static bool CC_PPC_SVR4_Custom_AlignFPArgRegs(unsigned &ValNo, MVT &ValVT,
MVT &LocVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
@ -1443,14 +1443,14 @@ SDValue PPCTargetLowering::LowerVASTART(SDValue Op, SelectionDAG &DAG,
#include "PPCGenCallingConv.inc" #include "PPCGenCallingConv.inc"
static bool CC_PPC_SVR4_Custom_Dummy(unsigned &ValNo, EVT &ValVT, MVT &LocVT, static bool CC_PPC_SVR4_Custom_Dummy(unsigned &ValNo, MVT &ValVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
CCState &State) { CCState &State) {
return true; return true;
} }
static bool CC_PPC_SVR4_Custom_AlignArgRegs(unsigned &ValNo, EVT &ValVT, static bool CC_PPC_SVR4_Custom_AlignArgRegs(unsigned &ValNo, MVT &ValVT,
MVT &LocVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,
@ -1477,7 +1477,7 @@ static bool CC_PPC_SVR4_Custom_AlignArgRegs(unsigned &ValNo, EVT &ValVT,
return false; return false;
} }
static bool CC_PPC_SVR4_Custom_AlignFPArgRegs(unsigned &ValNo, EVT &ValVT, static bool CC_PPC_SVR4_Custom_AlignFPArgRegs(unsigned &ValNo, MVT &ValVT,
MVT &LocVT, MVT &LocVT,
CCValAssign::LocInfo &LocInfo, CCValAssign::LocInfo &LocInfo,
ISD::ArgFlagsTy &ArgFlags, ISD::ArgFlagsTy &ArgFlags,

2
lib/Target/X86/X86FastISel.cpp
View File

@ -711,7 +711,7 @@ bool X86FastISel::X86SelectRet(const Instruction *I) {
return false; return false;
// TODO: For now, don't try to handle cases where getLocInfo() // TODO: For now, don't try to handle cases where getLocInfo()
// says Full but the types don't match. // says Full but the types don't match.
if (VA.getValVT() != TLI.getValueType(RV->getType())) if (TLI.getValueType(RV->getType()) != VA.getValVT())
return false; return false;
// The calling-convention tables for x87 returns don't tell // The calling-convention tables for x87 returns don't tell

4
utils/TableGen/CallingConvEmitter.cpp
View File

@ -26,7 +26,7 @@ void CallingConvEmitter::run(raw_ostream &O) {
// other. // other.
for (unsigned i = 0, e = CCs.size(); i != e; ++i) { for (unsigned i = 0, e = CCs.size(); i != e; ++i) {
O << "static bool " << CCs[i]->getName() O << "static bool " << CCs[i]->getName()
<< "(unsigned ValNo, EVT ValVT,\n" << "(unsigned ValNo, MVT ValVT,\n"
<< std::string(CCs[i]->getName().size()+13, ' ') << std::string(CCs[i]->getName().size()+13, ' ')
<< "MVT LocVT, CCValAssign::LocInfo LocInfo,\n" << "MVT LocVT, CCValAssign::LocInfo LocInfo,\n"
<< std::string(CCs[i]->getName().size()+13, ' ') << std::string(CCs[i]->getName().size()+13, ' ')
@ -44,7 +44,7 @@ void CallingConvEmitter::EmitCallingConv(Record *CC, raw_ostream &O) {
Counter = 0; Counter = 0;
O << "\n\nstatic bool " << CC->getName() O << "\n\nstatic bool " << CC->getName()
<< "(unsigned ValNo, EVT ValVT,\n" << "(unsigned ValNo, MVT ValVT,\n"
<< std::string(CC->getName().size()+13, ' ') << std::string(CC->getName().size()+13, ' ')
<< "MVT LocVT, CCValAssign::LocInfo LocInfo,\n" << "MVT LocVT, CCValAssign::LocInfo LocInfo,\n"
<< std::string(CC->getName().size()+13, ' ') << std::string(CC->getName().size()+13, ' ')