MIPS: Improved checking target ranges for J and JAL instructions.

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 103 matching lines @@
     assm.asm_;                                                                 \
     if (!DisassembleAndCompare(progcounter, str_with_address)) failure = true; \
   }
 
 
 #define COMPARE_PC_JUMP(asm_, compare_string, target)                          \
   {                                                                            \
     int pc_offset = assm.pc_offset();                                          \
     byte *progcounter = &buffer[pc_offset];                                    \
     char str_with_address[100];                                                \
-    int instr_index = target >> 2;                                             \
-    snprintf(str_with_address, sizeof(str_with_address), "%s -> %p",           \
-             compare_string, reinterpret_cast<byte *>(                         \
-                                 ((uint32_t)(progcounter + 1) & ~0xfffffff) |  \
+    int instr_index = (target >> 2) & kImm26Mask;                              \
+    snprintf(                                                                  \
+        str_with_address, sizeof(str_with_address), "%s %p -> %p",             \
+        compare_string, reinterpret_cast<byte *>(target),                      \
+        reinterpret_cast<byte *>(((uint32_t)(progcounter + 4) & ~0xfffffff) |  \
                                  (instr_index << 2)));                         \
     assm.asm_;                                                                 \
     if (!DisassembleAndCompare(progcounter, str_with_address)) failure = true; \
   }
 
 
+#define GET_PC_REGION(pc_region)                                         \
+  {                                                                      \
+    int pc_offset = assm.pc_offset();                                    \
+    byte *progcounter = &buffer[pc_offset];                              \
+    pc_region = reinterpret_cast<int32_t>(progcounter + 4) & ~0xfffffff; \
+  }
+
+
 TEST(Type0) {
   SET_UP();
 
   COMPARE(addu(a0, a1, a2),
           "00a62021       addu    a0, a1, a2");
   COMPARE(addu(t2, t3, t4),
           "016c5021       addu    t2, t3, t4");
   COMPARE(addu(v0, v1, s0),
           "00701021       addu    v0, v1, s0");
 
@@ skipping 315 matching lines @@
   COMPARE_PC_REL_COMPACT(blez(a0, 32767), "18807fff       blez    a0, 32767",
                          32767);
 
   COMPARE_PC_REL_COMPACT(bgtz(a0, -32768), "1c808000       bgtz    a0, -32768",
                          -32768);
   COMPARE_PC_REL_COMPACT(bgtz(a0, -1), "1c80ffff       bgtz    a0, -1", -1);
   COMPARE_PC_REL_COMPACT(bgtz(a0, 1), "1c800001       bgtz    a0, 1", 1);
   COMPARE_PC_REL_COMPACT(bgtz(a0, 32767), "1c807fff       bgtz    a0, 32767",
                          32767);
 
-  COMPARE_PC_JUMP(j(0x4), "08000001       j       0x4", 0x4);
-  COMPARE_PC_JUMP(j(0xffffffc), "0bffffff       j       0xffffffc", 0xffffffc);
+  int32_t pc_region;
+  GET_PC_REGION(pc_region);
 
-  COMPARE_PC_JUMP(jal(0x4), "0c000001       jal     0x4", 0x4);
-  COMPARE_PC_JUMP(jal(0xffffffc), "0fffffff       jal     0xffffffc",
-                  0xffffffc);
+  int32_t target = pc_region | 0x4;
+  COMPARE_PC_JUMP(j(target), "08000001       j      ", target);
+  target = pc_region | 0xffffffc;
+  COMPARE_PC_JUMP(j(target), "0bffffff       j      ", target);
+
+  target = pc_region | 0x4;
+  COMPARE_PC_JUMP(jal(target), "0c000001       jal    ", target);
+  target = pc_region | 0xffffffc;
+  COMPARE_PC_JUMP(jal(target), "0fffffff       jal    ", target);
 
   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 546 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();
 }