MIPS: Fix long branch mode and FPU branches.

src/mips64/deoptimizer-mips64.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/codegen.h"
 #include "src/deoptimizer.h"
 #include "src/full-codegen.h"
 #include "src/safepoint-table.h"
@@ skipping 254 matching lines @@
 
   // Replace the current (input) frame with the output frames.
   Label outer_push_loop, inner_push_loop,
       outer_loop_header, inner_loop_header;
   // Outer loop state: a4 = current "FrameDescription** output_",
   // a1 = one past the last FrameDescription**.
   __ lw(a1, MemOperand(a0, Deoptimizer::output_count_offset()));
   __ ld(a4, MemOperand(a0, Deoptimizer::output_offset()));  // a4 is output_.
   __ dsll(a1, a1, kPointerSizeLog2);  // Count to offset.
   __ daddu(a1, a4, a1);  // a1 = one past the last FrameDescription**.
-  __ jmp(&outer_loop_header);
+  __ BranchShort(&outer_loop_header);
   __ bind(&outer_push_loop);
   // Inner loop state: a2 = current FrameDescription*, a3 = loop index.
   __ ld(a2, MemOperand(a4, 0));  // output_[ix]
   __ ld(a3, MemOperand(a2, FrameDescription::frame_size_offset()));
-  __ jmp(&inner_loop_header);
+  __ BranchShort(&inner_loop_header);
   __ bind(&inner_push_loop);
   __ Dsubu(a3, a3, Operand(sizeof(uint64_t)));
   __ Daddu(a6, a2, Operand(a3));
   __ ld(a7, MemOperand(a6, FrameDescription::frame_content_offset()));
   __ push(a7);
   __ bind(&inner_loop_header);
   __ BranchShort(&inner_push_loop, ne, a3, Operand(zero_reg));
 
   __ Daddu(a4, a4, Operand(kPointerSize));
   __ bind(&outer_loop_header);
@@ skipping 49 matching lines @@
   __ bind(&table_start);
   int kMaxEntriesBranchReach =
       (1 << (kImm16Bits - 2)) / (table_entry_size_ / Assembler::kInstrSize);
 
   if (count() <= kMaxEntriesBranchReach) {
     // Common case.
     for (int i = 0; i < count(); i++) {
       Label start;
       __ bind(&start);
       DCHECK(is_int16(i));
-      __ Branch(USE_DELAY_SLOT, &done);  // Expose delay slot.
+      __ BranchShort(USE_DELAY_SLOT, &done);  // Expose delay slot.
       __ li(at, i);                      // In the delay slot.
 
       DCHECK_EQ(table_entry_size_, masm()->SizeOfCodeGeneratedSince(&start));
     }
 
     DCHECK_EQ(masm()->SizeOfCodeGeneratedSince(&table_start),
               count() * table_entry_size_);
     __ bind(&done);
     __ Push(at);
   } else {
     // Uncommon case, the branch cannot reach.
     // Create mini trampoline and adjust id constants to get proper value at
     // the end of table.
     for (int i = kMaxEntriesBranchReach; i > 1; i--) {
       Label start;
       __ bind(&start);
       DCHECK(is_int16(i));
-      __ Branch(USE_DELAY_SLOT, &trampoline_jump);  // Expose delay slot.
+      __ BranchShort(USE_DELAY_SLOT, &trampoline_jump);  // Expose delay slot.
       __ li(at, -i);                                // In the delay slot.
       DCHECK_EQ(table_entry_size_, masm()->SizeOfCodeGeneratedSince(&start));
     }
     // Entry with id == kMaxEntriesBranchReach - 1.
     __ bind(&trampoline_jump);
-    __ Branch(USE_DELAY_SLOT, &done_special);
+    __ BranchShort(USE_DELAY_SLOT, &done_special);
     __ li(at, -1);
 
     for (int i = kMaxEntriesBranchReach; i < count(); i++) {
       Label start;
       __ bind(&start);
       DCHECK(is_int16(i));
       __ Branch(USE_DELAY_SLOT, &done);  // Expose delay slot.
       __ li(at, i);                      // In the delay slot.
     }
 
@@ skipping 20 matching lines @@
 void FrameDescription::SetCallerConstantPool(unsigned offset, intptr_t value) {
   // No out-of-line constant pool support.
   UNREACHABLE();
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal