MIPS: Implemented PC-relative instructions for R6.

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 199 matching lines @@
 
     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(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");
     COMPARE(bnezc(a0, 0xfffff),                   // 0x0fffff ==  1048575.
             "f88fffff       bnezc   a0, 0xfffff");
     COMPARE(bnezc(a0, 0x100000),                  // 0x100000 == -1048576.
             "f8900000       bnezc   a0, 0x100000");
   }
 
   COMPARE(addiu(a0, a1, 0x0),
@@ skipping 263 matching lines @@
     } 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");
     }
   }
 
-  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),
             "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");
   }
   COMPARE(add_s(f4, f6, f8), "46083100       add.s   f4, f6, f8");
   COMPARE(add_d(f12, f14, f16), "46307300       add.d   f12, f14, f16");
 
   if (IsMipsArchVariant(kMips32r6)) {
     COMPARE(bitswap(a0, a1), "7c052020       bitswap a0, a1");
     COMPARE(bitswap(t8, s0), "7c10c020       bitswap t8, s0");
   }
 
   COMPARE(abs_s(f6, f8), "46004185       abs.s   f6, f8");
   COMPARE(abs_d(f10, f12), "46206285       abs.d   f10, f12");
 
   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();
 }
 
 
 TEST(Type1) {
   SET_UP();
   if (IsMipsArchVariant(kMips32r6)) {
     COMPARE(seleqz(a0, a1, a2), "00a62035       seleqz    a0, a1, a2");
     COMPARE(selnez(a0, a1, a2), "00a62037       selnez    a0, a1, a2");
 
@@ skipping 188 matching lines @@
   COMPARE(cvt_s_w(f22, f24), "4680c5a0       cvt.s.w f22, f24");
   if (IsMipsArchVariant(kMips32r6) || IsMipsArchVariant(kMips32r2)) {
     COMPARE(cvt_s_l(f22, f24), "46a0c5a0       cvt.s.l f22, f24");
   }
 
   COMPARE(cvt_s_d(f22, f24), "4620c5a0       cvt.s.d f22, f24");
   COMPARE(cvt_s_w(f22, f24), "4680c5a0       cvt.s.w f22, f24");
 
   VERIFY_RUN();
 }