MIPS: Use JIC/JIALC offset when possible

src/mips/assembler-mips-inl.h

 
 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
@@ skipping 121 matching lines @@
   return NULL;
 }
 
 
 int RelocInfo::target_address_size() {
   return Assembler::kSpecialTargetSize;
 }
 
 
 Address Assembler::target_address_from_return_address(Address pc) {
-  return pc - kCallTargetAddressOffset;
+  if (IsMipsArchVariant(kMips32r6)) {
+    // We use another optimization that reduces one operation, this covers uses
+    // calling this function.
+    return pc - kCallTargetAddressOffset + kInstrSize;
+  } else {
+    return pc - kCallTargetAddressOffset;
+  }
 }
 
 
 void Assembler::set_target_internal_reference_encoded_at(Address pc,
                                                          Address target) {
   Instr instr1 = Assembler::instr_at(pc + 0 * Assembler::kInstrSize);
   Instr instr2 = Assembler::instr_at(pc + 1 * Assembler::kInstrSize);
   DCHECK(Assembler::IsLui(instr1));
   DCHECK(Assembler::IsOri(instr2) || Assembler::IsJicOrJialc(instr2));
   instr1 &= ~kImm16Mask;
@@ skipping 322 matching lines @@
     CheckBuffer();
   }
   EmitHelper(x, is_compact_branch);
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_MIPS_ASSEMBLER_MIPS_INL_H_