From 7384a2de027b5b5b20b5110b64d05bbe51ea3a03 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 12 Nov 2015 14:37:56 +0000 Subject: Revert r252858: "[WebAssembly] Switch to MC for instruction printing." It broke the CMake build: "Cannot find source file: WebAssemblyRegNumbering.cpp" llvm-svn: 252897 --- .../Target/WebAssembly/WebAssemblyMCInstLower.cpp | 29 ++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp') diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp index 4226a53..59acbdb 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp @@ -14,13 +14,11 @@ //===----------------------------------------------------------------------===// #include "WebAssemblyMCInstLower.h" -#include "WebAssemblyMachineFunctionInfo.h" #include "llvm/ADT/SmallString.h" +#include "llvm/IR/Constants.h" #include "llvm/CodeGen/AsmPrinter.h" #include "llvm/CodeGen/MachineBasicBlock.h" -#include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/IR/Constants.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCExpr.h" @@ -57,36 +55,25 @@ void WebAssemblyMCInstLower::Lower(const MachineInstr *MI, default: MI->dump(); llvm_unreachable("unknown operand type"); - case MachineOperand::MO_Register: { + case MachineOperand::MO_Register: // Ignore all implicit register operands. if (MO.isImplicit()) continue; - // TODO: Handle physical registers. - const WebAssemblyFunctionInfo &MFI = - *MI->getParent()->getParent()->getInfo(); - unsigned WAReg = MFI.getWAReg(MO.getReg()); - MCOp = MCOperand::createReg(WAReg); + MCOp = MCOperand::createReg(MO.getReg()); break; - } case MachineOperand::MO_Immediate: MCOp = MCOperand::createImm(MO.getImm()); break; - case MachineOperand::MO_FPImmediate: { - // TODO: MC converts all floating point immediate operands to double. - // This is fine for numeric values, but may cause NaNs to change bits. - const ConstantFP *Imm = MO.getFPImm(); - if (Imm->getType()->isFloatTy()) - MCOp = MCOperand::createFPImm(Imm->getValueAPF().convertToFloat()); - else if (Imm->getType()->isDoubleTy()) - MCOp = MCOperand::createFPImm(Imm->getValueAPF().convertToDouble()); - else - llvm_unreachable("unknown floating point immediate type"); + case MachineOperand::MO_FPImmediate: + MCOp = MCOperand::createFPImm( + MO.getFPImm()->getValueAPF().convertToDouble()); break; - } case MachineOperand::MO_MachineBasicBlock: MCOp = MCOperand::createExpr( MCSymbolRefExpr::create(MO.getMBB()->getSymbol(), Ctx)); break; + case MachineOperand::MO_RegisterMask: + continue; case MachineOperand::MO_GlobalAddress: MCOp = LowerSymbolOperand(MO, GetGlobalAddressSymbol(MO)); break; -- cgit v1.1