From: Bob Wilson Date: Thu, 16 Sep 2010 04:55:00 +0000 (+0000) Subject: Remove support for "dregpair" operand modifier, now that it is no longer being X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de0ae8f83dd8eabc831b0631c20ffa3b53a774f2;p=oota-llvm.git Remove support for "dregpair" operand modifier, now that it is no longer being used for anything. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114067 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index cccb8104bea..cea9fd5aaec 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -337,13 +337,7 @@ void ARMAsmPrinter::printOperand(const MachineInstr *MI, int OpNum, case MachineOperand::MO_Register: { unsigned Reg = MO.getReg(); assert(TargetRegisterInfo::isPhysicalRegister(Reg)); - if (Modifier && strcmp(Modifier, "dregpair") == 0) { - unsigned DRegLo = TM.getRegisterInfo()->getSubReg(Reg, ARM::dsub_0); - unsigned DRegHi = TM.getRegisterInfo()->getSubReg(Reg, ARM::dsub_1); - O << '{' - << getRegisterName(DRegLo) << ", " << getRegisterName(DRegHi) - << '}'; - } else if (Modifier && strcmp(Modifier, "lane") == 0) { + if (Modifier && strcmp(Modifier, "lane") == 0) { unsigned RegNum = getARMRegisterNumbering(Reg); unsigned DReg = TM.getRegisterInfo()->getMatchingSuperReg(Reg, diff --git a/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp index f2ba2d0617c..37c4f75e822 100644 --- a/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp +++ b/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp @@ -29,30 +29,6 @@ using namespace llvm; #undef MachineInstr #undef ARMAsmPrinter -// Get the constituent sub-regs for a dregpair from a Q register. -static std::pair GetDRegPair(unsigned QReg) { - switch (QReg) { - default: - assert(0 && "Unexpected register enum"); - case ARM::Q0: return std::pair(ARM::D0, ARM::D1); - case ARM::Q1: return std::pair(ARM::D2, ARM::D3); - case ARM::Q2: return std::pair(ARM::D4, ARM::D5); - case ARM::Q3: return std::pair(ARM::D6, ARM::D7); - case ARM::Q4: return std::pair(ARM::D8, ARM::D9); - case ARM::Q5: return std::pair(ARM::D10, ARM::D11); - case ARM::Q6: return std::pair(ARM::D12, ARM::D13); - case ARM::Q7: return std::pair(ARM::D14, ARM::D15); - case ARM::Q8: return std::pair(ARM::D16, ARM::D17); - case ARM::Q9: return std::pair(ARM::D18, ARM::D19); - case ARM::Q10: return std::pair(ARM::D20, ARM::D21); - case ARM::Q11: return std::pair(ARM::D22, ARM::D23); - case ARM::Q12: return std::pair(ARM::D24, ARM::D25); - case ARM::Q13: return std::pair(ARM::D26, ARM::D27); - case ARM::Q14: return std::pair(ARM::D28, ARM::D29); - case ARM::Q15: return std::pair(ARM::D30, ARM::D31); - } -} - static unsigned getDPRSuperRegForSPR(unsigned Reg) { switch (Reg) { default: @@ -165,11 +141,7 @@ void ARMInstPrinter::printOperand(const MCInst *MI, unsigned OpNo, const MCOperand &Op = MI->getOperand(OpNo); if (Op.isReg()) { unsigned Reg = Op.getReg(); - if (Modifier && strcmp(Modifier, "dregpair") == 0) { - std::pair dregpair = GetDRegPair(Reg); - O << '{' << getRegisterName(dregpair.first) << ", " - << getRegisterName(dregpair.second) << '}'; - } else if (Modifier && strcmp(Modifier, "lane") == 0) { + if (Modifier && strcmp(Modifier, "lane") == 0) { unsigned RegNum = getARMRegisterNumbering(Reg); unsigned DReg = getDPRSuperRegForSPR(Reg); O << getRegisterName(DReg) << '[' << (RegNum & 1) << ']';