Subzero, MIPS32: Encoding of FP comparison instructions

src/IceInstMIPS32.h

 //===- subzero/src/IceInstMIPS32.h - MIPS32 machine instrs --*- C++ -*-----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 58 matching lines @@
   OperandMIPS32(OperandKindMIPS32 Kind, Type Ty)
       : Operand(static_cast<OperandKind>(Kind), Ty) {}
 };
 
 class OperandMIPS32FCC : public OperandMIPS32 {
   OperandMIPS32FCC() = delete;
   OperandMIPS32FCC(const OperandMIPS32FCC &) = delete;
   OperandMIPS32FCC &operator=(const OperandMIPS32FCC &) = delete;
 
 public:
-  enum FCC { FCC0 = 0, FCC1, FCC2, FCC3, FCC4, FCC5, FCC6, FCC7 };
+  typedef enum { FCC0 = 0, FCC1, FCC2, FCC3, FCC4, FCC5, FCC6, FCC7 } FCC;

[Jim Stichnoth, 2016/09/20 00:09:23]

Is this change necessary?  That pattern is used a lot in the code base.

If it is necessary, prefer "using" over "typedef".

(Actually I bet this was only a problem before the FpCondCode renaming.)

[obucinac, 2016/09/20 13:24:52]

Done.

   static OperandMIPS32FCC *create(Cfg *Func, OperandMIPS32FCC::FCC FCC) {
     return new (Func->allocate<OperandMIPS32FCC>()) OperandMIPS32FCC(FCC);
   }
 
+  OperandMIPS32FCC::FCC getFCC() const { return FpCondCode; }
+
   void emit(const Cfg *Func) const override {
     if (!BuildDefs::dump())
       return;
     Ostream &Str = Func->getContext()->getStrEmit();
-    Str << "$fcc" << static_cast<uint16_t>(FCC);
+    Str << "$fcc" << static_cast<uint16_t>(FpCondCode);
   }
 
   static bool classof(const Operand *Operand) {
     return Operand->getKind() == static_cast<OperandKind>(kFCC);
   }
 
   void dump(const Cfg *Func, Ostream &Str) const override {
     (void)Func;
     (void)Str;
   }
 
 private:
-  OperandMIPS32FCC(OperandMIPS32FCC::FCC FCC)
-      : OperandMIPS32(kFCC, IceType_i32), FCC(FCC){};
+  OperandMIPS32FCC(OperandMIPS32FCC::FCC CC)
+      : OperandMIPS32(kFCC, IceType_i32), FpCondCode(CC){};
 
-  const OperandMIPS32FCC::FCC FCC;
+  const FCC FpCondCode;
 };
 
 class OperandMIPS32Mem : public OperandMIPS32 {
   OperandMIPS32Mem() = delete;
   OperandMIPS32Mem(const OperandMIPS32Mem &) = delete;
   OperandMIPS32Mem &operator=(const OperandMIPS32Mem &) = delete;
 
 public:
   /// Memory operand addressing mode.
   /// The enum value also carries the encoding.
@@ skipping 1057 matching lines @@
 // violations and link errors.
 
 template <> void InstMIPS32Abs_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Abs_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Add_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Add_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Addiu::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Addu::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32And::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Andi::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_eq_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_eq_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ole_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ole_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_olt_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_olt_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ueq_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ueq_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ule_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ule_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ult_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_ult_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_un_d::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32C_un_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Cvt_d_l::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Cvt_d_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Cvt_d_w::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Cvt_s_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Cvt_s_l::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Cvt_s_w::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Div_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Div_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Lui::emit(const Cfg *Func) const;
 template <> void InstMIPS32Lw::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Mfc1::emit(const Cfg *Func) const;
 template <> void InstMIPS32Mflo::emit(const Cfg *Func) const;
 template <> void InstMIPS32Mfhi::emit(const Cfg *Func) const;
 template <> void InstMIPS32Mov_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Mov_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32Movf::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Movn_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Movn_s::emitIAS(const Cfg *Func) const;
+template <> void InstMIPS32Movt::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Movz_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Movz_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Mtc1::emit(const Cfg *Func) const;
 template <> void InstMIPS32Mtlo::emit(const Cfg *Func) const;
 template <> void InstMIPS32Mthi::emit(const Cfg *Func) const;
 template <> void InstMIPS32Mul_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Mul_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Mult::emit(const Cfg *Func) const;
 template <> void InstMIPS32Multu::emit(const Cfg *Func) const;
 template <> void InstMIPS32Or::emitIAS(const Cfg *Func) const;
@@ skipping 14 matching lines @@
 template <> void InstMIPS32Trunc_l_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Trunc_w_d::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Trunc_w_s::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Xor::emitIAS(const Cfg *Func) const;
 template <> void InstMIPS32Xori::emitIAS(const Cfg *Func) const;
 
 } // end of namespace MIPS32
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICEINSTMIPS32_H