From 40edf73a62bf025eba4391e806fb1ddada662355 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Tue, 14 Dec 2010 21:10:47 +0000 Subject: [PATCH] Refactor a bit for legibility. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121790 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMAsmPrinter.cpp | 55 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/lib/Target/ARM/ARMAsmPrinter.cpp b/lib/Target/ARM/ARMAsmPrinter.cpp index cabffa73cd6..572d691afe0 100644 --- a/lib/Target/ARM/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/ARMAsmPrinter.cpp @@ -713,6 +713,18 @@ void ARMAsmPrinter::PrintDebugValueComment(const MachineInstr *MI, printOperand(MI, NOps-2, OS); } +static void populateADROperands(MCInst &Inst, unsigned Dest, + const MCSymbol *Label, + unsigned pred, unsigned ccreg, + MCContext &Ctx) { + const MCExpr *SymbolExpr = MCSymbolRefExpr::Create(Label, Ctx); + Inst.addOperand(MCOperand::CreateReg(Dest)); + Inst.addOperand(MCOperand::CreateExpr(SymbolExpr)); + // Add predicate operands. + Inst.addOperand(MCOperand::CreateImm(pred)); + Inst.addOperand(MCOperand::CreateReg(ccreg)); +} + void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) { switch (MI->getOpcode()) { default: break; @@ -734,42 +746,29 @@ void ARMAsmPrinter::EmitInstruction(const MachineInstr *MI) { } return; } - case ARM::t2LEApcrel: - case ARM::LEApcrel: { + case ARM::LEApcrel: + case ARM::t2LEApcrel: { // FIXME: Need to also handle globals and externals - assert (MI->getOperand(1).isCPI()); - unsigned LabelId = MI->getOperand(1).getIndex(); - MCSymbol *Sym = GetCPISymbol(LabelId); - const MCExpr *SymbolExpr = MCSymbolRefExpr::Create(Sym, OutContext); MCInst TmpInst; - if (MI->getOpcode() == ARM::LEApcrel) - TmpInst.setOpcode(ARM::ADR); - else - TmpInst.setOpcode(ARM::t2ADR); - TmpInst.addOperand(MCOperand::CreateReg(MI->getOperand(0).getReg())); - TmpInst.addOperand(MCOperand::CreateExpr(SymbolExpr)); - // Add predicate operands. - TmpInst.addOperand(MCOperand::CreateImm(MI->getOperand(2).getImm())); - TmpInst.addOperand(MCOperand::CreateReg(MI->getOperand(3).getReg())); + TmpInst.setOpcode(MI->getOpcode() == ARM::t2LEApcrel + ? ARM::t2ADR : ARM::ADR); + populateADROperands(TmpInst, MI->getOperand(0).getReg(), + GetCPISymbol(MI->getOperand(1).getIndex()), + MI->getOperand(2).getImm(), MI->getOperand(3).getReg(), + OutContext); OutStreamer.EmitInstruction(TmpInst); return; } case ARM::t2LEApcrelJT: case ARM::LEApcrelJT: { - unsigned JTI = MI->getOperand(1).getIndex(); - unsigned Id = MI->getOperand(2).getImm(); - MCSymbol *JTISymbol = GetARMJTIPICJumpTableLabel2(JTI, Id); - const MCExpr *SymbolExpr = MCSymbolRefExpr::Create(JTISymbol, OutContext); MCInst TmpInst; - if (MI->getOpcode() == ARM::LEApcrelJT) - TmpInst.setOpcode(ARM::ADR); - else - TmpInst.setOpcode(ARM::t2ADR); - TmpInst.addOperand(MCOperand::CreateReg(MI->getOperand(0).getReg())); - TmpInst.addOperand(MCOperand::CreateExpr(SymbolExpr)); - // Add predicate operands. - TmpInst.addOperand(MCOperand::CreateImm(MI->getOperand(3).getImm())); - TmpInst.addOperand(MCOperand::CreateReg(MI->getOperand(4).getReg())); + TmpInst.setOpcode(MI->getOpcode() == ARM::t2LEApcrelJT + ? ARM::t2ADR : ARM::ADR); + populateADROperands(TmpInst, MI->getOperand(0).getReg(), + GetARMJTIPICJumpTableLabel2(MI->getOperand(1).getIndex(), + MI->getOperand(2).getImm()), + MI->getOperand(3).getImm(), MI->getOperand(4).getReg(), + OutContext); OutStreamer.EmitInstruction(TmpInst); return; }