MIPS: Fix 'MIPS:r6 compact branch optimization.'

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 20 matching lines @@
 #include "src/v8.h"
 
 #include "src/debug/debug.h"
 #include "src/disasm.h"
 #include "src/disassembler.h"
 #include "src/macro-assembler.h"
 #include "test/cctest/cctest.h"
 
 using namespace v8::internal;
 
+bool prev_instr_compact_branch = false;
 
 bool DisassembleAndCompare(byte* pc, const char* compare_string) {
   disasm::NameConverter converter;
   disasm::Disassembler disasm(converter);
   EmbeddedVector<char, 128> disasm_buffer;
 
+  if (prev_instr_compact_branch) {
+    disasm.InstructionDecode(disasm_buffer, pc);
+    pc += 4;
+  }
+
   disasm.InstructionDecode(disasm_buffer, pc);
 
   if (strcmp(compare_string, disasm_buffer.start()) != 0) {
     fprintf(stderr,
             "expected: \n"
             "%s\n"
             "disassembled: \n"
             "%s\n\n",
             compare_string, disasm_buffer.start());
     return false;
@@ skipping 33 matching lines @@
 if (failure) { \
     V8_Fatal(__FILE__, __LINE__, "MIPS Disassembler tests failed.\n"); \
   }
 
 
 #define COMPARE_PC_REL_COMPACT(asm_, compare_string, offset)                   \
   {                                                                            \
     int pc_offset = assm.pc_offset();                                          \
     byte *progcounter = &buffer[pc_offset];                                    \
     char str_with_address[100];                                                \
-    snprintf(str_with_address, sizeof(str_with_address), "%s -> %p",           \
-             compare_string, progcounter + 4 + (offset * 4));                  \
+    prev_instr_compact_branch = assm.IsPrevInstrCompactBranch();               \
+    if (prev_instr_compact_branch) {                                           \
+      snprintf(str_with_address, sizeof(str_with_address), "%s -> %p",         \
+               compare_string, progcounter + 8 + (offset * 4));                \
+    } else {                                                                   \
+      snprintf(str_with_address, sizeof(str_with_address), "%s -> %p",         \
+               compare_string, progcounter + 4 + (offset * 4));                \
+    }                                                                          \
     assm.asm_;                                                                 \
     if (!DisassembleAndCompare(progcounter, str_with_address)) failure = true; \
   }
 
 
 #define COMPARE_PC_REL(asm_, compare_string, offset)                           \
   {                                                                            \
     int pc_offset = assm.pc_offset();                                          \
     byte *progcounter = &buffer[pc_offset];                                    \
     char str_with_address[100];                                                \
@@ skipping 154 matching lines @@
                            "60a48000       bnvc  a1, a0, -32768", -32768);
 
     COMPARE_PC_REL_COMPACT(beqzc(a0, -1048576),
                            "d8900000       beqzc   a0, -1048576", -1048576);
     COMPARE_PC_REL_COMPACT(beqzc(a0, -1), "d89fffff       beqzc   a0, -1", -1);
     COMPARE_PC_REL_COMPACT(beqzc(a0, 0), "d8800000       beqzc   a0, 0", 0);
     COMPARE_PC_REL_COMPACT(beqzc(a0, 1), "d8800001       beqzc   a0, 1", 1);
     COMPARE_PC_REL_COMPACT(beqzc(a0, 1048575),
                            "d88fffff       beqzc   a0, 1048575", 1048575);
 
-    COMPARE_PC_REL_COMPACT(bnezc(a0, 0), "f8800000       bnezc   a0, 0x0", 0);
-    COMPARE_PC_REL_COMPACT(bnezc(a0, 0xfffff),  // 0x0fffff ==  1048575.
-                           "f88fffff       bnezc   a0, 0xfffff", 1048575);
-    COMPARE_PC_REL_COMPACT(bnezc(a0, 0x100000),  // 0x100000 == -1048576.
-                           "f8900000       bnezc   a0, 0x100000", -1048576);
+    COMPARE_PC_REL_COMPACT(bnezc(a0, 0), "f8800000       bnezc   a0, 0", 0);
+    COMPARE_PC_REL_COMPACT(bnezc(a0, 1048575),  // int21 maximal value.
+                           "f88fffff       bnezc   a0, 1048575", 1048575);
+    COMPARE_PC_REL_COMPACT(bnezc(a0, -1048576),  // int21 minimal value.
+                           "f8900000       bnezc   a0, -1048576", -1048576);
 
     COMPARE_PC_REL_COMPACT(bc(-33554432), "ca000000       bc      -33554432",
                            -33554432);
     COMPARE_PC_REL_COMPACT(bc(-1), "cbffffff       bc      -1", -1);
     COMPARE_PC_REL_COMPACT(bc(0), "c8000000       bc      0", 0);
     COMPARE_PC_REL_COMPACT(bc(1), "c8000001       bc      1", 1);
     COMPARE_PC_REL_COMPACT(bc(33554431), "c9ffffff       bc      33554431",
                            33554431);
 
     COMPARE_PC_REL_COMPACT(balc(-33554432), "ea000000       balc    -33554432",
                            -33554432);
     COMPARE_PC_REL_COMPACT(balc(-1), "ebffffff       balc    -1", -1);
     COMPARE_PC_REL_COMPACT(balc(0), "e8000000       balc    0", 0);
     COMPARE_PC_REL_COMPACT(balc(1), "e8000001       balc    1", 1);
     COMPARE_PC_REL_COMPACT(balc(33554431), "e9ffffff       balc    33554431",
                            33554431);
 
     COMPARE_PC_REL_COMPACT(bgeuc(a0, a1, -32768),
-                           "18858000       bgeuc    a0, a1, -32768", -32768);
+                           "18858000       bgeuc   a0, a1, -32768", -32768);
     COMPARE_PC_REL_COMPACT(bgeuc(a0, a1, -1),
-                           "1885ffff       bgeuc    a0, a1, -1", -1);
-    COMPARE_PC_REL_COMPACT(bgeuc(a0, a1, 1),
-                           "18850001       bgeuc    a0, a1, 1", 1);
+                           "1885ffff       bgeuc   a0, a1, -1", -1);
+    COMPARE_PC_REL_COMPACT(bgeuc(a0, a1, 1), "18850001       bgeuc   a0, a1, 1",
+                           1);
     COMPARE_PC_REL_COMPACT(bgeuc(a0, a1, 32767),
-                           "18857fff       bgeuc    a0, a1, 32767", 32767);
+                           "18857fff       bgeuc   a0, a1, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bgezalc(a0, -32768),
-                           "18848000       bgezalc  a0, -32768", -32768);
-    COMPARE_PC_REL_COMPACT(bgezalc(a0, -1), "1884ffff       bgezalc  a0, -1",
+                           "18848000       bgezalc a0, -32768", -32768);
+    COMPARE_PC_REL_COMPACT(bgezalc(a0, -1), "1884ffff       bgezalc a0, -1",
                            -1);
-    COMPARE_PC_REL_COMPACT(bgezalc(a0, 1), "18840001       bgezalc  a0, 1", 1);
+    COMPARE_PC_REL_COMPACT(bgezalc(a0, 1), "18840001       bgezalc a0, 1", 1);
     COMPARE_PC_REL_COMPACT(bgezalc(a0, 32767),
-                           "18847fff       bgezalc  a0, 32767", 32767);
+                           "18847fff       bgezalc a0, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(blezalc(a0, -32768),
-                           "18048000       blezalc  a0, -32768", -32768);
-    COMPARE_PC_REL_COMPACT(blezalc(a0, -1), "1804ffff       blezalc  a0, -1",
+                           "18048000       blezalc a0, -32768", -32768);
+    COMPARE_PC_REL_COMPACT(blezalc(a0, -1), "1804ffff       blezalc a0, -1",
                            -1);
-    COMPARE_PC_REL_COMPACT(blezalc(a0, 1), "18040001       blezalc  a0, 1", 1);
+    COMPARE_PC_REL_COMPACT(blezalc(a0, 1), "18040001       blezalc a0, 1", 1);
     COMPARE_PC_REL_COMPACT(blezalc(a0, 32767),
-                           "18047fff       blezalc  a0, 32767", 32767);
+                           "18047fff       blezalc a0, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bltuc(a0, a1, -32768),
                            "1c858000       bltuc   a0, a1, -32768", -32768);
     COMPARE_PC_REL_COMPACT(bltuc(a0, a1, -1),
                            "1c85ffff       bltuc   a0, a1, -1", -1);
     COMPARE_PC_REL_COMPACT(bltuc(a0, a1, 1), "1c850001       bltuc   a0, a1, 1",
                            1);
     COMPARE_PC_REL_COMPACT(bltuc(a0, a1, 32767),
                            "1c857fff       bltuc   a0, a1, 32767", 32767);
 
@@ skipping 37 matching lines @@
                            "58047fff       blezc    a0, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bltzc(a0, -32768),
                            "5c848000       bltzc    a0, -32768", -32768);
     COMPARE_PC_REL_COMPACT(bltzc(a0, -1), "5c84ffff       bltzc    a0, -1", -1);
     COMPARE_PC_REL_COMPACT(bltzc(a0, 1), "5c840001       bltzc    a0, 1", 1);
     COMPARE_PC_REL_COMPACT(bltzc(a0, 32767),
                            "5c847fff       bltzc    a0, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bltc(a0, a1, -32768),
-                           "5c858000       bltc     a0, a1, -32768", -32768);
+                           "5c858000       bltc    a0, a1, -32768", -32768);
     COMPARE_PC_REL_COMPACT(bltc(a0, a1, -1),
-                           "5c85ffff       bltc     a0, a1, -1", -1);
-    COMPARE_PC_REL_COMPACT(bltc(a0, a1, 1), "5c850001       bltc     a0, a1, 1",
+                           "5c85ffff       bltc    a0, a1, -1", -1);
+    COMPARE_PC_REL_COMPACT(bltc(a0, a1, 1), "5c850001       bltc    a0, a1, 1",
                            1);
     COMPARE_PC_REL_COMPACT(bltc(a0, a1, 32767),
-                           "5c857fff       bltc     a0, a1, 32767", 32767);
+                           "5c857fff       bltc    a0, a1, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bgtzc(a0, -32768),
                            "5c048000       bgtzc    a0, -32768", -32768);
     COMPARE_PC_REL_COMPACT(bgtzc(a0, -1), "5c04ffff       bgtzc    a0, -1", -1);
     COMPARE_PC_REL_COMPACT(bgtzc(a0, 1), "5c040001       bgtzc    a0, 1", 1);
     COMPARE_PC_REL_COMPACT(bgtzc(a0, 32767),
                            "5c047fff       bgtzc    a0, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bc1eqz(-32768, f1),
                            "45218000       bc1eqz    f1, -32768", -32768);
@@ skipping 10 matching lines @@
     COMPARE_PC_REL_COMPACT(bc1nez(1, f1), "45a10001       bc1nez    f1, 1", 1);
     COMPARE_PC_REL_COMPACT(bc1nez(32767, f1),
                            "45a17fff       bc1nez    f1, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bovc(a1, a0, -1), "20a4ffff       bovc  a1, a0, -1",
                            -1);
     COMPARE_PC_REL_COMPACT(bovc(a0, a0, 1), "20840001       bovc  a0, a0, 1",
                            1);
 
     COMPARE_PC_REL_COMPACT(beqc(a0, a1, -32768),
-                           "20858000       beqc  a0, a1, -32768", -32768);
-    COMPARE_PC_REL_COMPACT(beqc(a0, a1, -1), "2085ffff       beqc  a0, a1, -1",
-                           -1);
-    COMPARE_PC_REL_COMPACT(beqc(a0, a1, 1), "20850001       beqc  a0, a1, 1",
+                           "20858000       beqc    a0, a1, -32768", -32768);
+    COMPARE_PC_REL_COMPACT(beqc(a0, a1, -1),
+                           "2085ffff       beqc    a0, a1, -1", -1);
+    COMPARE_PC_REL_COMPACT(beqc(a0, a1, 1), "20850001       beqc    a0, a1, 1",
                            1);
     COMPARE_PC_REL_COMPACT(beqc(a0, a1, 32767),
-                           "20857fff       beqc  a0, a1, 32767", 32767);
+                           "20857fff       beqc    a0, a1, 32767", 32767);
 
     COMPARE_PC_REL_COMPACT(bnec(a0, a1, -32768),
                            "60858000       bnec  a0, a1, -32768", -32768);
     COMPARE_PC_REL_COMPACT(bnec(a0, a1, -1), "6085ffff       bnec  a0, a1, -1",
                            -1);
     COMPARE_PC_REL_COMPACT(bnec(a0, a1, 1), "60850001       bnec  a0, a1, 1",
                            1);
     COMPARE_PC_REL_COMPACT(bnec(a0, a1, 32767),
                            "60857fff       bnec  a0, a1, 32767", 32767);
   }
@@ skipping 396 matching lines @@
 
   if (IsMipsArchVariant(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 (IsMipsArchVariant(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");
+    COMPARE(jialc(a0, -32768), "f8048000       jialc   a0, -32768");
+    COMPARE(jialc(a0, -1), "f804ffff       jialc   a0, -1");
+    COMPARE(jialc(v0, 0), "f8020000       jialc   v0, 0");
+    COMPARE(jialc(s1, 1), "f8110001       jialc   s1, 1");
+    COMPARE(jialc(a0, 32767), "f8047fff       jialc   a0, 32767");
   }
 
   VERIFY_RUN();
 }
 
 
 TEST(Type1) {
   SET_UP();
   if (IsMipsArchVariant(kMips32r6)) {
     COMPARE(seleqz(a0, a1, a2), "00a62035       seleqz    a0, a1, a2");
@@ skipping 192 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();
 }