[llvm-commits] [llvm] r113996 - in /llvm/trunk: include/llvm/MC/MCInst.h lib/Target/ARM/ARMMCInstLower.cpp lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp

[Chris Lattner]

On Sep 15, 2010, at 11:47 AM, Jim Grosbach wrote:

> Author: grosbach
> Date: Wed Sep 15 13:47:08 2010
> New Revision: 113996
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=113996&view=rev
> Log:
> Add support for floating point immediates to MC instruction printing. ARM
> VFP instructions use it for loading some constants, so implement that
> handling.
> 
> Not thrilled with adding a member to MCOperand, but not sure there's much of
> a better option that's not pretty fragile (like putting a double in the
> union instead and just assuming that's good enough). Suggestions welcome...

Please just use "double" or, better yet, "int64_t" instead, and have an accessor turn that into an apfloat.  The new kFPImmediate kind is great, we just really want MCOperand to avoid a dtor.

Thanks Jim,

-Chris

> 
> 
> Modified:
>    llvm/trunk/include/llvm/MC/MCInst.h
>    llvm/trunk/lib/Target/ARM/ARMMCInstLower.cpp
>    llvm/trunk/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp
> 
> Modified: llvm/trunk/include/llvm/MC/MCInst.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCInst.h?rev=113996&r1=113995&r2=113996&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/MC/MCInst.h (original)
> +++ llvm/trunk/include/llvm/MC/MCInst.h Wed Sep 15 13:47:08 2010
> @@ -16,6 +16,7 @@
> #ifndef LLVM_MC_MCINST_H
> #define LLVM_MC_MCINST_H
> 
> +#include "llvm/ADT/APFloat.h"
> #include "llvm/ADT/SmallVector.h"
> #include "llvm/ADT/StringRef.h"
> #include "llvm/System/DataTypes.h"
> @@ -33,6 +34,7 @@
>     kInvalid,                 ///< Uninitialized.
>     kRegister,                ///< Register operand.
>     kImmediate,               ///< Immediate operand.
> +    kFPImmediate,             ///< Floating-point immediate operand.
>     kExpr                     ///< Relocatable immediate operand.
>   };
>   unsigned char Kind;
> @@ -42,13 +44,17 @@
>     int64_t ImmVal;
>     const MCExpr *ExprVal;
>   };
> +  // This can't go in the union due to the non-trivial copy constructor
> +  // of APFloat. It's still only valid for Kind == kFPImmediate, though.
> +  APFloat FPImmVal;
> public:
> 
> -  MCOperand() : Kind(kInvalid) {}
> +  MCOperand() : Kind(kInvalid), FPImmVal(0.0) {}
> 
>   bool isValid() const { return Kind != kInvalid; }
>   bool isReg() const { return Kind == kRegister; }
>   bool isImm() const { return Kind == kImmediate; }
> +  bool isFPImm() const { return Kind == kFPImmediate; }
>   bool isExpr() const { return Kind == kExpr; }
> 
>   /// getReg - Returns the register number.
> @@ -72,6 +78,16 @@
>     ImmVal = Val;
>   }
> 
> +  const APFloat &getFPImm() const {
> +    assert(isFPImm() && "This is not an FP immediate");
> +    return FPImmVal;
> +  }
> +
> +  void setFPImm(const APFloat &Val) {
> +    assert(isFPImm() && "This is not an FP immediate");
> +    FPImmVal = Val;
> +  }
> +
>   const MCExpr *getExpr() const {
>     assert(isExpr() && "This is not an expression");
>     return ExprVal;
> @@ -93,6 +109,12 @@
>     Op.ImmVal = Val;
>     return Op;
>   }
> +  static MCOperand CreateFPImm(const APFloat &Val) {
> +    MCOperand Op;
> +    Op.Kind = kFPImmediate;
> +    Op.FPImmVal = Val;
> +    return Op;
> +  }
>   static MCOperand CreateExpr(const MCExpr *Val) {
>     MCOperand Op;
>     Op.Kind = kExpr;
> 
> Modified: llvm/trunk/lib/Target/ARM/ARMMCInstLower.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMMCInstLower.cpp?rev=113996&r1=113995&r2=113996&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/ARMMCInstLower.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/ARMMCInstLower.cpp Wed Sep 15 13:47:08 2010
> @@ -16,6 +16,7 @@
> #include "ARMMCInstLower.h"
> //#include "llvm/CodeGen/MachineModuleInfoImpls.h"
> #include "llvm/CodeGen/AsmPrinter.h"
> +#include "llvm/Constants.h"
> #include "llvm/CodeGen/MachineBasicBlock.h"
> #include "llvm/MC/MCAsmInfo.h"
> #include "llvm/MC/MCContext.h"
> @@ -155,6 +156,9 @@
>       MCOp = LowerSymbolOperand(MO, Printer.GetBlockAddressSymbol(
>                                               MO.getBlockAddress()));
>       break;
> +    case MachineOperand::MO_FPImmediate:
> +      MCOp = MCOperand::CreateFPImm(MO.getFPImm()->getValueAPF());
> +      break;
>     }
> 
>     OutMI.addOperand(MCOp);
> 
> Modified: llvm/trunk/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp?rev=113996&r1=113995&r2=113996&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp (original)
> +++ llvm/trunk/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp Wed Sep 15 13:47:08 2010
> @@ -729,12 +729,12 @@
> 
> void ARMInstPrinter::printVFPf32ImmOperand(const MCInst *MI, unsigned OpNum,
>                                            raw_ostream &O) {
> -  O << '#' << MI->getOperand(OpNum).getImm();
> +  O << '#' << MI->getOperand(OpNum).getFPImm().convertToFloat();
> }
> 
> void ARMInstPrinter::printVFPf64ImmOperand(const MCInst *MI, unsigned OpNum,
>                                            raw_ostream &O) {
> -  O << '#' << MI->getOperand(OpNum).getImm();
> +  O << '#' << MI->getOperand(OpNum).getFPImm().convertToDouble();
> }
> 
> void ARMInstPrinter::printNEONModImmOperand(const MCInst *MI, unsigned OpNum,
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits