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

revert r97807, it introduced build warnings.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97869 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-03-06 04:32:46 +00:00
parent e68bd74245
commit 0a7f442314
6 changed files with 61 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/MBlaze/MBlazeISelDAGToDAG.cpp
View File

@@ -129,15 +129,15 @@ SelectAddrRegReg(SDNode *Op, SDValue N, SDValue &Base, SDValue &Index) {
N.getOpcode() == ISD::TargetGlobalAddress) N.getOpcode() == ISD::TargetGlobalAddress)
return false; // direct calls. return false; // direct calls.
if (N.getOperand(0).getOpcode() == ISD::TargetJumpTable ||
N.getOperand(1).getOpcode() == ISD::TargetJumpTable)
return false; // jump tables.
int32_t imm = 0; int32_t imm = 0;
if (N.getOpcode() == ISD::ADD || N.getOpcode() == ISD::OR) { if (N.getOpcode() == ISD::ADD || N.getOpcode() == ISD::OR) {
if (isIntS32Immediate(N.getOperand(1), imm)) if (isIntS32Immediate(N.getOperand(1), imm))
return false; // r+i return false; // r+i
if (N.getOperand(0).getOpcode() == ISD::TargetJumpTable ||
N.getOperand(1).getOpcode() == ISD::TargetJumpTable)
return false; // jump tables.
Base = N.getOperand(1); Base = N.getOperand(1);
Index = N.getOperand(0); Index = N.getOperand(0);
return true; return true;

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

@@ -138,13 +138,6 @@ MBlazeTargetLowering::MBlazeTargetLowering(MBlazeTargetMachine &TM)
setOperationAction(ISD::JumpTable, MVT::i32, Custom); setOperationAction(ISD::JumpTable, MVT::i32, Custom);
setOperationAction(ISD::ConstantPool, MVT::i32, Custom); setOperationAction(ISD::ConstantPool, MVT::i32, Custom);
// Variable Argument support
setOperationAction(ISD::VASTART, MVT::Other, Custom);
setOperationAction(ISD::VAEND, MVT::Other, Expand);
setOperationAction(ISD::VAARG, MVT::Other, Expand);
setOperationAction(ISD::VACOPY, MVT::Other, Expand);
// Operations not directly supported by MBlaze. // Operations not directly supported by MBlaze.
setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i32, Expand); setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i32, Expand);
setOperationAction(ISD::BR_JT, MVT::Other, Expand); setOperationAction(ISD::BR_JT, MVT::Other, Expand);
@@ -193,7 +186,6 @@ SDValue MBlazeTargetLowering::LowerOperation(SDValue Op, SelectionDAG &DAG) {
case ISD::GlobalTLSAddress: return LowerGlobalTLSAddress(Op, DAG); case ISD::GlobalTLSAddress: return LowerGlobalTLSAddress(Op, DAG);
case ISD::JumpTable: return LowerJumpTable(Op, DAG); case ISD::JumpTable: return LowerJumpTable(Op, DAG);
case ISD::SELECT_CC: return LowerSELECT_CC(Op, DAG); case ISD::SELECT_CC: return LowerSELECT_CC(Op, DAG);
case ISD::VASTART: return LowerVASTART(Op, DAG);
} }
return SDValue(); return SDValue();
} }
@@ -448,6 +440,7 @@ LowerConstantPool(SDValue Op, SelectionDAG &DAG) {
ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op); ConstantPoolSDNode *N = cast<ConstantPoolSDNode>(Op);
Constant *C = N->getConstVal(); Constant *C = N->getConstVal();
SDValue Zero = DAG.getConstant(0, PtrVT); SDValue Zero = DAG.getConstant(0, PtrVT);
// FIXME there isn't actually debug info here
DebugLoc dl = Op.getDebugLoc(); DebugLoc dl = Op.getDebugLoc();
SDValue CP = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(), SDValue CP = DAG.getTargetConstantPool(C, MVT::i32, N->getAlignment(),
@@ -455,121 +448,12 @@ LowerConstantPool(SDValue Op, SelectionDAG &DAG) {
return DAG.getNode(MBlazeISD::Wrap, dl, MVT::i32, CP); return DAG.getNode(MBlazeISD::Wrap, dl, MVT::i32, CP);
} }
SDValue MBlazeTargetLowering::LowerVASTART(SDValue Op, SelectionDAG &DAG) {
DebugLoc dl = Op.getDebugLoc();
SDValue FI = DAG.getFrameIndex(VarArgsFrameIndex, getPointerTy());
// vastart just stores the address of the VarArgsFrameIndex slot into the
// memory location argument.
const Value *SV = cast<SrcValueSDNode>(Op.getOperand(2))->getValue();
return DAG.getStore(Op.getOperand(0), dl, FI, Op.getOperand(1), SV, 0,
false, false, 0);
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Calling Convention Implementation // Calling Convention Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "MBlazeGenCallingConv.inc" #include "MBlazeGenCallingConv.inc"
static bool CC_MBlaze2(unsigned ValNo, EVT ValVT,
EVT LocVT, CCValAssign::LocInfo LocInfo,
ISD::ArgFlagsTy ArgFlags, CCState &State) {
static const unsigned RegsSize=6;
static const unsigned IntRegs[] = {
MBlaze::R5, MBlaze::R6, MBlaze::R7,
MBlaze::R8, MBlaze::R9, MBlaze::R10
};
static const unsigned FltRegs[] = {
MBlaze::F5, MBlaze::F6, MBlaze::F7,
MBlaze::F8, MBlaze::F9, MBlaze::F10
};
unsigned Reg=0;
//unsigned UnallocIntReg = State.getFirstUnallocated(IntRegs, RegsSize);
// Promote i8 and i16
if (LocVT == MVT::i8 || LocVT == MVT::i16) {
LocVT = MVT::i32;
if (ArgFlags.isSExt())
LocInfo = CCValAssign::SExt;
else if (ArgFlags.isZExt())
LocInfo = CCValAssign::ZExt;
else
LocInfo = CCValAssign::AExt;
}
if (ValVT == MVT::i32) {
Reg = State.AllocateReg(IntRegs, RegsSize);
LocVT = MVT::i32;
} else if (ValVT == MVT::f32) {
Reg = State.AllocateReg(FltRegs, RegsSize);
LocVT = MVT::f32;
}
if (!Reg) {
unsigned SizeInBytes = ValVT.getSizeInBits() >> 3;
unsigned Offset = State.AllocateStack(SizeInBytes, SizeInBytes);
State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset, LocVT, LocInfo));
} else {
unsigned SizeInBytes = ValVT.getSizeInBits() >> 3;
unsigned Offset = State.AllocateStack(SizeInBytes, SizeInBytes);
State.addLoc(CCValAssign::getReg(ValNo, ValVT, Reg, LocVT, LocInfo));
}
return false; // CC must always match
}
static bool CC_MBlaze_VarArg(unsigned ValNo, EVT ValVT,
EVT LocVT, CCValAssign::LocInfo LocInfo,
ISD::ArgFlagsTy ArgFlags, CCState &State) {
static const unsigned RegsSize=6;
static const unsigned IntRegs[] = {
MBlaze::R5, MBlaze::R6, MBlaze::R7,
MBlaze::R8, MBlaze::R9, MBlaze::R10
};
static const unsigned FltRegs[] = {
MBlaze::F5, MBlaze::F6, MBlaze::F7,
MBlaze::F8, MBlaze::F9, MBlaze::F10
};
// Promote i8 and i16
if (LocVT == MVT::i8 || LocVT == MVT::i16) {
LocVT = MVT::i32;
if (ArgFlags.isSExt())
LocInfo = CCValAssign::SExt;
else if (ArgFlags.isZExt())
LocInfo = CCValAssign::ZExt;
else
LocInfo = CCValAssign::AExt;
}
if (ValVT == MVT::i32) {
if (unsigned Reg = State.AllocateReg(IntRegs, RegsSize)) {
unsigned SizeInBytes = ValVT.getSizeInBits() >> 3;
State.AllocateStack(SizeInBytes, SizeInBytes);
State.addLoc(CCValAssign::getReg(ValNo, ValVT, Reg, MVT::i32, LocInfo));
return false;
}
} else if (ValVT == MVT::f32) {
if (unsigned Reg = State.AllocateReg(FltRegs, RegsSize)) {
unsigned SizeInBytes = ValVT.getSizeInBits() >> 3;
State.AllocateStack(SizeInBytes, SizeInBytes);
State.addLoc(CCValAssign::getReg(ValNo, ValVT, Reg, MVT::i32, LocInfo));
return false;
}
}
unsigned SizeInBytes = ValVT.getSizeInBits() >> 3;
unsigned Off = State.AllocateStack(SizeInBytes, SizeInBytes);
State.addLoc(CCValAssign::getMem(ValNo, ValVT, Off, LocVT, LocInfo));
return false;
}
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Call Calling Convention Implementation // Call Calling Convention Implementation
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@@ -584,9 +468,6 @@ LowerCall(SDValue Chain, SDValue Callee, CallingConv::ID CallConv,
const SmallVectorImpl<ISD::InputArg> &Ins, const SmallVectorImpl<ISD::InputArg> &Ins,
DebugLoc dl, SelectionDAG &DAG, DebugLoc dl, SelectionDAG &DAG,
SmallVectorImpl<SDValue> &InVals) { SmallVectorImpl<SDValue> &InVals) {
// MBlaze does not yet support tail call optimization
isTailCall = false;
MachineFunction &MF = DAG.getMachineFunction(); MachineFunction &MF = DAG.getMachineFunction();
MachineFrameInfo *MFI = MF.getFrameInfo(); MachineFrameInfo *MFI = MF.getFrameInfo();
@@ -594,7 +475,7 @@ LowerCall(SDValue Chain, SDValue Callee, CallingConv::ID CallConv,
SmallVector<CCValAssign, 16> ArgLocs; SmallVector<CCValAssign, 16> ArgLocs;
CCState CCInfo(CallConv, isVarArg, getTargetMachine(), ArgLocs, CCState CCInfo(CallConv, isVarArg, getTargetMachine(), ArgLocs,
*DAG.getContext()); *DAG.getContext());
CCInfo.AnalyzeCallOperands(Outs, CC_MBlaze2); CCInfo.AnalyzeCallOperands(Outs, CC_MBlaze);
// Get a count of how many bytes are to be pushed on the stack. // Get a count of how many bytes are to be pushed on the stack.
unsigned NumBytes = CCInfo.getNextStackOffset(); unsigned NumBytes = CCInfo.getNextStackOffset();
@@ -606,7 +487,7 @@ LowerCall(SDValue Chain, SDValue Callee, CallingConv::ID CallConv,
// First/LastArgStackLoc contains the first/last // First/LastArgStackLoc contains the first/last
// "at stack" argument location. // "at stack" argument location.
int LastArgStackLoc = 0; int LastArgStackLoc = 0;
unsigned FirstStackArgLoc = 0; unsigned FirstStackArgLoc = 4;
// 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) {
@@ -627,6 +508,9 @@ LowerCall(SDValue Chain, SDValue Callee, CallingConv::ID CallConv,
case CCValAssign::AExt: case CCValAssign::AExt:
Arg = DAG.getNode(ISD::ANY_EXTEND, dl, RegVT, Arg); Arg = DAG.getNode(ISD::ANY_EXTEND, dl, RegVT, Arg);
break; break;
case CCValAssign::BCvt:
Arg = DAG.getNode(ISD::BIT_CONVERT, dl, RegVT, Arg);
break;
} }
// Arguments that can be passed on register must be kept at // Arguments that can be passed on register must be kept at
@@ -733,7 +617,7 @@ LowerCallResult(SDValue Chain, SDValue InFlag, CallingConv::ID CallConv,
RVLocs[i].getValVT(), InFlag).getValue(1); RVLocs[i].getValVT(), InFlag).getValue(1);
InFlag = Chain.getValue(2); InFlag = Chain.getValue(2);
InVals.push_back(Chain.getValue(0)); InVals.push_back(Chain.getValue(0));
} }
return Chain; return Chain;
} }
@@ -745,6 +629,7 @@ LowerCallResult(SDValue Chain, SDValue InFlag, CallingConv::ID CallConv,
/// LowerFormalArguments - transform physical registers into /// LowerFormalArguments - transform physical registers into
/// virtual registers and generate load operations for /// virtual registers and generate load operations for
/// arguments places on the stack. /// arguments places on the stack.
/// TODO: isVarArg
SDValue MBlazeTargetLowering:: SDValue MBlazeTargetLowering::
LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg, LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
const SmallVectorImpl<ISD::InputArg> &Ins, const SmallVectorImpl<ISD::InputArg> &Ins,
@@ -755,23 +640,16 @@ LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>(); MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>();
unsigned StackReg = MF.getTarget().getRegisterInfo()->getFrameRegister(MF); unsigned StackReg = MF.getTarget().getRegisterInfo()->getFrameRegister(MF);
VarArgsFrameIndex = 0;
// Used with vargs to acumulate store chains.
std::vector<SDValue> OutChains;
// Keep track of the last register used for arguments
unsigned ArgRegEnd = 0;
// Assign locations to all of the incoming arguments. // Assign locations to all of the incoming arguments.
SmallVector<CCValAssign, 16> ArgLocs; SmallVector<CCValAssign, 16> ArgLocs;
CCState CCInfo(CallConv, isVarArg, getTargetMachine(), CCState CCInfo(CallConv, isVarArg, getTargetMachine(),
ArgLocs, *DAG.getContext()); ArgLocs, *DAG.getContext());
CCInfo.AnalyzeFormalArguments(Ins, CC_MBlaze2); CCInfo.AnalyzeFormalArguments(Ins, CC_MBlaze);
SDValue StackPtr; SDValue StackPtr;
unsigned FirstStackArgLoc = 0; unsigned FirstStackArgLoc = 4;
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];
@@ -779,7 +657,6 @@ 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(); EVT RegVT = VA.getLocVT();
ArgRegEnd = VA.getLocReg();
TargetRegisterClass *RC = 0; TargetRegisterClass *RC = 0;
if (RegVT == MVT::i32) if (RegVT == MVT::i32)
@@ -791,13 +668,12 @@ LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
// Transform the arguments stored on // Transform the arguments stored on
// physical registers into virtual ones // physical registers into virtual ones
unsigned Reg = MF.addLiveIn(ArgRegEnd, RC); unsigned Reg = MF.addLiveIn(VA.getLocReg(), RC);
SDValue ArgValue = DAG.getCopyFromReg(Chain, dl, Reg, RegVT); SDValue ArgValue = DAG.getCopyFromReg(Chain, dl, Reg, RegVT);
// If this is an 8 or 16-bit value, it has been passed promoted // If this is an 8 or 16-bit value, it has been passed promoted
// to 32 bits. Insert an assert[sz]ext to capture this, then // to 32 bits. Insert an assert[sz]ext to capture this, then
// truncate to the right size. If if is a floating point value // truncate to the right size.
// then convert to the correct type.
if (VA.getLocInfo() != CCValAssign::Full) { if (VA.getLocInfo() != CCValAssign::Full) {
unsigned Opcode = 0; unsigned Opcode = 0;
if (VA.getLocInfo() == CCValAssign::SExt) if (VA.getLocInfo() == CCValAssign::SExt)
@@ -812,14 +688,35 @@ LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
InVals.push_back(ArgValue); InVals.push_back(ArgValue);
// To meet ABI, when VARARGS are passed on registers, the registers
// must have their values written to the caller stack frame.
if (isVarArg) {
if (StackPtr.getNode() == 0)
StackPtr = DAG.getRegister(StackReg, getPointerTy());
// The stack pointer offset is relative to the caller stack frame.
// Since the real stack size is unknown here, a negative SPOffset
// is used so there's a way to adjust these offsets when the stack
// size get known (on EliminateFrameIndex). A dummy SPOffset is
// used instead of a direct negative address (which is recorded to
// be used on emitPrologue) to avoid mis-calc of the first stack
// offset on PEI::calculateFrameObjectOffsets.
// Arguments are always 32-bit.
int FI = MFI->CreateFixedObject(4, 0, true, false);
MBlazeFI->recordStoreVarArgsFI(FI, -(FirstStackArgLoc+(i*4)));
SDValue PtrOff = DAG.getFrameIndex(FI, getPointerTy());
// emit ISD::STORE whichs stores the
// parameter value to a stack Location
InVals.push_back(DAG.getStore(Chain, dl, ArgValue, PtrOff, NULL, 0,
false, false, 0));
}
} else { // VA.isRegLoc() } else { // VA.isRegLoc()
// sanity check // sanity check
assert(VA.isMemLoc()); assert(VA.isMemLoc());
// The last argument is not a register
ArgRegEnd = 0;
// The stack pointer offset is relative to the caller stack frame. // The stack pointer offset is relative to the caller stack frame.
// Since the real stack size is unknown here, a negative SPOffset // Since the real stack size is unknown here, a negative SPOffset
// is used so there's a way to adjust these offsets when the stack // is used so there's a way to adjust these offsets when the stack
@@ -840,47 +737,6 @@ LowerFormalArguments(SDValue Chain, CallingConv::ID CallConv, bool isVarArg,
} }
} }
// To meet ABI, when VARARGS are passed on registers, the registers
// must have their values written to the caller stack frame. If the last
// argument was placed in the stack, there's no need to save any register.
if ((isVarArg) && ArgRegEnd) {
if (StackPtr.getNode() == 0)
StackPtr = DAG.getRegister(StackReg, getPointerTy());
// The last register argument that must be saved is MBlaze::R10
TargetRegisterClass *RC = MBlaze::CPURegsRegisterClass;
unsigned Begin = MBlazeRegisterInfo::getRegisterNumbering(MBlaze::R5);
unsigned Start = MBlazeRegisterInfo::getRegisterNumbering(ArgRegEnd+1);
unsigned End = MBlazeRegisterInfo::getRegisterNumbering(MBlaze::R10);
unsigned StackLoc = ArgLocs.size()-1 + (Start - Begin);
for (; Start <= End; ++Start, ++StackLoc) {
unsigned Reg = MBlazeRegisterInfo::getRegisterFromNumbering(Start);
unsigned LiveReg = MF.addLiveIn(Reg, RC);
SDValue ArgValue = DAG.getCopyFromReg(Chain, dl, LiveReg, MVT::i32);
int FI = MFI->CreateFixedObject(4, 0, true, false);
MBlazeFI->recordStoreVarArgsFI(FI, -(4+(StackLoc*4)));
SDValue PtrOff = DAG.getFrameIndex(FI, getPointerTy());
OutChains.push_back(DAG.getStore(Chain, dl, ArgValue, PtrOff, NULL, 0,
false, false, 0));
// Record the frame index of the first variable argument
// which is a value necessary to VASTART.
if (!VarArgsFrameIndex)
VarArgsFrameIndex = FI;
}
}
// All stores are grouped in one node to allow the matching between
// the size of Ins and InVals. This only happens when on varg functions
if (!OutChains.empty()) {
OutChains.push_back(Chain);
Chain = DAG.getNode(ISD::TokenFactor, dl, MVT::Other,
&OutChains[0], OutChains.size());
}
return Chain; return Chain;
} }

3
lib/Target/MBlaze/MBlazeISelLowering.h
View File

@@ -63,8 +63,6 @@ namespace llvm {
//===--------------------------------------------------------------------===// //===--------------------------------------------------------------------===//
class MBlazeTargetLowering : public TargetLowering { class MBlazeTargetLowering : public TargetLowering {
int VarArgsFrameIndex; // FrameIndex for start of varargs area.
public: public:
explicit MBlazeTargetLowering(MBlazeTargetMachine &TM); explicit MBlazeTargetLowering(MBlazeTargetMachine &TM);
@@ -98,7 +96,6 @@ namespace llvm {
SDValue LowerGlobalTLSAddress(SDValue Op, SelectionDAG &DAG); SDValue LowerGlobalTLSAddress(SDValue Op, SelectionDAG &DAG);
SDValue LowerJumpTable(SDValue Op, SelectionDAG &DAG); SDValue LowerJumpTable(SDValue Op, SelectionDAG &DAG);
SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG); SDValue LowerSELECT_CC(SDValue Op, SelectionDAG &DAG);
SDValue LowerVASTART(SDValue Op, SelectionDAG &DAG);
virtual SDValue virtual SDValue
LowerFormalArguments(SDValue Chain, LowerFormalArguments(SDValue Chain,

57
lib/Target/MBlaze/MBlazeRegisterInfo.cpp
View File

@@ -85,47 +85,6 @@ unsigned MBlazeRegisterInfo::getRegisterNumbering(unsigned RegEnum) {
return 0; // Not reached return 0; // Not reached
} }
/// getRegisterFromNumbering - Given the enum value for some register, e.g.
/// MBlaze::R0, return the number that it corresponds to (e.g. 0).
unsigned MBlazeRegisterInfo::getRegisterFromNumbering(unsigned Reg) {
switch (Reg) {
case 0 : return MBlaze::R0;
case 1 : return MBlaze::R1;
case 2 : return MBlaze::R2;
case 3 : return MBlaze::R3;
case 4 : return MBlaze::R4;
case 5 : return MBlaze::R5;
case 6 : return MBlaze::R6;
case 7 : return MBlaze::R7;
case 8 : return MBlaze::R8;
case 9 : return MBlaze::R9;
case 10 : return MBlaze::R10;
case 11 : return MBlaze::R11;
case 12 : return MBlaze::R12;
case 13 : return MBlaze::R13;
case 14 : return MBlaze::R14;
case 15 : return MBlaze::R15;
case 16 : return MBlaze::R16;
case 17 : return MBlaze::R17;
case 18 : return MBlaze::R18;
case 19 : return MBlaze::R19;
case 20 : return MBlaze::R20;
case 21 : return MBlaze::R21;
case 22 : return MBlaze::R22;
case 23 : return MBlaze::R23;
case 24 : return MBlaze::R24;
case 25 : return MBlaze::R25;
case 26 : return MBlaze::R26;
case 27 : return MBlaze::R27;
case 28 : return MBlaze::R28;
case 29 : return MBlaze::R29;
case 30 : return MBlaze::R30;
case 31 : return MBlaze::R31;
default: llvm_unreachable("Unknown register number!");
}
return 0; // Not reached
}
unsigned MBlazeRegisterInfo::getPICCallReg() { unsigned MBlazeRegisterInfo::getPICCallReg() {
return MBlaze::R20; return MBlaze::R20;
} }
@@ -221,9 +180,9 @@ void MBlazeRegisterInfo::adjustMBlazeStackFrame(MachineFunction &MF) const {
} }
if (MFI->hasCalls()) { if (MFI->hasCalls()) {
MBlazeFI->setRAStackOffset(0);
MFI->setObjectOffset(MFI->CreateStackObject(RegSize, RegSize, true), MFI->setObjectOffset(MFI->CreateStackObject(RegSize, RegSize, true),
StackOffset); StackOffset);
MBlazeFI->setRAStackOffset(StackOffset);
TopCPUSavedRegOff = StackOffset; TopCPUSavedRegOff = StackOffset;
StackOffset += RegSize; StackOffset += RegSize;
} }
@@ -286,7 +245,7 @@ eliminateFrameIndex(MachineBasicBlock::iterator II, int SPAdj,
// as explained on LowerFormalArguments, detect negative offsets // as explained on LowerFormalArguments, detect negative offsets
// and adjust SPOffsets considering the final stack size. // and adjust SPOffsets considering the final stack size.
int Offset = (spOffset < 0) ? (stackSize - spOffset) : (spOffset + 4); int Offset = ((spOffset < 0) ? (stackSize + (-(spOffset+4))) : (spOffset));
Offset += MI.getOperand(oi).getImm(); Offset += MI.getOperand(oi).getImm();
DEBUG(errs() << "Offset : " << Offset << "\n" << "<--------->\n"); DEBUG(errs() << "Offset : " << Offset << "\n" << "<--------->\n");
@@ -313,7 +272,6 @@ emitPrologue(MachineFunction &MF) const {
// No need to allocate space on the stack. // No need to allocate space on the stack.
if (StackSize == 0 && !MFI->hasCalls()) return; if (StackSize == 0 && !MFI->hasCalls()) return;
if (StackSize < 28 && MFI->hasCalls()) StackSize = 28;
int FPOffset = MBlazeFI->getFPStackOffset(); int FPOffset = MBlazeFI->getFPStackOffset();
int RAOffset = MBlazeFI->getRAStackOffset(); int RAOffset = MBlazeFI->getRAStackOffset();
@@ -349,6 +307,9 @@ emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const {
MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>(); MBlazeFunctionInfo *MBlazeFI = MF.getInfo<MBlazeFunctionInfo>();
DebugLoc dl = MBBI->getDebugLoc(); DebugLoc dl = MBBI->getDebugLoc();
// Get the number of bytes from FrameInfo
int NumBytes = (int) MFI->getStackSize();
// Get the FI's where RA and FP are saved. // Get the FI's where RA and FP are saved.
int FPOffset = MBlazeFI->getFPStackOffset(); int FPOffset = MBlazeFI->getFPStackOffset();
int RAOffset = MBlazeFI->getRAStackOffset(); int RAOffset = MBlazeFI->getRAStackOffset();
@@ -372,15 +333,11 @@ emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const {
.addImm(RAOffset).addReg(MBlaze::R1); .addImm(RAOffset).addReg(MBlaze::R1);
} }
// Get the number of bytes from FrameInfo
int StackSize = (int) MFI->getStackSize();
if (StackSize < 28 && MFI->hasCalls()) StackSize = 28;
// adjust stack. // adjust stack.
// addi R1, R1, imm // addi R1, R1, imm
if (StackSize) { if (NumBytes) {
BuildMI(MBB, MBBI, dl, TII.get(MBlaze::ADDI), MBlaze::R1) BuildMI(MBB, MBBI, dl, TII.get(MBlaze::ADDI), MBlaze::R1)
.addReg(MBlaze::R1).addImm(StackSize); .addReg(MBlaze::R1).addImm(NumBytes);
} }
} }

6
lib/Target/MBlaze/MBlazeRegisterInfo.h
View File

@@ -43,7 +43,6 @@ struct MBlazeRegisterInfo : public MBlazeGenRegisterInfo {
/// getRegisterNumbering - Given the enum value for some register, e.g. /// getRegisterNumbering - Given the enum value for some register, e.g.
/// MBlaze::RA, return the number that it corresponds to (e.g. 31). /// MBlaze::RA, return the number that it corresponds to (e.g. 31).
static unsigned getRegisterNumbering(unsigned RegEnum); static unsigned getRegisterNumbering(unsigned RegEnum);
static unsigned getRegisterFromNumbering(unsigned RegEnum);
/// Get PIC indirect call register /// Get PIC indirect call register
static unsigned getPICCallReg(); static unsigned getPICCallReg();
@@ -83,11 +82,6 @@ struct MBlazeRegisterInfo : public MBlazeGenRegisterInfo {
unsigned getEHExceptionRegister() const; unsigned getEHExceptionRegister() const;
unsigned getEHHandlerRegister() const; unsigned getEHHandlerRegister() const;
/// targetHandlesStackFrameRounding - Returns true if the target is
/// responsible for rounding up the stack frame (probably at emitPrologue
/// time).
bool targetHandlesStackFrameRounding() const { return true; }
int getDwarfRegNum(unsigned RegNum, bool isEH) const; int getDwarfRegNum(unsigned RegNum, bool isEH) const;
}; };

28
test/CodeGen/MBlaze/cc.ll
View File

@@ -101,7 +101,7 @@ define i32 @params7_32bitret(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f,
i32 %g) { i32 %g) {
; CHECK: params7_32bitret: ; CHECK: params7_32bitret:
ret i32 %g ret i32 %g
; CHECK: {{lwi? r3, r1, 32}} ; CHECK: {{lwi? r3, r1, 8}}
; CHECK-NOT: {{.* r4, .*, .*}} ; CHECK-NOT: {{.* r4, .*, .*}}
; CHECK: rtsd ; CHECK: rtsd
} }
@@ -110,7 +110,7 @@ define i32 @params8_32bitret(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f,
i32 %g, i32 %h) { i32 %g, i32 %h) {
; CHECK: params8_32bitret: ; CHECK: params8_32bitret:
ret i32 %h ret i32 %h
; CHECK: {{lwi? r3, r1, 36}} ; CHECK: {{lwi? r3, r1, 12}}
; CHECK-NOT: {{.* r4, .*, .*}} ; CHECK-NOT: {{.* r4, .*, .*}}
; CHECK: rtsd ; CHECK: rtsd
} }
@@ -119,7 +119,7 @@ define i32 @params9_32bitret(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f,
i32 %g, i32 %h, i32 %i) { i32 %g, i32 %h, i32 %i) {
; CHECK: params9_32bitret: ; CHECK: params9_32bitret:
ret i32 %i ret i32 %i
; CHECK: {{lwi? r3, r1, 40}} ; CHECK: {{lwi? r3, r1, 16}}
; CHECK-NOT: {{.* r4, .*, .*}} ; CHECK-NOT: {{.* r4, .*, .*}}
; CHECK: rtsd ; CHECK: rtsd
} }
@@ -128,7 +128,7 @@ define i32 @params10_32bitret(i32 %a, i32 %b, i32 %c, i32 %d, i32 %e, i32 %f,
i32 %g, i32 %h, i32 %i, i32 %j) { i32 %g, i32 %h, i32 %i, i32 %j) {
; CHECK: params10_32bitret: ; CHECK: params10_32bitret:
ret i32 %j ret i32 %j
; CHECK: {{lwi? r3, r1, 44}} ; CHECK: {{lwi? r3, r1, 20}}
; CHECK-NOT: {{.* r4, .*, .*}} ; CHECK-NOT: {{.* r4, .*, .*}}
; CHECK: rtsd ; CHECK: rtsd
} }
@@ -243,7 +243,7 @@ define void @testing() {
%tmp.11 = call i32 @params7_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5, %tmp.11 = call i32 @params7_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5,
i32 6, i32 7) i32 6, i32 7)
; CHECK: {{swi? .*, r1, 28}} ; CHECK: {{swi? .*, r1, 4}}
; CHECK: {{.* r5, .*, .*}} ; CHECK: {{.* r5, .*, .*}}
; CHECK: {{.* r6, .*, .*}} ; CHECK: {{.* r6, .*, .*}}
; CHECK: {{.* r7, .*, .*}} ; CHECK: {{.* r7, .*, .*}}
@@ -259,8 +259,8 @@ define void @testing() {
%tmp.12 = call i32 @params8_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5, %tmp.12 = call i32 @params8_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5,
i32 6, i32 7, i32 8) i32 6, i32 7, i32 8)
; CHECK: {{swi? .*, r1, 28}} ; CHECK: {{swi? .*, r1, 4}}
; CHECK: {{swi? .*, r1, 32}} ; CHECK: {{swi? .*, r1, 8}}
; CHECK: {{.* r5, .*, .*}} ; CHECK: {{.* r5, .*, .*}}
; CHECK: {{.* r6, .*, .*}} ; CHECK: {{.* r6, .*, .*}}
; CHECK: {{.* r7, .*, .*}} ; CHECK: {{.* r7, .*, .*}}
@@ -276,9 +276,9 @@ define void @testing() {
%tmp.13 = call i32 @params9_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5, %tmp.13 = call i32 @params9_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5,
i32 6, i32 7, i32 8, i32 9) i32 6, i32 7, i32 8, i32 9)
; CHECK: {{swi? .*, r1, 28}} ; CHECK: {{swi? .*, r1, 4}}
; CHECK: {{swi? .*, r1, 32}} ; CHECK: {{swi? .*, r1, 8}}
; CHECK: {{swi? .*, r1, 36}} ; CHECK: {{swi? .*, r1, 12}}
; CHECK: {{.* r5, .*, .*}} ; CHECK: {{.* r5, .*, .*}}
; CHECK: {{.* r6, .*, .*}} ; CHECK: {{.* r6, .*, .*}}
; CHECK: {{.* r7, .*, .*}} ; CHECK: {{.* r7, .*, .*}}
@@ -294,10 +294,10 @@ define void @testing() {
%tmp.14 = call i32 @params10_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5, %tmp.14 = call i32 @params10_32bitret(i32 1, i32 2, i32 3, i32 4, i32 5,
i32 6, i32 7, i32 8, i32 9, i32 10) i32 6, i32 7, i32 8, i32 9, i32 10)
; CHECK: {{swi? .*, r1, 28}} ; CHECK: {{swi? .*, r1, 4}}
; CHECK: {{swi? .*, r1, 32}} ; CHECK: {{swi? .*, r1, 8}}
; CHECK: {{swi? .*, r1, 36}} ; CHECK: {{swi? .*, r1, 12}}
; CHECK: {{swi? .*, r1, 40}} ; CHECK: {{swi? .*, r1, 16}}
; CHECK: {{.* r5, .*, .*}} ; CHECK: {{.* r5, .*, .*}}
; CHECK: {{.* r6, .*, .*}} ; CHECK: {{.* r6, .*, .*}}
; CHECK: {{.* r7, .*, .*}} ; CHECK: {{.* r7, .*, .*}}