Revert "Reland "MIPS: Add support for arch. revision 6 to mips32 port.""

test/cctest/test-disasm-mips.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 92 matching lines @@
   COMPARE(addu(v0, v1, s0),
           "00701021       addu    v0, v1, s0");
 
   COMPARE(subu(a0, a1, a2),
           "00a62023       subu    a0, a1, a2");
   COMPARE(subu(t2, t3, t4),
           "016c5023       subu    t2, t3, t4");
   COMPARE(subu(v0, v1, s0),
           "00701023       subu    v0, v1, s0");
 
-  if (!IsMipsArchVariant(kMips32r6)) {
-    COMPARE(mult(a0, a1),
-            "00850018       mult    a0, a1");
-    COMPARE(mult(t2, t3),
-            "014b0018       mult    t2, t3");
-    COMPARE(mult(v0, v1),
-            "00430018       mult    v0, v1");
+  COMPARE(mult(a0, a1),
+          "00850018       mult    a0, a1");
+  COMPARE(mult(t2, t3),
+          "014b0018       mult    t2, t3");
+  COMPARE(mult(v0, v1),
+          "00430018       mult    v0, v1");
 
-    COMPARE(multu(a0, a1),
-            "00850019       multu   a0, a1");
-    COMPARE(multu(t2, t3),
-            "014b0019       multu   t2, t3");
-    COMPARE(multu(v0, v1),
-            "00430019       multu   v0, v1");
+  COMPARE(multu(a0, a1),
+          "00850019       multu   a0, a1");
+  COMPARE(multu(t2, t3),
+          "014b0019       multu   t2, t3");
+  COMPARE(multu(v0, v1),
+          "00430019       multu   v0, v1");
 
-    COMPARE(div(a0, a1),
-            "0085001a       div     a0, a1");
-    COMPARE(div(t2, t3),
-            "014b001a       div     t2, t3");
-    COMPARE(div(v0, v1),
-            "0043001a       div     v0, v1");
+  COMPARE(div(a0, a1),
+          "0085001a       div     a0, a1");
+  COMPARE(div(t2, t3),
+          "014b001a       div     t2, t3");
+  COMPARE(div(v0, v1),
+          "0043001a       div     v0, v1");
 
-    COMPARE(divu(a0, a1),
-            "0085001b       divu    a0, a1");
-    COMPARE(divu(t2, t3),
-            "014b001b       divu    t2, t3");
-    COMPARE(divu(v0, v1),
-            "0043001b       divu    v0, v1");
+  COMPARE(divu(a0, a1),
+          "0085001b       divu    a0, a1");
+  COMPARE(divu(t2, t3),
+          "014b001b       divu    t2, t3");
+  COMPARE(divu(v0, v1),
+          "0043001b       divu    v0, v1");
 
-    if (!IsMipsArchVariant(kLoongson)) {
-      COMPARE(mul(a0, a1, a2),
-              "70a62002       mul     a0, a1, a2");
-      COMPARE(mul(t2, t3, t4),
-              "716c5002       mul     t2, t3, t4");
-      COMPARE(mul(v0, v1, s0),
-              "70701002       mul     v0, v1, s0");
-    }
-  } else {  // MIPS32r6.
+  if (kArchVariant != kLoongson) {
     COMPARE(mul(a0, a1, a2),
-            "00a62098       mul    a0, a1, a2");
-    COMPARE(muh(a0, a1, a2),
-            "00a620d8       muh    a0, a1, a2");
-    COMPARE(mul(t1, t2, t3),
-            "014b4898       mul    t1, t2, t3");
-    COMPARE(muh(t1, t2, t3),
-            "014b48d8       muh    t1, t2, t3");
-    COMPARE(mul(v0, v1, a0),
-            "00641098       mul    v0, v1, a0");
-    COMPARE(muh(v0, v1, a0),
-            "006410d8       muh    v0, v1, a0");
-
-    COMPARE(mulu(a0, a1, a2),
-            "00a62099       mulu   a0, a1, a2");
-    COMPARE(muhu(a0, a1, a2),
-            "00a620d9       muhu   a0, a1, a2");
-    COMPARE(mulu(t1, t2, t3),
-            "014b4899       mulu   t1, t2, t3");
-    COMPARE(muhu(t1, t2, t3),
-            "014b48d9       muhu   t1, t2, t3");
-    COMPARE(mulu(v0, v1, a0),
-            "00641099       mulu   v0, v1, a0");
-    COMPARE(muhu(v0, v1, a0),
-            "006410d9       muhu   v0, v1, a0");
-
-    COMPARE(div(a0, a1, a2),
-            "00a6209a       div    a0, a1, a2");
-    COMPARE(mod(a0, a1, a2),
-            "00a620da       mod    a0, a1, a2");
-    COMPARE(div(t1, t2, t3),
-            "014b489a       div    t1, t2, t3");
-    COMPARE(mod(t1, t2, t3),
-            "014b48da       mod    t1, t2, t3");
-    COMPARE(div(v0, v1, a0),
-            "0064109a       div    v0, v1, a0");
-    COMPARE(mod(v0, v1, a0),
-            "006410da       mod    v0, v1, a0");
-
-    COMPARE(divu(a0, a1, a2),
-            "00a6209b       divu   a0, a1, a2");
-    COMPARE(modu(a0, a1, a2),
-            "00a620db       modu   a0, a1, a2");
-    COMPARE(divu(t1, t2, t3),
-            "014b489b       divu   t1, t2, t3");
-    COMPARE(modu(t1, t2, t3),
-            "014b48db       modu   t1, t2, t3");
-    COMPARE(divu(v0, v1, a0),
-            "0064109b       divu   v0, v1, a0");
-    COMPARE(modu(v0, v1, a0),
-            "006410db       modu   v0, v1, a0");
-
-    COMPARE(bovc(a0, a0, static_cast<int16_t>(0)),
-            "20840000       bovc  a0, a0, 0");
-    COMPARE(bovc(a1, a0, static_cast<int16_t>(0)),
-            "20a40000       bovc  a1, a0, 0");
-    COMPARE(bovc(a1, a0, 32767),
-            "20a47fff       bovc  a1, a0, 32767");
-    COMPARE(bovc(a1, a0, -32768),
-            "20a48000       bovc  a1, a0, -32768");
-
-    COMPARE(bnvc(a0, a0, static_cast<int16_t>(0)),
-            "60840000       bnvc  a0, a0, 0");
-    COMPARE(bnvc(a1, a0, static_cast<int16_t>(0)),
-            "60a40000       bnvc  a1, a0, 0");
-    COMPARE(bnvc(a1, a0, 32767),
-            "60a47fff       bnvc  a1, a0, 32767");
-    COMPARE(bnvc(a1, a0, -32768),
-            "60a48000       bnvc  a1, a0, -32768");
-
-    COMPARE(beqzc(a0, 0),
-            "d8800000       beqzc   a0, 0x0");
-    COMPARE(beqzc(a0, 0xfffff),                   // 0x0fffff ==  1048575.
-            "d88fffff       beqzc   a0, 0xfffff");
-    COMPARE(beqzc(a0, 0x100000),                  // 0x100000 == -1048576.
-            "d8900000       beqzc   a0, 0x100000");
-
-    COMPARE(bnezc(a0, 0),
-            "f8800000       bnezc   a0, 0x0");
-    COMPARE(bnezc(a0, 0xfffff),                   // 0x0fffff ==  1048575.
-            "f88fffff       bnezc   a0, 0xfffff");
-    COMPARE(bnezc(a0, 0x100000),                  // 0x100000 == -1048576.
-            "f8900000       bnezc   a0, 0x100000");
+            "70a62002       mul     a0, a1, a2");
+    COMPARE(mul(t2, t3, t4),
+            "716c5002       mul     t2, t3, t4");
+    COMPARE(mul(v0, v1, s0),
+            "70701002       mul     v0, v1, s0");
   }
 
   COMPARE(addiu(a0, a1, 0x0),
           "24a40000       addiu   a0, a1, 0");
   COMPARE(addiu(s0, s1, 32767),
           "26307fff       addiu   s0, s1, 32767");
   COMPARE(addiu(t2, t3, -32768),
           "256a8000       addiu   t2, t3, -32768");
   COMPARE(addiu(v0, v1, -1),
           "2462ffff       addiu   v0, v1, -1");
@@ skipping 101 matching lines @@
 
   COMPARE(srav(a0, a1, a2),
           "00c52007       srav    a0, a1, a2");
   COMPARE(srav(s0, s1, s2),
           "02518007       srav    s0, s1, s2");
   COMPARE(srav(t2, t3, t4),
           "018b5007       srav    t2, t3, t4");
   COMPARE(srav(v0, v1, fp),
           "03c31007       srav    v0, v1, fp");
 
-  if (IsMipsArchVariant(kMips32r2)) {
+  if (kArchVariant == kMips32r2) {
     COMPARE(rotr(a0, a1, 0),
             "00252002       rotr    a0, a1, 0");
     COMPARE(rotr(s0, s1, 8),
             "00318202       rotr    s0, s1, 8");
     COMPARE(rotr(t2, t3, 24),
             "002b5602       rotr    t2, t3, 24");
     COMPARE(rotr(v0, v1, 31),
             "002317c2       rotr    v0, v1, 31");
 
     COMPARE(rotrv(a0, a1, a2),
@@ skipping 82 matching lines @@
           "2862ffff       slti    v0, v1, -1");
   COMPARE(sltiu(a0, a1, 0),
           "2ca40000       sltiu   a0, a1, 0");
   COMPARE(sltiu(s0, s1, 32767),
           "2e307fff       sltiu   s0, s1, 32767");
   COMPARE(sltiu(t2, t3, -32768),
           "2d6a8000       sltiu   t2, t3, -32768");
   COMPARE(sltiu(v0, v1, -1),
           "2c62ffff       sltiu   v0, v1, -1");
 
-  if (!IsMipsArchVariant(kLoongson)) {
+  if (kArchVariant != kLoongson) {
     COMPARE(movz(a0, a1, a2),
             "00a6200a       movz    a0, a1, a2");
     COMPARE(movz(s0, s1, s2),
             "0232800a       movz    s0, s1, s2");
     COMPARE(movz(t2, t3, t4),
             "016c500a       movz    t2, t3, t4");
     COMPARE(movz(v0, v1, a2),
             "0066100a       movz    v0, v1, a2");
     COMPARE(movn(a0, a1, a2),
             "00a6200b       movn    a0, a1, a2");
@@ skipping 14 matching lines @@
             "007d1001       movt    v0, v1, 7");
     COMPARE(movf(a0, a1, 0),
             "00a02001       movf    a0, a1, 0");
     COMPARE(movf(s0, s1, 4),
             "02308001       movf    s0, s1, 4");
     COMPARE(movf(t2, t3, 5),
             "01745001       movf    t2, t3, 5");
     COMPARE(movf(v0, v1, 6),
             "00781001       movf    v0, v1, 6");
 
-    if (IsMipsArchVariant(kMips32r6)) {
-      COMPARE(clz(a0, a1),
-              "00a02050       clz     a0, a1");
-      COMPARE(clz(s6, s7),
-              "02e0b050       clz     s6, s7");
-      COMPARE(clz(v0, v1),
-              "00601050       clz     v0, v1");
-    } else {
-      COMPARE(clz(a0, a1),
-              "70a42020       clz     a0, a1");
-      COMPARE(clz(s6, s7),
-              "72f6b020       clz     s6, s7");
-      COMPARE(clz(v0, v1),
-              "70621020       clz     v0, v1");
-    }
+    COMPARE(clz(a0, a1),
+            "70a42020       clz     a0, a1");
+    COMPARE(clz(s6, s7),
+            "72f6b020       clz     s6, s7");
+    COMPARE(clz(v0, v1),
+            "70621020       clz     v0, v1");
   }
 
-  if (IsMipsArchVariant(kMips32r2)) {
+  if (kArchVariant == kMips32r2) {
     COMPARE(ins_(a0, a1, 31, 1),
             "7ca4ffc4       ins     a0, a1, 31, 1");
     COMPARE(ins_(s6, s7, 30, 2),
             "7ef6ff84       ins     s6, s7, 30, 2");
     COMPARE(ins_(v0, v1, 0, 32),
             "7c62f804       ins     v0, v1, 0, 32");
     COMPARE(ext_(a0, a1, 31, 1),
             "7ca407c0       ext     a0, a1, 31, 1");
     COMPARE(ext_(s6, s7, 30, 2),
             "7ef60f80       ext     s6, s7, 30, 2");
     COMPARE(ext_(v0, v1, 0, 32),
             "7c62f800       ext     v0, v1, 0, 32");
   }
 
   VERIFY_RUN();
 }