MIPS: Use JIC/JIALC offset when possible

src/mips/code-stubs-mips.cc

 // Copyright 2012 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.
 
 #if V8_TARGET_ARCH_MIPS
 
 #include "src/code-stubs.h"
 #include "src/api-arguments.h"
 #include "src/base/bits.h"
 #include "src/bootstrapper.h"
@@ skipping 1097 matching lines @@
   Label zero;
   __ Branch(&zero, eq, cp, Operand(zero_reg));
   __ sw(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
   __ bind(&zero);
 
   // Compute the handler entry address and jump to it.
   __ li(a1, Operand(pending_handler_code_address));
   __ lw(a1, MemOperand(a1));
   __ li(a2, Operand(pending_handler_offset_address));
   __ lw(a2, MemOperand(a2));
-  __ Addu(a1, a1, Operand(Code::kHeaderSize - kHeapObjectTag));
-  __ Addu(t9, a1, a2);
-  __ Jump(t9);
+  if (IsMipsArchVariant(kMips32r6)) {
+    __ Addu(t9, a1, a2);

[ivica.bogosavljevic, 2016/12/05 10:48:47]

Can we move these common fragments of code with if (IsMipsArchVariant)... to
macro assembler in order to avoid different
code paths for different architectures?

[miran.karic, 2016/12/05 12:44:48]

Yes, as I commented in MacroAssembler, perhaps I can just use Jump/Call with
offset in any case and then inside these functions use Jump/Call with offset or
add Addu or whatever is needed depending on input type, properties and
architecture.

+    __ Jump(t9, Code::kHeaderSize - kHeapObjectTag);
+  } else {
+    __ Addu(a1, a1, Operand(Code::kHeaderSize - kHeapObjectTag));
+    __ Addu(t9, a1, a2);
+    __ Jump(t9);
+  }
 }
 
 
 void JSEntryStub::Generate(MacroAssembler* masm) {
   Label invoke, handler_entry, exit;
   Isolate* isolate = masm->isolate();
 
   // Registers:
   // a0: entry address
   // a1: function
@@ skipping 112 matching lines @@
     ExternalReference construct_entry(Builtins::kJSConstructEntryTrampoline,
                                       isolate);
     __ li(t0, Operand(construct_entry));
   } else {
     ExternalReference entry(Builtins::kJSEntryTrampoline, masm->isolate());
     __ li(t0, Operand(entry));
   }
   __ lw(t9, MemOperand(t0));  // Deref address.
 
   // Call JSEntryTrampoline.
-  __ addiu(t9, t9, Code::kHeaderSize - kHeapObjectTag);
-  __ Call(t9);
+  if (IsMipsArchVariant(kMips32r6)) {
+    __ Call(t9, Code::kHeaderSize - kHeapObjectTag);

[ivica.bogosavljevic, 2016/12/05 10:48:47]

Same as above

+  } else {
+    __ addiu(t9, t9, Code::kHeaderSize - kHeapObjectTag);
+    __ Call(t9);
+  }
 
   // Unlink this frame from the handler chain.
   __ PopStackHandler();
 
   __ bind(&exit);  // v0 holds result
   // Check if the current stack frame is marked as the outermost JS frame.
   Label non_outermost_js_2;
   __ pop(t1);
   __ Branch(&non_outermost_js_2,
             ne,
@@ skipping 615 matching lines @@
 
   __ AssertUndefinedOrAllocationSite(a2, t1);
 
   // Pass function as new target.
   __ mov(a3, a1);
 
   // Tail call to the function-specific construct stub (still in the caller
   // context at this point).
   __ lw(t0, FieldMemOperand(a1, JSFunction::kSharedFunctionInfoOffset));
   __ lw(t0, FieldMemOperand(t0, SharedFunctionInfo::kConstructStubOffset));
-  __ Addu(at, t0, Operand(Code::kHeaderSize - kHeapObjectTag));
-  __ Jump(at);
+  if (IsMipsArchVariant(kMips32r6)) {
+    __ Jump(t0, Code::kHeaderSize - kHeapObjectTag);
+  } else {
+    __ Addu(at, t0, Operand(Code::kHeaderSize - kHeapObjectTag));
+    __ Jump(at);
+  }
 
   __ bind(&non_function);
   __ mov(a3, a1);
   __ Jump(isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
 }
 
 // Note: feedback_vector and slot are clobbered after the call.
 static void IncrementCallCount(MacroAssembler* masm, Register feedback_vector,
                                Register slot) {
   __ Lsa(at, feedback_vector, slot, kPointerSizeLog2 - kSmiTagSize);
@@ skipping 862 matching lines @@
     // Call the runtime system in a fresh internal frame.
     FrameScope scope(masm, StackFrame::INTERNAL);
     __ Push(a1, a0);
     __ Push(ra, a1, a0);
     __ li(t0, Operand(Smi::FromInt(op())));
     __ addiu(sp, sp, -kPointerSize);
     __ CallRuntime(Runtime::kCompareIC_Miss, 3, kDontSaveFPRegs,
                    USE_DELAY_SLOT);
     __ sw(t0, MemOperand(sp));  // In the delay slot.
     // Compute the entry point of the rewritten stub.
-    __ Addu(a2, v0, Operand(Code::kHeaderSize - kHeapObjectTag));
+    if (!IsMipsArchVariant(kMips32r6)) {

[ivica.bogosavljevic, 2016/12/05 10:48:47]

same as above

+      __ Addu(a2, v0, Operand(Code::kHeaderSize - kHeapObjectTag));
+    }
     // Restore registers.
     __ Pop(a1, a0, ra);
   }
-  __ Jump(a2);
+  if (IsMipsArchVariant(kMips32r6)) {
+    __ Jump(v0, Code::kHeaderSize - kHeapObjectTag);
+  } else {
+    __ Jump(a2);
+  }
 }
 
 
 void DirectCEntryStub::Generate(MacroAssembler* masm) {
   // Make place for arguments to fit C calling convention. Most of the callers
   // of DirectCEntryStub::GenerateCall are using EnterExitFrame/LeaveExitFrame
   // so they handle stack restoring and we don't have to do that here.
   // Any caller of DirectCEntryStub::GenerateCall must take care of dropping
   // kCArgsSlotsSize stack space after the call.
   __ Subu(sp, sp, Operand(kCArgsSlotsSize));
@@ skipping 1977 matching lines @@
                            kStackUnwindSpace, kInvalidStackOffset,
                            return_value_operand, NULL);
 }
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_MIPS