MIPS: Implemented PC-relative instructions for R6.

test/cctest/test-disasm-mips.cc

Index: test/cctest/test-disasm-mips.cc
diff --git a/test/cctest/test-disasm-mips.cc b/test/cctest/test-disasm-mips.cc
index a60d144109390df3f9bdb2eacb67bdd86a6a578a..f33637f2c0355aaa6ee5f51975f62e8ca9460a53 100644
--- a/test/cctest/test-disasm-mips.cc
+++ b/test/cctest/test-disasm-mips.cc
@@ -217,12 +217,11 @@ TEST(Type0) {
     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(beqzc(a0, -1048576), "d8900000       beqzc   a0, -1048576");
+    COMPARE(beqzc(a0, -1), "d89fffff       beqzc   a0, -1");
+    COMPARE(beqzc(a0, 0), "d8800000       beqzc   a0, 0");
+    COMPARE(beqzc(a0, 1), "d8800001       beqzc   a0, 1");
+    COMPARE(beqzc(a0, 1048575), "d88fffff       beqzc   a0, 1048575");
 
     COMPARE(bnezc(a0, 0),
             "f8800000       bnezc   a0, 0x0");
@@ -506,7 +505,7 @@ TEST(Type0) {
     }
   }
 
-  if (IsMipsArchVariant(kMips32r2)) {
+  if (IsMipsArchVariant(kMips32r2) || IsMipsArchVariant(kMips32r6)) {
     COMPARE(ins_(a0, a1, 31, 1),
             "7ca4ffc4       ins     a0, a1, 31, 1");
     COMPARE(ins_(s6, s7, 30, 2),
@@ -534,6 +533,51 @@ TEST(Type0) {
   COMPARE(div_s(f2, f4, f6), "46062083       div.s   f2, f4, f6");
   COMPARE(div_d(f2, f4, f6), "46262083       div.d   f2, f4, f6");
 
+  if (kArchVariant == kMips32r6) {

[dusmil.imgtec, 2015/06/01 09:35:27]

It should be IsMipsArchVariant() as above.

[ilija.pavlovic, 2015/06/12 09:51:32]

Done.

+    COMPARE(align(v0, a0, a1, 0), "7c851220       align  v0, a0, a1, 0");
+    COMPARE(align(v0, a0, a1, 1), "7c851260       align  v0, a0, a1, 1");
+    COMPARE(align(v0, a0, a1, 2), "7c8512a0       align  v0, a0, a1, 2");
+    COMPARE(align(v0, a0, a1, 3), "7c8512e0       align  v0, a0, a1, 3");
+  }
+
+  if (kArchVariant == kMips32r6) {
+    COMPARE(aluipc(v0, 0), "ec5f0000       aluipc  v0, 0");
+    COMPARE(aluipc(v0, 1), "ec5f0001       aluipc  v0, 1");
+    COMPARE(aluipc(v0, 32767), "ec5f7fff       aluipc  v0, 32767");
+    COMPARE(aluipc(v0, -32768), "ec5f8000       aluipc  v0, -32768");
+    COMPARE(aluipc(v0, -1), "ec5fffff       aluipc  v0, -1");
+  }
+
+  if (kArchVariant == kMips32r6) {
+    COMPARE(lwpc(t1, 0), "ed280000       lwpc    t1, 0");
+    COMPARE(lwpc(t1, 4), "ed280004       lwpc    t1, 4");
+    COMPARE(lwpc(t1, -4), "ed2ffffc       lwpc    t1, -4");
+  }
+
+  if (kArchVariant == kMips32r6) {
+    COMPARE(jic(t0, -32768), "d8088000       jic     t0, -32768");
+    COMPARE(jic(t0, -1), "d808ffff       jic     t0, -1");
+    COMPARE(jic(t0, 0), "d8080000       jic     t0, 0");
+    COMPARE(jic(t0, 4), "d8080004       jic     t0, 4");
+    COMPARE(jic(t0, 32767), "d8087fff       jic     t0, 32767");
+  }
+
+  if (kArchVariant == kMips32r6) {
+    COMPARE(addiupc(a0, 262143), "ec83ffff       addiupc a0, 262143");
+    COMPARE(addiupc(a0, -1), "ec87ffff       addiupc a0, -1");
+    COMPARE(addiupc(v0, 0), "ec400000       addiupc v0, 0");
+    COMPARE(addiupc(s1, 1), "ee200001       addiupc s1, 1");
+    COMPARE(addiupc(a0, -262144), "ec840000       addiupc a0, -262144");
+  }
+
+  if (kArchVariant == kMips32r6) {
+    COMPARE(jialc(a0, -32768), "f8048000       jialc   a0, 0x8000");
+    COMPARE(jialc(a0, -1), "f804ffff       jialc   a0, 0xffff");
+    COMPARE(jialc(v0, 0), "f8020000       jialc   v0, 0x0");
+    COMPARE(jialc(s1, 1), "f8110001       jialc   s1, 0x1");
+    COMPARE(jialc(a0, 32767), "f8047fff       jialc   a0, 0x7fff");
+  }
+
   VERIFY_RUN();
 }