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

Remove Predicate_* calls from MBlaze and XCore

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112920 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen
2010-09-03 00:35:16 +00:00
parent 7fa846f7d9
commit 7853cd0bea
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,7 @@ SelectAddr(SDNode *Op, SDValue Addr, SDValue &Offset, SDValue &Base) {
// Operand is a result from an ADD. // Operand is a result from an ADD.
if (Addr.getOpcode() == ISD::ADD) { if (Addr.getOpcode() == ISD::ADD) {
if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Addr.getOperand(1))) { if (ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Addr.getOperand(1))) {
if (Predicate_immSExt16(CN)) { if (isUInt<16>(CN->getZExtValue())) {
// If the first operand is a FI, get the TargetFI Node // If the first operand is a FI, get the TargetFI Node
if (FrameIndexSDNode *FIN = dyn_cast<FrameIndexSDNode> if (FrameIndexSDNode *FIN = dyn_cast<FrameIndexSDNode>

21
lib/Target/XCore/XCoreISelDAGToDAG.cpp
View File

@@ -56,6 +56,17 @@ namespace {
return CurDAG->getTargetConstant(Imm, MVT::i32); return CurDAG->getTargetConstant(Imm, MVT::i32);
} }
inline bool immMskBitp(SDNode *inN) const {
ConstantSDNode *N = cast<ConstantSDNode>(inN);
uint32_t value = (uint32_t)N->getZExtValue();
if (!isMask_32(value)) {
return false;
}
int msksize = 32 - CountLeadingZeros_32(value);
return (msksize >= 1 && msksize <= 8) ||
msksize == 16 || msksize == 24 || msksize == 32;
}
// Complex Pattern Selectors. // Complex Pattern Selectors.
bool SelectADDRspii(SDNode *Op, SDValue Addr, SDValue &Base, bool SelectADDRspii(SDNode *Op, SDValue Addr, SDValue &Base,
SDValue &Offset); SDValue &Offset);
@@ -151,17 +162,15 @@ SDNode *XCoreDAGToDAGISel::Select(SDNode *N) {
switch (N->getOpcode()) { switch (N->getOpcode()) {
default: break; default: break;
case ISD::Constant: { case ISD::Constant: {
if (Predicate_immMskBitp(N)) { uint64_t Val = cast<ConstantSDNode>(N)->getZExtValue();
if (immMskBitp(N)) {
// Transformation function: get the size of a mask // Transformation function: get the size of a mask
int64_t MaskVal = cast<ConstantSDNode>(N)->getZExtValue();
assert(isMask_32(MaskVal));
// Look for the first non-zero bit // Look for the first non-zero bit
SDValue MskSize = getI32Imm(32 - CountLeadingZeros_32(MaskVal)); SDValue MskSize = getI32Imm(32 - CountLeadingZeros_32(Val));
return CurDAG->getMachineNode(XCore::MKMSK_rus, dl, return CurDAG->getMachineNode(XCore::MKMSK_rus, dl,
MVT::i32, MskSize); MVT::i32, MskSize);
} }
else if (! Predicate_immU16(N)) { else if (!isUInt<16>(Val)) {
unsigned Val = cast<ConstantSDNode>(N)->getZExtValue();
SDValue CPIdx = SDValue CPIdx =
CurDAG->getTargetConstantPool(ConstantInt::get( CurDAG->getTargetConstantPool(ConstantInt::get(
Type::getInt32Ty(*CurDAG->getContext()), Val), Type::getInt32Ty(*CurDAG->getContext()), Val),

12
lib/Target/XCore/XCoreInstrInfo.td
View File

@@ -140,17 +140,7 @@ def immU20 : PatLeaf<(imm), [{
return (uint32_t)N->getZExtValue() < (1 << 20); return (uint32_t)N->getZExtValue() < (1 << 20);
}]>; }]>;
def immMskBitp : PatLeaf<(imm), [{ def immMskBitp : PatLeaf<(imm), [{ return immMskBitp(N); }]>;
uint32_t value = (uint32_t)N->getZExtValue();
if (!isMask_32(value)) {
return false;
}
int msksize = 32 - CountLeadingZeros_32(value);
return (msksize >= 1 && msksize <= 8)
|| msksize == 16
|| msksize == 24
|| msksize == 32;
}]>;
def immBitp : PatLeaf<(imm), [{ def immBitp : PatLeaf<(imm), [{
uint32_t value = (uint32_t)N->getZExtValue(); uint32_t value = (uint32_t)N->getZExtValue();