Changes in directory llvm/lib/Target/ARM:
ARM.h updated: 1.4 -> 1.5
ARMAsmPrinter.cpp updated: 1.19 -> 1.20
ARMISelDAGToDAG.cpp updated: 1.44 -> 1.45
ARMInstrInfo.cpp updated: 1.6 -> 1.7
ARMInstrInfo.td updated: 1.27 -> 1.28
ARMRegisterInfo.cpp updated: 1.18 -> 1.19
---
Log message:
add shifts to addressing mode 1
---
Diffs of the changes: (+81 -32)
ARM.h | 10 ++++++++++
ARMAsmPrinter.cpp | 31 ++++++++++++++++++++++++++++---
ARMISelDAGToDAG.cpp | 30 ++++++++++++++++++++++++++----
ARMInstrInfo.cpp | 9 ++++++---
ARMInstrInfo.td | 21 +++------------------
ARMRegisterInfo.cpp | 12 ++++++++----
6 files changed, 81 insertions(+), 32 deletions(-)
Index: llvm/lib/Target/ARM/ARM.h
diff -u llvm/lib/Target/ARM/ARM.h:1.4 llvm/lib/Target/ARM/ARM.h:1.5
--- llvm/lib/Target/ARM/ARM.h:1.4 Sat Sep 2 15:24:25 2006
+++ llvm/lib/Target/ARM/ARM.h Wed Sep 13 07:09:43 2006
@@ -41,6 +41,16 @@
};
}
+ namespace ARMShift {
+ enum ShiftTypes {
+ LSL,
+ LSR,
+ ASR,
+ ROR,
+ RRX
+ };
+ }
+
static const char *ARMCondCodeToString(ARMCC::CondCodes CC) {
switch (CC) {
default: assert(0 && "Unknown condition code");
Index: llvm/lib/Target/ARM/ARMAsmPrinter.cpp
diff -u llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.19
llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.20
--- llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.19 Mon Sep 11 12:25:40 2006
+++ llvm/lib/Target/ARM/ARMAsmPrinter.cpp Wed Sep 13 07:09:43 2006
@@ -158,13 +158,38 @@
}
void ARMAsmPrinter::printAddrMode1(const MachineInstr *MI, int opNum) {
- const MachineOperand &MO1 = MI->getOperand(opNum);
+ const MachineOperand &Arg = MI->getOperand(opNum);
+ const MachineOperand &Shift = MI->getOperand(opNum + 1);
+ const MachineOperand &ShiftType = MI->getOperand(opNum + 2);
- if(MO1.isImmediate()) {
+ if(Arg.isImmediate()) {
+ assert(Shift.getImmedValue() == 0);
printOperand(MI, opNum);
} else {
- assert(MO1.isRegister());
+ assert(Arg.isRegister());
printOperand(MI, opNum);
+ if(Shift.isRegister() || Shift.getImmedValue() != 0) {
+ const char *s = NULL;
+ switch(ShiftType.getImmedValue()) {
+ case ARMShift::LSL:
+ s = ", lsl ";
+ break;
+ case ARMShift::LSR:
+ s = ", lsr ";
+ break;
+ case ARMShift::ASR:
+ s = ", asr ";
+ break;
+ case ARMShift::ROR:
+ s = ", ror ";
+ break;
+ case ARMShift::RRX:
+ s = ", rrx ";
+ break;
+ }
+ O << s;
+ printOperand(MI, opNum + 1);
+ }
}
}
Index: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
diff -u llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.44
llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.45
--- llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.44 Tue Sep 12 16:04:05 2006
+++ llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp Wed Sep 13 07:09:43 2006
@@ -445,7 +445,8 @@
SDNode *Select(SDOperand Op);
virtual void InstructionSelectBasicBlock(SelectionDAG &DAG);
bool SelectAddrRegImm(SDOperand N, SDOperand &Offset, SDOperand &Base);
- bool SelectAddrMode1(SDOperand N, SDOperand &Arg);
+ bool SelectAddrMode1(SDOperand N, SDOperand &Arg, SDOperand &Shift,
+ SDOperand &ShiftType);
// Include the pieces autogenerated from the target description.
#include "ARMGenDAGISel.inc"
@@ -480,17 +481,38 @@
}
bool ARMDAGToDAGISel::SelectAddrMode1(SDOperand N,
- SDOperand &Arg) {
+ SDOperand &Arg,
+ SDOperand &Shift,
+ SDOperand &ShiftType) {
switch(N.getOpcode()) {
case ISD::Constant: {
//TODO:check that we have a valid constant
int32_t t = cast<ConstantSDNode>(N)->getValue();
- Arg = CurDAG->getTargetConstant(t, MVT::i32);
+ Arg = CurDAG->getTargetConstant(t, MVT::i32);
+ Shift = CurDAG->getTargetConstant(0, MVT::i32);
+ ShiftType = CurDAG->getTargetConstant(ARMShift::LSL, MVT::i32);
return true;
}
+ case ISD::SRA:
+ Arg = N.getOperand(0);
+ Shift = N.getOperand(1);
+ ShiftType = CurDAG->getTargetConstant(ARMShift::ASR, MVT::i32);
+ return true;
+ case ISD::SRL:
+ Arg = N.getOperand(0);
+ Shift = N.getOperand(1);
+ ShiftType = CurDAG->getTargetConstant(ARMShift::LSR, MVT::i32);
+ return true;
+ case ISD::SHL:
+ Arg = N.getOperand(0);
+ Shift = N.getOperand(1);
+ ShiftType = CurDAG->getTargetConstant(ARMShift::LSL, MVT::i32);
+ return true;
}
- Arg = N;
+ Arg = N;
+ Shift = CurDAG->getTargetConstant(0, MVT::i32);
+ ShiftType = CurDAG->getTargetConstant(ARMShift::LSL, MVT::i32);
return true;
}
Index: llvm/lib/Target/ARM/ARMInstrInfo.cpp
diff -u llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.6
llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.7
--- llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.6 Mon Sep 11 12:25:40 2006
+++ llvm/lib/Target/ARM/ARMInstrInfo.cpp Wed Sep 13 07:09:43 2006
@@ -33,15 +33,18 @@
unsigned &SrcReg, unsigned &DstReg) const {
MachineOpCode oc = MI.getOpcode();
switch (oc) {
- case ARM::MOV:
- assert(MI.getNumOperands() == 2 &&
+ case ARM::MOV: {
+ assert(MI.getNumOperands() == 4 &&
MI.getOperand(0).isRegister() &&
"Invalid ARM MOV instruction");
- if (MI.getOperand(1).isRegister()) {
+ const MachineOperand &Arg = MI.getOperand(1);
+ const MachineOperand &Shift = MI.getOperand(2);
+ if (Arg.isRegister() && Shift.isImmediate() && Shift.getImmedValue() == 0)
{
SrcReg = MI.getOperand(1).getReg();
DstReg = MI.getOperand(0).getReg();
return true;
}
}
+ }
return false;
}
Index: llvm/lib/Target/ARM/ARMInstrInfo.td
diff -u llvm/lib/Target/ARM/ARMInstrInfo.td:1.27
llvm/lib/Target/ARM/ARMInstrInfo.td:1.28
--- llvm/lib/Target/ARM/ARMInstrInfo.td:1.27 Mon Sep 11 14:24:19 2006
+++ llvm/lib/Target/ARM/ARMInstrInfo.td Wed Sep 13 07:09:43 2006
@@ -15,8 +15,8 @@
// Address operands
def op_addr_mode1 : Operand<iPTR> {
let PrintMethod = "printAddrMode1";
- let NumMIOperands = 1;
- let MIOperandInfo = (ops ptr_rc);
+ let NumMIOperands = 3;
+ let MIOperandInfo = (ops ptr_rc, ptr_rc, i32imm);
}
def memri : Operand<iPTR> {
@@ -27,7 +27,7 @@
// Define ARM specific addressing mode.
//Addressing Mode 1: data processing operands
-def addr_mode1 : ComplexPattern<iPTR, 1, "SelectAddrMode1", [imm]>;
+def addr_mode1 : ComplexPattern<iPTR, 3, "SelectAddrMode1", [imm, sra, shl,
srl]>;
//register plus/minus 12 bit offset
def iaddr : ComplexPattern<iPTR, 2, "SelectAddrRegImm", [frameindex]>;
@@ -119,21 +119,6 @@
"and $dst, $a, $b",
[(set IntRegs:$dst, (and IntRegs:$a, addr_mode1:$b))]>;
-// All arm data processing instructions have a shift. Maybe we don't have
-// to implement this
-def SHL : InstARM<(ops IntRegs:$dst, IntRegs:$a, IntRegs:$b),
- "mov $dst, $a, lsl $b",
- [(set IntRegs:$dst, (shl IntRegs:$a, IntRegs:$b))]>;
-
-def SRA : InstARM<(ops IntRegs:$dst, IntRegs:$a, IntRegs:$b),
- "mov $dst, $a, asr $b",
- [(set IntRegs:$dst, (sra IntRegs:$a, IntRegs:$b))]>;
-
-def SRL : InstARM<(ops IntRegs:$dst, IntRegs:$a, IntRegs:$b),
- "mov $dst, $a, lsr $b",
- [(set IntRegs:$dst, (srl IntRegs:$a, IntRegs:$b))]>;
-
-
def EOR : InstARM<(ops IntRegs:$dst, IntRegs:$a, op_addr_mode1:$b),
"eor $dst, $a, $b",
[(set IntRegs:$dst, (xor IntRegs:$a, addr_mode1:$b))]>;
Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.18
llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.19
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.18 Mon Sep 11 12:25:40 2006
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp Wed Sep 13 07:09:43 2006
@@ -48,7 +48,8 @@
unsigned DestReg, unsigned SrcReg,
const TargetRegisterClass *RC) const {
assert (RC == ARM::IntRegsRegisterClass);
- BuildMI(MBB, I, ARM::MOV, 1, DestReg).addReg(SrcReg);
+ BuildMI(MBB, I, ARM::MOV, 3, DestReg).addReg(SrcReg).addImm(0)
+ .addImm(ARMShift::LSL);
}
MachineInstr *ARMRegisterInfo::foldMemoryOperand(MachineInstr* MI,
@@ -114,7 +115,8 @@
// Insert a set of r12 with the full address
// r12 = r13 + offset
MachineBasicBlock *MBB2 = MI.getParent();
- BuildMI(*MBB2, II, ARM::ADD, 2, ARM::R12).addReg(ARM::R13).addImm(Offset);
+ BuildMI(*MBB2, II, ARM::ADD, 4, ARM::R12).addReg(ARM::R13).addImm(Offset)
+ .addImm(0).addImm(ARMShift::LSL);
// Replace the FrameIndex with r12
MI.getOperand(FrameIdx).ChangeToRegister(ARM::R12, false);
@@ -140,7 +142,8 @@
MFI->setStackSize(NumBytes);
//sub sp, sp, #NumBytes
- BuildMI(MBB, MBBI, ARM::SUB, 2, ARM::R13).addReg(ARM::R13).addImm(NumBytes);
+ BuildMI(MBB, MBBI, ARM::SUB, 4, ARM::R13).addReg(ARM::R13).addImm(NumBytes)
+ .addImm(0).addImm(ARMShift::LSL);
}
void ARMRegisterInfo::emitEpilogue(MachineFunction &MF,
@@ -153,7 +156,8 @@
int NumBytes = (int) MFI->getStackSize();
//add sp, sp, #NumBytes
- BuildMI(MBB, MBBI, ARM::ADD, 2, ARM::R13).addReg(ARM::R13).addImm(NumBytes);
+ BuildMI(MBB, MBBI, ARM::ADD, 4, ARM::R13).addReg(ARM::R13).addImm(NumBytes)
+ .addImm(0).addImm(ARMShift::LSL);
}
unsigned ARMRegisterInfo::getRARegister() const {
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
