MIPS: Major fixes and clean-up in asm. for instruction encoding.

src/mips64/disasm-mips64.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A Disassembler object is used to disassemble a block of code instruction by
 // instruction. The default implementation of the NameConverter object can be
 // overriden to modify register names or to do symbol lookup on addresses.
 //
 // The example below will disassemble a block of code and print it to stdout.
 //
@@ skipping 88 matching lines @@
   int FormatOption(Instruction* instr, const char* option);
   void Format(Instruction* instr, const char* format);
   void Unknown(Instruction* instr);
   int DecodeBreakInstr(Instruction* instr);
 
   // Each of these functions decodes one particular instruction type.
   bool DecodeTypeRegisterRsType(Instruction* instr);
   void DecodeTypeRegisterSRsType(Instruction* instr);
   void DecodeTypeRegisterDRsType(Instruction* instr);
   void DecodeTypeRegisterLRsType(Instruction* instr);
+  void DecodeTypeRegisterWRsType(Instruction* instr);
   void DecodeTypeRegisterSPECIAL(Instruction* instr);
   void DecodeTypeRegisterSPECIAL2(Instruction* instr);
   void DecodeTypeRegisterSPECIAL3(Instruction* instr);
   void DecodeTypeRegisterCOP1(Instruction* instr);
   void DecodeTypeRegisterCOP1X(Instruction* instr);
   int DecodeTypeRegister(Instruction* instr);
 
-  void DecodeTypeImmediateCOP1W(Instruction* instr);
-  void DecodeTypeImmediateCOP1L(Instruction* instr);
-  void DecodeTypeImmediateCOP1S(Instruction* instr);
-  void DecodeTypeImmediateCOP1D(Instruction* instr);
   void DecodeTypeImmediateCOP1(Instruction* instr);
   void DecodeTypeImmediateREGIMM(Instruction* instr);
   void DecodeTypeImmediate(Instruction* instr);
 
   void DecodeTypeJump(Instruction* instr);
 
   const disasm::NameConverter& converter_;
   v8::internal::Vector<char> out_buffer_;
   int out_buffer_pos_;
 
@@ skipping 384 matching lines @@
   } else {
     Format(instr, "break, code: 'code");
     return Instruction::kInstrSize;
   }
 }
 
 
 bool Decoder::DecodeTypeRegisterRsType(Instruction* instr) {
   switch (instr->FunctionFieldRaw()) {
     case SELEQZ_C:
-      Format(instr, "seleqz.'t    'ft, 'fs, 'fd");
+      Format(instr, "seleqz.'t    'fd, 'fs, 'ft");
       break;
     case SELNEZ_C:
-      Format(instr, "selnez.'t    'ft, 'fs, 'fd");
+      Format(instr, "selnez.'t    'fd, 'fs, 'ft");
+      break;
+    case MIN:
+      Format(instr, "min.'t    'fd, 'fs, 'ft");
+      break;
+    case MAX:
+      Format(instr, "max.'t    'fd, 'fs, 'ft");
+      break;
+    case MINA:
+      Format(instr, "mina.'t   'fd, 'fs, 'ft");
+      break;
+    case MAXA:
+      Format(instr, "maxa.'t   'fd, 'fs, 'ft");
       break;
     case ADD_D:
       Format(instr, "add.'t   'fd, 'fs, 'ft");
       break;
     case SUB_D:
       Format(instr, "sub.'t   'fd, 'fs, 'ft");
       break;
     case MUL_D:
       Format(instr, "mul.'t   'fd, 'fs, 'ft");
       break;
@@ skipping 134 matching lines @@
       break;
     case CMP_NE:
       Format(instr, "cmp.ne.d  'fd,  'fs, 'ft");
       break;
     default:
       UNREACHABLE();
   }
 }
 
 
+void Decoder::DecodeTypeRegisterWRsType(Instruction* instr) {
+  switch (instr->FunctionValue()) {
+    case CVT_S_W:  // Convert word to float (single).
+      Format(instr, "cvt.s.w 'fd, 'fs");
+      break;
+    case CVT_D_W:  // Convert word to double.
+      Format(instr, "cvt.d.w 'fd, 'fs");
+      break;
+    case CMP_AF:
+      Format(instr, "cmp.af.s    'fd, 'fs, 'ft");
+      break;
+    case CMP_UN:
+      Format(instr, "cmp.un.s    'fd, 'fs, 'ft");
+      break;
+    case CMP_EQ:
+      Format(instr, "cmp.eq.s    'fd, 'fs, 'ft");
+      break;
+    case CMP_UEQ:
+      Format(instr, "cmp.ueq.s   'fd, 'fs, 'ft");
+      break;
+    case CMP_LT:
+      Format(instr, "cmp.lt.s    'fd, 'fs, 'ft");
+      break;
+    case CMP_ULT:
+      Format(instr, "cmp.ult.s   'fd, 'fs, 'ft");
+      break;
+    case CMP_LE:
+      Format(instr, "cmp.le.s    'fd, 'fs, 'ft");
+      break;
+    case CMP_ULE:
+      Format(instr, "cmp.ule.s   'fd, 'fs, 'ft");
+      break;
+    case CMP_OR:
+      Format(instr, "cmp.or.s    'fd, 'fs, 'ft");
+      break;
+    case CMP_UNE:
+      Format(instr, "cmp.une.s   'fd, 'fs, 'ft");
+      break;
+    case CMP_NE:
+      Format(instr, "cmp.ne.s    'fd, 'fs, 'ft");
+      break;
+    default:
+      UNREACHABLE();
+  }
+}
+
+
 void Decoder::DecodeTypeRegisterCOP1(Instruction* instr) {
   switch (instr->RsFieldRaw()) {
     case MFC1:
       Format(instr, "mfc1    'rt, 'fs");
       break;
     case DMFC1:
       Format(instr, "dmfc1    'rt, 'fs");
       break;
     case MFHC1:
       Format(instr, "mfhc1   'rt, 'fs");
@@ skipping 14 matching lines @@
     case MTHC1:
       Format(instr, "mthc1   'rt, 'fs");
       break;
     case S:
       DecodeTypeRegisterSRsType(instr);
       break;
     case D:
       DecodeTypeRegisterDRsType(instr);
       break;
     case W:
-      switch (instr->FunctionFieldRaw()) {
-        case CVT_D_W:  // Convert word to double.
-          Format(instr, "cvt.d.w 'fd, 'fs");
-          break;
-        default:
-          UNREACHABLE();
-      }
+      DecodeTypeRegisterWRsType(instr);
       break;
     case L:
       DecodeTypeRegisterLRsType(instr);
       break;
     default:
       UNREACHABLE();
   }
 }
 
 
@@ skipping 273 matching lines @@
       Format(instr, "movn    'rd, 'rs, 'rt");
       break;
     case MOVCI:
       if (instr->Bit(16)) {
         Format(instr, "movt    'rd, 'rs, 'bc");
       } else {
         Format(instr, "movf    'rd, 'rs, 'bc");
       }
       break;
     case SELEQZ_S:
-      Format(instr, "seleqz    'rs, 'rt, 'rd");
+      Format(instr, "seleqz    'rd, 'rs, 'rt");
       break;
     case SELNEZ_S:
-      Format(instr, "selnez    'rs, 'rt, 'rd");
+      Format(instr, "selnez    'rd, 'rs, 'rt");
       break;
     default:
       UNREACHABLE();
   }
 }
 
 
 void Decoder::DecodeTypeRegisterSPECIAL2(Instruction* instr) {
   switch (instr->FunctionFieldRaw()) {
     case MUL:
@@ skipping 53 matching lines @@
     case SPECIAL3:
       DecodeTypeRegisterSPECIAL3(instr);
       break;
     default:
       UNREACHABLE();
   }
   return Instruction::kInstrSize;
 }
 
 
-void Decoder::DecodeTypeImmediateCOP1D(Instruction* instr) {
-  switch (instr->FunctionValue()) {
-    case SEL:
-      Format(instr, "sel.D    'ft, 'fs, 'fd");
-      break;
-    case SELEQZ_C:
-      Format(instr, "seleqz.D 'ft, 'fs, 'fd");
-      break;
-    case SELNEZ_C:
-      Format(instr, "selnez.D 'ft, 'fs, 'fd");
-      break;
-    case MIN:
-      Format(instr, "min.D    'ft, 'fs, 'fd");
-      break;
-    case MINA:
-      Format(instr, "mina.D   'ft, 'fs, 'fd");
-      break;
-    case MAX:
-      Format(instr, "max.D    'ft, 'fs, 'fd");
-      break;
-    case MAXA:
-      Format(instr, "maxa.D   'ft, 'fs, 'fd");
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-
-void Decoder::DecodeTypeImmediateCOP1L(Instruction* instr) {
-  switch (instr->FunctionValue()) {
-    case CMP_AF:
-      Format(instr, "cmp.af.D    'ft, 'fs, 'fd");
-      break;
-    case CMP_UN:
-      Format(instr, "cmp.un.D    'ft, 'fs, 'fd");
-      break;
-    case CMP_EQ:
-      Format(instr, "cmp.eq.D    'ft, 'fs, 'fd");
-      break;
-    case CMP_UEQ:
-      Format(instr, "cmp.ueq.D   'ft, 'fs, 'fd");
-      break;
-    case CMP_LT:
-      Format(instr, "cmp.lt.D    'ft, 'fs, 'fd");
-      break;
-    case CMP_ULT:
-      Format(instr, "cmp.ult.D   'ft, 'fs, 'fd");
-      break;
-    case CMP_LE:
-      Format(instr, "cmp.le.D    'ft, 'fs, 'fd");
-      break;
-    case CMP_ULE:
-      Format(instr, "cmp.ule.D   'ft, 'fs, 'fd");
-      break;
-    case CMP_OR:
-      Format(instr, "cmp.or.D    'ft, 'fs, 'fd");
-      break;
-    case CMP_UNE:
-      Format(instr, "cmp.une.D   'ft, 'fs, 'fd");
-      break;
-    case CMP_NE:
-      Format(instr, "cmp.ne.D    'ft, 'fs, 'fd");
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-
-void Decoder::DecodeTypeImmediateCOP1S(Instruction* instr) {
-  switch (instr->FunctionValue()) {
-    case SEL:
-      Format(instr, "sel.S    'ft, 'fs, 'fd");
-      break;
-    case SELEQZ_C:
-      Format(instr, "seleqz.S 'ft, 'fs, 'fd");
-      break;
-    case SELNEZ_C:
-      Format(instr, "selnez.S 'ft, 'fs, 'fd");
-      break;
-    case MIN:
-      Format(instr, "min.S    'ft, 'fs, 'fd");
-      break;
-    case MINA:
-      Format(instr, "mina.S   'ft, 'fs, 'fd");
-      break;
-    case MAX:
-      Format(instr, "max.S    'ft, 'fs, 'fd");
-      break;
-    case MAXA:
-      Format(instr, "maxa.S   'ft, 'fs, 'fd");
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-
-void Decoder::DecodeTypeImmediateCOP1W(Instruction* instr) {
-  switch (instr->FunctionValue()) {
-    case CMP_AF:
-      Format(instr, "cmp.af.S    'ft, 'fs, 'fd");
-      break;
-    case CMP_UN:
-      Format(instr, "cmp.un.S    'ft, 'fs, 'fd");
-      break;
-    case CMP_EQ:
-      Format(instr, "cmp.eq.S    'ft, 'fs, 'fd");
-      break;
-    case CMP_UEQ:
-      Format(instr, "cmp.ueq.S   'ft, 'fs, 'fd");
-      break;
-    case CMP_LT:
-      Format(instr, "cmp.lt.S    'ft, 'fs, 'fd");
-      break;
-    case CMP_ULT:
-      Format(instr, "cmp.ult.S   'ft, 'fs, 'fd");
-      break;
-    case CMP_LE:
-      Format(instr, "cmp.le.S    'ft, 'fs, 'fd");
-      break;
-    case CMP_ULE:
-      Format(instr, "cmp.ule.S   'ft, 'fs, 'fd");
-      break;
-    case CMP_OR:
-      Format(instr, "cmp.or.S    'ft, 'fs, 'fd");
-      break;
-    case CMP_UNE:
-      Format(instr, "cmp.une.S   'ft, 'fs, 'fd");
-      break;
-    case CMP_NE:
-      Format(instr, "cmp.ne.S    'ft, 'fs, 'fd");
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-
 void Decoder::DecodeTypeImmediateCOP1(Instruction* instr) {
   switch (instr->RsFieldRaw()) {
     case BC1:
       if (instr->FBtrueValue()) {
         Format(instr, "bc1t    'bc, 'imm16u");
       } else {
         Format(instr, "bc1f    'bc, 'imm16u");
       }
       break;
     case BC1EQZ:
       Format(instr, "bc1eqz    'ft, 'imm16u");
       break;
     case BC1NEZ:
       Format(instr, "bc1nez    'ft, 'imm16u");
       break;
-    case W:  // CMP.S instruction.
-      DecodeTypeImmediateCOP1W(instr);
-      break;
-    case L:  // CMP.D instruction.
-      DecodeTypeImmediateCOP1L(instr);
-      break;
-    case S:
-      DecodeTypeImmediateCOP1S(instr);
-      break;
-    case D:
-      DecodeTypeImmediateCOP1D(instr);
-      break;
     default:
       UNREACHABLE();
   }
 }
 
 
 void Decoder::DecodeTypeImmediateREGIMM(Instruction* instr) {
   switch (instr->RtFieldRaw()) {
     case BLTZ:
       Format(instr, "bltz    'rs, 'imm16u");
@@ skipping 370 matching lines @@
         prev_pc, *reinterpret_cast<int32_t*>(prev_pc), buffer.start());
   }
 }
 
 
 #undef UNSUPPORTED
 
 }  // namespace disasm
 
 #endif  // V8_TARGET_ARCH_MIPS64