Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(507)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/s390/code-stubs-s390.cc

Issue 1725243004: S390: Initial impl of S390 asm, masm, code-stubs,... (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Updated BUILD.gn + cpu-s390.cc to addr @jochen's comments. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/s390/assembler-s390.h ('K') | « src/s390/code-stubs-s390.h ('k') | src/s390/codegen-s390.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/s390/code-stubs-s390.cc
diff --git a/src/ppc/code-stubs-ppc.cc b/src/s390/code-stubs-s390.cc
similarity index 67%
copy from src/ppc/code-stubs-ppc.cc
copy to src/s390/code-stubs-s390.cc
index 3734f1f6e60a64b74b3e65560d3e3dbd636a23c0..ca62356efcb46458e1d29b187ed7d938ba583ef0 100644
--- a/src/ppc/code-stubs-ppc.cc
+++ b/src/s390/code-stubs-s390.cc
@@ -2,25 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#if V8_TARGET_ARCH_PPC
+#if V8_TARGET_ARCH_S390
+#include "src/code-stubs.h"
#include "src/base/bits.h"
#include "src/bootstrapper.h"
-#include "src/code-stubs.h"
#include "src/codegen.h"
#include "src/ic/handler-compiler.h"
#include "src/ic/ic.h"
#include "src/ic/stub-cache.h"
#include "src/isolate.h"
-#include "src/ppc/code-stubs-ppc.h"
#include "src/regexp/jsregexp.h"
#include "src/regexp/regexp-macro-assembler.h"
#include "src/runtime/runtime.h"
+#include "src/s390/code-stubs-s390.h"
namespace v8 {
namespace internal {
-
static void InitializeArrayConstructorDescriptor(
Isolate* isolate, CodeStubDescriptor* descriptor,
int constant_stack_parameter_count) {
@@ -31,12 +30,11 @@ static void InitializeArrayConstructorDescriptor(
descriptor->Initialize(deopt_handler, constant_stack_parameter_count,
JS_FUNCTION_STUB_MODE);
} else {
- descriptor->Initialize(r3, deopt_handler, constant_stack_parameter_count,
+ descriptor->Initialize(r2, deopt_handler, constant_stack_parameter_count,
JS_FUNCTION_STUB_MODE);
}
}
-
static void InitializeInternalArrayConstructorDescriptor(
Isolate* isolate, CodeStubDescriptor* descriptor,
int constant_stack_parameter_count) {
@@ -47,48 +45,41 @@ static void InitializeInternalArrayConstructorDescriptor(
descriptor->Initialize(deopt_handler, constant_stack_parameter_count,
JS_FUNCTION_STUB_MODE);
} else {
- descriptor->Initialize(r3, deopt_handler, constant_stack_parameter_count,
+ descriptor->Initialize(r2, deopt_handler, constant_stack_parameter_count,
JS_FUNCTION_STUB_MODE);
}
}
-
void ArrayNoArgumentConstructorStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
InitializeArrayConstructorDescriptor(isolate(), descriptor, 0);
}
-
void ArraySingleArgumentConstructorStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
InitializeArrayConstructorDescriptor(isolate(), descriptor, 1);
}
-
void ArrayNArgumentsConstructorStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
InitializeArrayConstructorDescriptor(isolate(), descriptor, -1);
}
-
void InternalArrayNoArgumentConstructorStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
InitializeInternalArrayConstructorDescriptor(isolate(), descriptor, 0);
}
-
void InternalArraySingleArgumentConstructorStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
InitializeInternalArrayConstructorDescriptor(isolate(), descriptor, 1);
}
-
void InternalArrayNArgumentsConstructorStub::InitializeDescriptor(
CodeStubDescriptor* descriptor) {
InitializeInternalArrayConstructorDescriptor(isolate(), descriptor, -1);
}
-
#define __ ACCESS_MASM(masm)
static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
@@ -99,7 +90,6 @@ static void EmitSmiNonsmiComparison(MacroAssembler* masm, Register lhs,
static void EmitStrictTwoHeapObjectCompare(MacroAssembler* masm, Register lhs,
Register rhs);
-
void HydrogenCodeStub::GenerateLightweightMiss(MacroAssembler* masm,
ExternalReference miss) {
// Update the static counter each time a new code stub is generated.
@@ -109,9 +99,9 @@ void HydrogenCodeStub::GenerateLightweightMiss(MacroAssembler* masm,
int param_count = descriptor.GetRegisterParameterCount();
{
// Call the runtime system in a fresh internal frame.
- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
+ FrameScope scope(masm, StackFrame::INTERNAL);
DCHECK(param_count == 0 ||
- r3.is(descriptor.GetRegisterParameter(param_count - 1)));
+ r2.is(descriptor.GetRegisterParameter(param_count - 1)));
// Push arguments
for (int i = 0; i < param_count; ++i) {
__ push(descriptor.GetRegisterParameter(i));
@@ -122,7 +112,6 @@ void HydrogenCodeStub::GenerateLightweightMiss(MacroAssembler* masm,
__ Ret();
}
-
void DoubleToIStub::Generate(MacroAssembler* masm) {
Label out_of_range, only_low, negate, done, fastpath_done;
Register input_reg = source();
@@ -145,78 +134,81 @@ void DoubleToIStub::Generate(MacroAssembler* masm) {
if (!skip_fastpath()) {
// Load double input.
- __ lfd(double_scratch, MemOperand(input_reg, double_offset));
+ __ LoadDouble(double_scratch, MemOperand(input_reg, double_offset));
// Do fast-path convert from double to int.
__ ConvertDoubleToInt64(double_scratch,
-#if !V8_TARGET_ARCH_PPC64
+#if !V8_TARGET_ARCH_S390X
scratch,
#endif
result_reg, d0);
// Test for overflow
-#if V8_TARGET_ARCH_PPC64
+#if V8_TARGET_ARCH_S390X
__ TestIfInt32(result_reg, r0);
#else
__ TestIfInt32(scratch, result_reg, r0);
#endif
- __ beq(&fastpath_done);
+ __ beq(&fastpath_done, Label::kNear);
}
__ Push(scratch_high, scratch_low);
// Account for saved regs if input is sp.
if (input_reg.is(sp)) double_offset += 2 * kPointerSize;
- __ lwz(scratch_high,
- MemOperand(input_reg, double_offset + Register::kExponentOffset));
- __ lwz(scratch_low,
- MemOperand(input_reg, double_offset + Register::kMantissaOffset));
+ __ LoadlW(scratch_high,
+ MemOperand(input_reg, double_offset + Register::kExponentOffset));
+ __ LoadlW(scratch_low,
+ MemOperand(input_reg, double_offset + Register::kMantissaOffset));
__ ExtractBitMask(scratch, scratch_high, HeapNumber::kExponentMask);
// Load scratch with exponent - 1. This is faster than loading
- // with exponent because Bias + 1 = 1024 which is a *PPC* immediate value.
+ // with exponent because Bias + 1 = 1024 which is a *S390* immediate value.
STATIC_ASSERT(HeapNumber::kExponentBias + 1 == 1024);
- __ subi(scratch, scratch, Operand(HeapNumber::kExponentBias + 1));
+ __ SubP(scratch, Operand(HeapNumber::kExponentBias + 1));
// If exponent is greater than or equal to 84, the 32 less significant
// bits are 0s (2^84 = 1, 52 significant bits, 32 uncoded bits),
// the result is 0.
// Compare exponent with 84 (compare exponent - 1 with 83).
- __ cmpi(scratch, Operand(83));
- __ bge(&out_of_range);
+ __ CmpP(scratch, Operand(83));
+ __ bge(&out_of_range, Label::kNear);
// If we reach this code, 31 <= exponent <= 83.
// So, we don't have to handle cases where 0 <= exponent <= 20 for
// which we would need to shift right the high part of the mantissa.
// Scratch contains exponent - 1.
// Load scratch with 52 - exponent (load with 51 - (exponent - 1)).
- __ subfic(scratch, scratch, Operand(51));
- __ cmpi(scratch, Operand::Zero());
- __ ble(&only_low);
+ __ Load(r0, Operand(51));
+ __ SubP(scratch, r0, scratch);
+ __ CmpP(scratch, Operand::Zero());
+ __ ble(&only_low, Label::kNear);
// 21 <= exponent <= 51, shift scratch_low and scratch_high
// to generate the result.
- __ srw(scratch_low, scratch_low, scratch);
+ __ ShiftRight(scratch_low, scratch_low, scratch);
// Scratch contains: 52 - exponent.
// We needs: exponent - 20.
// So we use: 32 - scratch = 32 - 52 + exponent = exponent - 20.
- __ subfic(scratch, scratch, Operand(32));
+ __ Load(r0, Operand(32));
+ __ SubP(scratch, r0, scratch);
__ ExtractBitMask(result_reg, scratch_high, HeapNumber::kMantissaMask);
// Set the implicit 1 before the mantissa part in scratch_high.
STATIC_ASSERT(HeapNumber::kMantissaBitsInTopWord >= 16);
- __ oris(result_reg, result_reg,
- Operand(1 << ((HeapNumber::kMantissaBitsInTopWord) - 16)));
- __ slw(r0, result_reg, scratch);
- __ orx(result_reg, scratch_low, r0);
- __ b(&negate);
+ __ Load(r0, Operand(1 << ((HeapNumber::kMantissaBitsInTopWord)-16)));
+ __ ShiftLeftP(r0, r0, Operand(16));
+ __ OrP(result_reg, result_reg, r0);
+ __ ShiftLeft(r0, result_reg, scratch);
+ __ OrP(result_reg, scratch_low, r0);
+ __ b(&negate, Label::kNear);
__ bind(&out_of_range);
__ mov(result_reg, Operand::Zero());
- __ b(&done);
+ __ b(&done, Label::kNear);
__ bind(&only_low);
// 52 <= exponent <= 83, shift only scratch_low.
// On entry, scratch contains: 52 - exponent.
- __ neg(scratch, scratch);
- __ slw(result_reg, scratch_low, scratch);
+ __ LoadComplementRR(scratch, scratch);
+ __ ShiftLeft(result_reg, scratch_low, scratch);
__ bind(&negate);
// If input was positive, scratch_high ASR 31 equals 0 and
@@ -225,13 +217,14 @@ void DoubleToIStub::Generate(MacroAssembler* masm) {
// If the input was negative, we have to negate the result.
// Input_high ASR 31 equals 0xffffffff and scratch_high LSR 31 equals 1.
// New result = (result eor 0xffffffff) + 1 = 0 - result.
- __ srawi(r0, scratch_high, 31);
-#if V8_TARGET_ARCH_PPC64
- __ srdi(r0, r0, Operand(32));
+ __ ShiftRightArith(r0, scratch_high, Operand(31));
+#if V8_TARGET_ARCH_S390X
+ __ lgfr(r0, r0);
+ __ ShiftRightP(r0, r0, Operand(32));
#endif
- __ xor_(result_reg, result_reg, r0);
- __ srwi(r0, scratch_high, Operand(31));
- __ add(result_reg, result_reg, r0);
+ __ XorP(result_reg, r0);
+ __ ShiftRight(r0, scratch_high, Operand(31));
+ __ AddP(result_reg, r0);
__ bind(&done);
__ Pop(scratch_high, scratch_low);
@@ -242,7 +235,6 @@ void DoubleToIStub::Generate(MacroAssembler* masm) {
__ Ret();
}
-
// Handle the case where the lhs and rhs are the same object.
// Equality is almost reflexive (everything but NaN), so this is a test
// for "identity and not NaN".
@@ -250,7 +242,7 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
Condition cond) {
Label not_identical;
Label heap_number, return_equal;
- __ cmp(r3, r4);
+ __ CmpP(r2, r3);
__ bne(&not_identical);
// Test for NaN. Sadly, we can't just compare to Factory::nan_value(),
@@ -259,42 +251,41 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
// Smis. If it's not a heap number, then return equal.
if (cond == lt || cond == gt) {
// Call runtime on identical JSObjects.
- __ CompareObjectType(r3, r7, r7, FIRST_JS_RECEIVER_TYPE);
+ __ CompareObjectType(r2, r6, r6, FIRST_JS_RECEIVER_TYPE);
__ bge(slow);
// Call runtime on identical symbols since we need to throw a TypeError.
- __ cmpi(r7, Operand(SYMBOL_TYPE));
+ __ CmpP(r6, Operand(SYMBOL_TYPE));
__ beq(slow);
// Call runtime on identical SIMD values since we must throw a TypeError.
- __ cmpi(r7, Operand(SIMD128_VALUE_TYPE));
+ __ CmpP(r6, Operand(SIMD128_VALUE_TYPE));
__ beq(slow);
} else {
- __ CompareObjectType(r3, r7, r7, HEAP_NUMBER_TYPE);
+ __ CompareObjectType(r2, r6, r6, HEAP_NUMBER_TYPE);
__ beq(&heap_number);
// Comparing JS objects with <=, >= is complicated.
if (cond != eq) {
- __ cmpi(r7, Operand(FIRST_JS_RECEIVER_TYPE));
+ __ CmpP(r6, Operand(FIRST_JS_RECEIVER_TYPE));
__ bge(slow);
// Call runtime on identical symbols since we need to throw a TypeError.
- __ cmpi(r7, Operand(SYMBOL_TYPE));
+ __ CmpP(r6, Operand(SYMBOL_TYPE));
__ beq(slow);
// Call runtime on identical SIMD values since we must throw a TypeError.
- __ cmpi(r7, Operand(SIMD128_VALUE_TYPE));
+ __ CmpP(r6, Operand(SIMD128_VALUE_TYPE));
__ beq(slow);
// Normally here we fall through to return_equal, but undefined is
// special: (undefined == undefined) == true, but
// (undefined <= undefined) == false! See ECMAScript 11.8.5.
if (cond == le || cond == ge) {
- __ cmpi(r7, Operand(ODDBALL_TYPE));
+ __ CmpP(r6, Operand(ODDBALL_TYPE));
__ bne(&return_equal);
- __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
- __ cmp(r3, r5);
+ __ CompareRoot(r2, Heap::kUndefinedValueRootIndex);
__ bne(&return_equal);
if (cond == le) {
// undefined <= undefined should fail.
- __ li(r3, Operand(GREATER));
+ __ LoadImmP(r2, Operand(GREATER));
} else {
// undefined >= undefined should fail.
- __ li(r3, Operand(LESS));
+ __ LoadImmP(r2, Operand(LESS));
}
__ Ret();
}
@@ -303,11 +294,11 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
__ bind(&return_equal);
if (cond == lt) {
- __ li(r3, Operand(GREATER)); // Things aren't less than themselves.
+ __ LoadImmP(r2, Operand(GREATER)); // Things aren't less than themselves.
} else if (cond == gt) {
- __ li(r3, Operand(LESS)); // Things aren't greater than themselves.
+ __ LoadImmP(r2, Operand(LESS)); // Things aren't greater than themselves.
} else {
- __ li(r3, Operand(EQUAL)); // Things are <=, >=, ==, === themselves.
+ __ LoadImmP(r2, Operand(EQUAL)); // Things are <=, >=, ==, === themselves
}
__ Ret();
@@ -322,35 +313,33 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
// The representation of NaN values has all exponent bits (52..62) set,
// and not all mantissa bits (0..51) clear.
// Read top bits of double representation (second word of value).
- __ lwz(r5, FieldMemOperand(r3, HeapNumber::kExponentOffset));
+ __ LoadlW(r4, FieldMemOperand(r2, HeapNumber::kExponentOffset));
// Test that exponent bits are all set.
STATIC_ASSERT(HeapNumber::kExponentMask == 0x7ff00000u);
- __ ExtractBitMask(r6, r5, HeapNumber::kExponentMask);
- __ cmpli(r6, Operand(0x7ff));
+ __ ExtractBitMask(r5, r4, HeapNumber::kExponentMask);
+ __ CmpLogicalP(r5, Operand(0x7ff));
__ bne(&return_equal);
// Shift out flag and all exponent bits, retaining only mantissa.
- __ slwi(r5, r5, Operand(HeapNumber::kNonMantissaBitsInTopWord));
+ __ sll(r4, Operand(HeapNumber::kNonMantissaBitsInTopWord));
// Or with all low-bits of mantissa.
- __ lwz(r6, FieldMemOperand(r3, HeapNumber::kMantissaOffset));
- __ orx(r3, r6, r5);
- __ cmpi(r3, Operand::Zero());
- // For equal we already have the right value in r3: Return zero (equal)
+ __ LoadlW(r5, FieldMemOperand(r2, HeapNumber::kMantissaOffset));
+ __ OrP(r2, r5, r4);
+ __ CmpP(r2, Operand::Zero());
+ // For equal we already have the right value in r2: Return zero (equal)
// if all bits in mantissa are zero (it's an Infinity) and non-zero if
// not (it's a NaN). For <= and >= we need to load r0 with the failing
// value if it's a NaN.
if (cond != eq) {
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ li(r4, Operand((cond == le) ? GREATER : LESS));
- __ isel(eq, r3, r3, r4);
+ Label not_equal;
+ __ bne(&not_equal, Label::kNear);
+ // All-zero means Infinity means equal.
+ __ Ret();
+ __ bind(&not_equal);
+ if (cond == le) {
+ __ LoadImmP(r2, Operand(GREATER)); // NaN <= NaN should fail.
} else {
- // All-zero means Infinity means equal.
- __ Ret(eq);
- if (cond == le) {
- __ li(r3, Operand(GREATER)); // NaN <= NaN should fail.
- } else {
- __ li(r3, Operand(LESS)); // NaN >= NaN should fail.
- }
+ __ LoadImmP(r2, Operand(LESS)); // NaN >= NaN should fail.
}
}
__ Ret();
@@ -360,31 +349,28 @@ static void EmitIdenticalObjectComparison(MacroAssembler* masm, Label* slow,
__ bind(&not_identical);
}
-
// See comment at call site.
static void EmitSmiNonsmiComparison(MacroAssembler* masm, Register lhs,
Register rhs, Label* lhs_not_nan,
Label* slow, bool strict) {
- DCHECK((lhs.is(r3) && rhs.is(r4)) || (lhs.is(r4) && rhs.is(r3)));
+ DCHECK((lhs.is(r2) && rhs.is(r3)) || (lhs.is(r3) && rhs.is(r2)));
Label rhs_is_smi;
__ JumpIfSmi(rhs, &rhs_is_smi);
// Lhs is a Smi. Check whether the rhs is a heap number.
- __ CompareObjectType(rhs, r6, r7, HEAP_NUMBER_TYPE);
+ __ CompareObjectType(rhs, r5, r6, HEAP_NUMBER_TYPE);
if (strict) {
// If rhs is not a number and lhs is a Smi then strict equality cannot
// succeed. Return non-equal
- // If rhs is r3 then there is already a non zero value in it.
- if (!rhs.is(r3)) {
- Label skip;
- __ beq(&skip);
- __ mov(r3, Operand(NOT_EQUAL));
- __ Ret();
- __ bind(&skip);
- } else {
- __ Ret(ne);
+ // If rhs is r2 then there is already a non zero value in it.
+ Label skip;
+ __ beq(&skip, Label::kNear);
+ if (!rhs.is(r2)) {
+ __ mov(r2, Operand(NOT_EQUAL));
}
+ __ Ret();
+ __ bind(&skip);
} else {
// Smi compared non-strictly with a non-Smi non-heap-number. Call
// the runtime.
@@ -394,8 +380,8 @@ static void EmitSmiNonsmiComparison(MacroAssembler* masm, Register lhs,
// Lhs is a smi, rhs is a number.
// Convert lhs to a double in d7.
__ SmiToDouble(d7, lhs);
- // Load the double from rhs, tagged HeapNumber r3, to d6.
- __ lfd(d6, FieldMemOperand(rhs, HeapNumber::kValueOffset));
+ // Load the double from rhs, tagged HeapNumber r2, to d6.
+ __ LoadDouble(d6, FieldMemOperand(rhs, HeapNumber::kValueOffset));
// We now have both loaded as doubles but we can skip the lhs nan check
// since it's a smi.
@@ -403,20 +389,18 @@ static void EmitSmiNonsmiComparison(MacroAssembler* masm, Register lhs,
__ bind(&rhs_is_smi);
// Rhs is a smi. Check whether the non-smi lhs is a heap number.
- __ CompareObjectType(lhs, r7, r7, HEAP_NUMBER_TYPE);
+ __ CompareObjectType(lhs, r6, r6, HEAP_NUMBER_TYPE);
if (strict) {
// If lhs is not a number and rhs is a smi then strict equality cannot
// succeed. Return non-equal.
- // If lhs is r3 then there is already a non zero value in it.
- if (!lhs.is(r3)) {
- Label skip;
- __ beq(&skip);
- __ mov(r3, Operand(NOT_EQUAL));
- __ Ret();
- __ bind(&skip);
- } else {
- __ Ret(ne);
+ // If lhs is r2 then there is already a non zero value in it.
+ Label skip;
+ __ beq(&skip, Label::kNear);
+ if (!lhs.is(r2)) {
+ __ mov(r2, Operand(NOT_EQUAL));
}
+ __ Ret();
+ __ bind(&skip);
} else {
// Smi compared non-strictly with a non-smi non-heap-number. Call
// the runtime.
@@ -424,128 +408,127 @@ static void EmitSmiNonsmiComparison(MacroAssembler* masm, Register lhs,
}
// Rhs is a smi, lhs is a heap number.
- // Load the double from lhs, tagged HeapNumber r4, to d7.
- __ lfd(d7, FieldMemOperand(lhs, HeapNumber::kValueOffset));
+ // Load the double from lhs, tagged HeapNumber r3, to d7.
+ __ LoadDouble(d7, FieldMemOperand(lhs, HeapNumber::kValueOffset));
// Convert rhs to a double in d6.
__ SmiToDouble(d6, rhs);
// Fall through to both_loaded_as_doubles.
}
-
// See comment at call site.
static void EmitStrictTwoHeapObjectCompare(MacroAssembler* masm, Register lhs,
Register rhs) {
- DCHECK((lhs.is(r3) && rhs.is(r4)) || (lhs.is(r4) && rhs.is(r3)));
+ DCHECK((lhs.is(r2) && rhs.is(r3)) || (lhs.is(r3) && rhs.is(r2)));
// If either operand is a JS object or an oddball value, then they are
// not equal since their pointers are different.
// There is no test for undetectability in strict equality.
STATIC_ASSERT(LAST_TYPE == LAST_JS_RECEIVER_TYPE);
Label first_non_object;
- // Get the type of the first operand into r5 and compare it with
+ // Get the type of the first operand into r4 and compare it with
// FIRST_JS_RECEIVER_TYPE.
- __ CompareObjectType(rhs, r5, r5, FIRST_JS_RECEIVER_TYPE);
- __ blt(&first_non_object);
+ __ CompareObjectType(rhs, r4, r4, FIRST_JS_RECEIVER_TYPE);
+ __ blt(&first_non_object, Label::kNear);
- // Return non-zero (r3 is not zero)
+ // Return non-zero (r2 is not zero)
Label return_not_equal;
__ bind(&return_not_equal);
__ Ret();
__ bind(&first_non_object);
// Check for oddballs: true, false, null, undefined.
- __ cmpi(r5, Operand(ODDBALL_TYPE));
+ __ CmpP(r4, Operand(ODDBALL_TYPE));
__ beq(&return_not_equal);
- __ CompareObjectType(lhs, r6, r6, FIRST_JS_RECEIVER_TYPE);
+ __ CompareObjectType(lhs, r5, r5, FIRST_JS_RECEIVER_TYPE);
__ bge(&return_not_equal);
// Check for oddballs: true, false, null, undefined.
- __ cmpi(r6, Operand(ODDBALL_TYPE));
+ __ CmpP(r5, Operand(ODDBALL_TYPE));
__ beq(&return_not_equal);
// Now that we have the types we might as well check for
// internalized-internalized.
STATIC_ASSERT(kInternalizedTag == 0 && kStringTag == 0);
- __ orx(r5, r5, r6);
- __ andi(r0, r5, Operand(kIsNotStringMask | kIsNotInternalizedMask));
- __ beq(&return_not_equal, cr0);
+ __ OrP(r4, r4, r5);
+ __ AndP(r0, r4, Operand(kIsNotStringMask | kIsNotInternalizedMask));
+ __ beq(&return_not_equal);
}
-
// See comment at call site.
static void EmitCheckForTwoHeapNumbers(MacroAssembler* masm, Register lhs,
Register rhs,
Label* both_loaded_as_doubles,
Label* not_heap_numbers, Label* slow) {
- DCHECK((lhs.is(r3) && rhs.is(r4)) || (lhs.is(r4) && rhs.is(r3)));
+ DCHECK((lhs.is(r2) && rhs.is(r3)) || (lhs.is(r3) && rhs.is(r2)));
- __ CompareObjectType(rhs, r6, r5, HEAP_NUMBER_TYPE);
+ __ CompareObjectType(rhs, r5, r4, HEAP_NUMBER_TYPE);
__ bne(not_heap_numbers);
- __ LoadP(r5, FieldMemOperand(lhs, HeapObject::kMapOffset));
- __ cmp(r5, r6);
+ __ LoadP(r4, FieldMemOperand(lhs, HeapObject::kMapOffset));
+ __ CmpP(r4, r5);
__ bne(slow); // First was a heap number, second wasn't. Go slow case.
// Both are heap numbers. Load them up then jump to the code we have
// for that.
- __ lfd(d6, FieldMemOperand(rhs, HeapNumber::kValueOffset));
- __ lfd(d7, FieldMemOperand(lhs, HeapNumber::kValueOffset));
+ __ LoadDouble(d6, FieldMemOperand(rhs, HeapNumber::kValueOffset));
+ __ LoadDouble(d7, FieldMemOperand(lhs, HeapNumber::kValueOffset));
__ b(both_loaded_as_doubles);
}
-
// Fast negative check for internalized-to-internalized equality.
static void EmitCheckForInternalizedStringsOrObjects(MacroAssembler* masm,
Register lhs, Register rhs,
Label* possible_strings,
Label* runtime_call) {
- DCHECK((lhs.is(r3) && rhs.is(r4)) || (lhs.is(r4) && rhs.is(r3)));
+ DCHECK((lhs.is(r2) && rhs.is(r3)) || (lhs.is(r3) && rhs.is(r2)));
- // r5 is object type of rhs.
+ // r4 is object type of rhs.
Label object_test, return_unequal, undetectable;
STATIC_ASSERT(kInternalizedTag == 0 && kStringTag == 0);
- __ andi(r0, r5, Operand(kIsNotStringMask));
- __ bne(&object_test, cr0);
- __ andi(r0, r5, Operand(kIsNotInternalizedMask));
- __ bne(possible_strings, cr0);
- __ CompareObjectType(lhs, r6, r6, FIRST_NONSTRING_TYPE);
+ __ mov(r0, Operand(kIsNotStringMask));
+ __ AndP(r0, r4);
+ __ bne(&object_test, Label::kNear);
+ __ mov(r0, Operand(kIsNotInternalizedMask));
+ __ AndP(r0, r4);
+ __ bne(possible_strings);
+ __ CompareObjectType(lhs, r5, r5, FIRST_NONSTRING_TYPE);
__ bge(runtime_call);
- __ andi(r0, r6, Operand(kIsNotInternalizedMask));
- __ bne(possible_strings, cr0);
+ __ mov(r0, Operand(kIsNotInternalizedMask));
+ __ AndP(r0, r5);
+ __ bne(possible_strings);
// Both are internalized. We already checked they weren't the same pointer so
// they are not equal. Return non-equal by returning the non-zero object
- // pointer in r3.
+ // pointer in r2.
__ Ret();
__ bind(&object_test);
- __ LoadP(r5, FieldMemOperand(lhs, HeapObject::kMapOffset));
- __ LoadP(r6, FieldMemOperand(rhs, HeapObject::kMapOffset));
- __ lbz(r7, FieldMemOperand(r5, Map::kBitFieldOffset));
- __ lbz(r8, FieldMemOperand(r6, Map::kBitFieldOffset));
- __ andi(r0, r7, Operand(1 << Map::kIsUndetectable));
- __ bne(&undetectable, cr0);
- __ andi(r0, r8, Operand(1 << Map::kIsUndetectable));
- __ bne(&return_unequal, cr0);
-
- __ CompareInstanceType(r5, r5, FIRST_JS_RECEIVER_TYPE);
+ __ LoadP(r4, FieldMemOperand(lhs, HeapObject::kMapOffset));
+ __ LoadP(r5, FieldMemOperand(rhs, HeapObject::kMapOffset));
+ __ LoadlB(r6, FieldMemOperand(r4, Map::kBitFieldOffset));
+ __ LoadlB(r7, FieldMemOperand(r5, Map::kBitFieldOffset));
+ __ AndP(r0, r6, Operand(1 << Map::kIsUndetectable));
+ __ bne(&undetectable);
+ __ AndP(r0, r7, Operand(1 << Map::kIsUndetectable));
+ __ bne(&return_unequal);
+
+ __ CompareInstanceType(r4, r4, FIRST_JS_RECEIVER_TYPE);
__ blt(runtime_call);
- __ CompareInstanceType(r6, r6, FIRST_JS_RECEIVER_TYPE);
+ __ CompareInstanceType(r5, r5, FIRST_JS_RECEIVER_TYPE);
__ blt(runtime_call);
__ bind(&return_unequal);
- // Return non-equal by returning the non-zero object pointer in r3.
+ // Return non-equal by returning the non-zero object pointer in r2.
__ Ret();
__ bind(&undetectable);
- __ andi(r0, r8, Operand(1 << Map::kIsUndetectable));
- __ beq(&return_unequal, cr0);
- __ li(r3, Operand(EQUAL));
+ __ AndP(r0, r7, Operand(1 << Map::kIsUndetectable));
+ __ beq(&return_unequal);
+ __ LoadImmP(r2, Operand(EQUAL));
__ Ret();
}
-
static void CompareICStub_CheckInputType(MacroAssembler* masm, Register input,
Register scratch,
CompareICState::State expected,
@@ -563,28 +546,27 @@ static void CompareICStub_CheckInputType(MacroAssembler* masm, Register input,
__ bind(&ok);
}
-
-// On entry r4 and r5 are the values to be compared.
-// On exit r3 is 0, positive or negative to indicate the result of
+// On entry r3 and r4 are the values to be compared.
+// On exit r2 is 0, positive or negative to indicate the result of
// the comparison.
void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
- Register lhs = r4;
- Register rhs = r3;
+ Register lhs = r3;
+ Register rhs = r2;
Condition cc = GetCondition();
Label miss;
- CompareICStub_CheckInputType(masm, lhs, r5, left(), &miss);
- CompareICStub_CheckInputType(masm, rhs, r6, right(), &miss);
+ CompareICStub_CheckInputType(masm, lhs, r4, left(), &miss);
+ CompareICStub_CheckInputType(masm, rhs, r5, right(), &miss);
Label slow; // Call builtin.
Label not_smis, both_loaded_as_doubles, lhs_not_nan;
Label not_two_smis, smi_done;
- __ orx(r5, r4, r3);
- __ JumpIfNotSmi(r5, &not_two_smis);
- __ SmiUntag(r4);
+ __ OrP(r4, r3, r2);
+ __ JumpIfNotSmi(r4, &not_two_smis);
__ SmiUntag(r3);
- __ sub(r3, r4, r3);
+ __ SmiUntag(r2);
+ __ SubP(r2, r3, r2);
__ Ret();
__ bind(&not_two_smis);
@@ -599,8 +581,8 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
// be strictly equal if the other is a HeapNumber.
STATIC_ASSERT(kSmiTag == 0);
DCHECK_EQ(static_cast<Smi*>(0), Smi::FromInt(0));
- __ and_(r5, lhs, rhs);
- __ JumpIfNotSmi(r5, &not_smis);
+ __ AndP(r4, lhs, rhs);
+ __ JumpIfNotSmi(r4, &not_smis);
// One operand is a smi. EmitSmiNonsmiComparison generates code that can:
// 1) Return the answer.
// 2) Go to slow.
@@ -615,38 +597,29 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
// The arguments have been converted to doubles and stored in d6 and d7
__ bind(&lhs_not_nan);
Label no_nan;
- __ fcmpu(d7, d6);
+ __ cdbr(d7, d6);
Label nan, equal, less_than;
__ bunordered(&nan);
- if (CpuFeatures::IsSupported(ISELECT)) {
- DCHECK(EQUAL == 0);
- __ li(r4, Operand(GREATER));
- __ li(r5, Operand(LESS));
- __ isel(eq, r3, r0, r4);
- __ isel(lt, r3, r5, r3);
- __ Ret();
- } else {
- __ beq(&equal);
- __ blt(&less_than);
- __ li(r3, Operand(GREATER));
- __ Ret();
- __ bind(&equal);
- __ li(r3, Operand(EQUAL));
- __ Ret();
- __ bind(&less_than);
- __ li(r3, Operand(LESS));
- __ Ret();
- }
+ __ beq(&equal, Label::kNear);
+ __ blt(&less_than, Label::kNear);
+ __ LoadImmP(r2, Operand(GREATER));
+ __ Ret();
+ __ bind(&equal);
+ __ LoadImmP(r2, Operand(EQUAL));
+ __ Ret();
+ __ bind(&less_than);
+ __ LoadImmP(r2, Operand(LESS));
+ __ Ret();
__ bind(&nan);
- // If one of the sides was a NaN then the v flag is set. Load r3 with
+ // If one of the sides was a NaN then the v flag is set. Load r2 with
// whatever it takes to make the comparison fail, since comparisons with NaN
// always fail.
if (cc == lt || cc == le) {
- __ li(r3, Operand(GREATER));
+ __ LoadImmP(r2, Operand(GREATER));
} else {
- __ li(r3, Operand(LESS));
+ __ LoadImmP(r2, Operand(LESS));
}
__ Ret();
@@ -662,10 +635,10 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
Label check_for_internalized_strings;
Label flat_string_check;
// Check for heap-number-heap-number comparison. Can jump to slow case,
- // or load both doubles into r3, r4, r5, r6 and jump to the code that handles
+ // or load both doubles into r2, r3, r4, r5 and jump to the code that handles
// that case. If the inputs are not doubles then jumps to
// check_for_internalized_strings.
- // In this case r5 will contain the type of rhs_. Never falls through.
+ // In this case r4 will contain the type of rhs_. Never falls through.
EmitCheckForTwoHeapNumbers(masm, lhs, rhs, &both_loaded_as_doubles,
&check_for_internalized_strings,
&flat_string_check);
@@ -676,7 +649,7 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
if (cc == eq && !strict()) {
// Returns an answer for two internalized strings or two detectable objects.
// Otherwise jumps to string case or not both strings case.
- // Assumes that r5 is the type of rhs_ on entry.
+ // Assumes that r4 is the type of rhs_ on entry.
EmitCheckForInternalizedStringsOrObjects(masm, lhs, rhs, &flat_string_check,
&slow);
}
@@ -685,14 +658,14 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
// and inline if that is the case.
__ bind(&flat_string_check);
- __ JumpIfNonSmisNotBothSequentialOneByteStrings(lhs, rhs, r5, r6, &slow);
+ __ JumpIfNonSmisNotBothSequentialOneByteStrings(lhs, rhs, r4, r5, &slow);
- __ IncrementCounter(isolate()->counters()->string_compare_native(), 1, r5,
- r6);
+ __ IncrementCounter(isolate()->counters()->string_compare_native(), 1, r4,
+ r5);
if (cc == eq) {
- StringHelper::GenerateFlatOneByteStringEquals(masm, lhs, rhs, r5, r6);
+ StringHelper::GenerateFlatOneByteStringEquals(masm, lhs, rhs, r4, r5);
} else {
- StringHelper::GenerateCompareFlatOneByteStrings(masm, lhs, rhs, r5, r6, r7);
+ StringHelper::GenerateCompareFlatOneByteStrings(masm, lhs, rhs, r4, r5, r6);
}
// Never falls through to here.
@@ -710,8 +683,8 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
DCHECK(cc == gt || cc == ge); // remaining cases
ncr = LESS;
}
- __ LoadSmiLiteral(r3, Smi::FromInt(ncr));
- __ push(r3);
+ __ LoadSmiLiteral(r2, Smi::FromInt(ncr));
+ __ push(r2);
// Call the native; it returns -1 (less), 0 (equal), or 1 (greater)
// tagged as a small integer.
@@ -722,58 +695,52 @@ void CompareICStub::GenerateGeneric(MacroAssembler* masm) {
GenerateMiss(masm);
}
-
void StoreBufferOverflowStub::Generate(MacroAssembler* masm) {
// We don't allow a GC during a store buffer overflow so there is no need to
// store the registers in any particular way, but we do have to store and
// restore them.
- __ mflr(r0);
- __ MultiPush(kJSCallerSaved | r0.bit());
+ __ MultiPush(kJSCallerSaved | r14.bit());
if (save_doubles()) {
__ MultiPushDoubles(kCallerSavedDoubles);
}
const int argument_count = 1;
const int fp_argument_count = 0;
- const Register scratch = r4;
+ const Register scratch = r3;
AllowExternalCallThatCantCauseGC scope(masm);
__ PrepareCallCFunction(argument_count, fp_argument_count, scratch);
- __ mov(r3, Operand(ExternalReference::isolate_address(isolate())));
+ __ mov(r2, Operand(ExternalReference::isolate_address(isolate())));
__ CallCFunction(ExternalReference::store_buffer_overflow_function(isolate()),
argument_count);
if (save_doubles()) {
__ MultiPopDoubles(kCallerSavedDoubles);
}
- __ MultiPop(kJSCallerSaved | r0.bit());
- __ mtlr(r0);
+ __ MultiPop(kJSCallerSaved | r14.bit());
__ Ret();
}
-
void StoreRegistersStateStub::Generate(MacroAssembler* masm) {
__ PushSafepointRegisters();
- __ blr();
+ __ b(r14);
}
-
void RestoreRegistersStateStub::Generate(MacroAssembler* masm) {
__ PopSafepointRegisters();
- __ blr();
+ __ b(r14);
}
-
void MathPowStub::Generate(MacroAssembler* masm) {
- const Register base = r4;
+ const Register base = r3;
const Register exponent = MathPowTaggedDescriptor::exponent();
- DCHECK(exponent.is(r5));
- const Register heapnumbermap = r8;
- const Register heapnumber = r3;
+ DCHECK(exponent.is(r4));
+ const Register heapnumbermap = r7;
+ const Register heapnumber = r2;
const DoubleRegister double_base = d1;
const DoubleRegister double_exponent = d2;
const DoubleRegister double_result = d3;
const DoubleRegister double_scratch = d0;
- const Register scratch = r11;
- const Register scratch2 = r10;
+ const Register scratch = r1;
+ const Register scratch2 = r9;
Label call_runtime, done, int_exponent;
if (exponent_type() == ON_STACK) {
@@ -788,11 +755,11 @@ void MathPowStub::Generate(MacroAssembler* masm) {
__ UntagAndJumpIfSmi(scratch, base, &base_is_smi);
__ LoadP(scratch, FieldMemOperand(base, JSObject::kMapOffset));
- __ cmp(scratch, heapnumbermap);
+ __ CmpP(scratch, heapnumbermap);
__ bne(&call_runtime);
- __ lfd(double_base, FieldMemOperand(base, HeapNumber::kValueOffset));
- __ b(&unpack_exponent);
+ __ LoadDouble(double_base, FieldMemOperand(base, HeapNumber::kValueOffset));
+ __ b(&unpack_exponent, Label::kNear);
__ bind(&base_is_smi);
__ ConvertIntToDouble(scratch, double_base);
@@ -800,24 +767,24 @@ void MathPowStub::Generate(MacroAssembler* masm) {
__ UntagAndJumpIfSmi(scratch, exponent, &int_exponent);
__ LoadP(scratch, FieldMemOperand(exponent, JSObject::kMapOffset));
- __ cmp(scratch, heapnumbermap);
+ __ CmpP(scratch, heapnumbermap);
__ bne(&call_runtime);
- __ lfd(double_exponent,
- FieldMemOperand(exponent, HeapNumber::kValueOffset));
+ __ LoadDouble(double_exponent,
+ FieldMemOperand(exponent, HeapNumber::kValueOffset));
} else if (exponent_type() == TAGGED) {
// Base is already in double_base.
__ UntagAndJumpIfSmi(scratch, exponent, &int_exponent);
- __ lfd(double_exponent,
- FieldMemOperand(exponent, HeapNumber::kValueOffset));
+ __ LoadDouble(double_exponent,
+ FieldMemOperand(exponent, HeapNumber::kValueOffset));
}
if (exponent_type() != INTEGER) {
// Detect integer exponents stored as double.
__ TryDoubleToInt32Exact(scratch, double_exponent, scratch2,
double_scratch);
- __ beq(&int_exponent);
+ __ beq(&int_exponent, Label::kNear);
if (exponent_type() == ON_STACK) {
// Detect square root case. Crankshaft detects constant +/-0.5 at
@@ -827,47 +794,50 @@ void MathPowStub::Generate(MacroAssembler* masm) {
// Test for 0.5.
__ LoadDoubleLiteral(double_scratch, 0.5, scratch);
- __ fcmpu(double_exponent, double_scratch);
- __ bne(&not_plus_half);
+ __ cdbr(double_exponent, double_scratch);
+ __ bne(&not_plus_half, Label::kNear);
// Calculates square root of base. Check for the special case of
// Math.pow(-Infinity, 0.5) == Infinity (ECMA spec, 15.8.2.13).
__ LoadDoubleLiteral(double_scratch, -V8_INFINITY, scratch);
- __ fcmpu(double_base, double_scratch);
- __ bne(&not_minus_inf1);
- __ fneg(double_result, double_scratch);
+ __ cdbr(double_base, double_scratch);
+ __ bne(&not_minus_inf1, Label::kNear);
+ __ lcdbr(double_result, double_scratch);
__ b(&done);
__ bind(&not_minus_inf1);
// Add +0 to convert -0 to +0.
- __ fadd(double_scratch, double_base, kDoubleRegZero);
- __ fsqrt(double_result, double_scratch);
+ __ ldr(double_scratch, double_base);
+ __ lzdr(kDoubleRegZero);
+ __ adbr(double_scratch, kDoubleRegZero);
+ __ sqdbr(double_result, double_scratch);
__ b(&done);
__ bind(&not_plus_half);
__ LoadDoubleLiteral(double_scratch, -0.5, scratch);
- __ fcmpu(double_exponent, double_scratch);
+ __ cdbr(double_exponent, double_scratch);
__ bne(&call_runtime);
// Calculates square root of base. Check for the special case of
// Math.pow(-Infinity, -0.5) == 0 (ECMA spec, 15.8.2.13).
__ LoadDoubleLiteral(double_scratch, -V8_INFINITY, scratch);
- __ fcmpu(double_base, double_scratch);
- __ bne(&not_minus_inf2);
- __ fmr(double_result, kDoubleRegZero);
+ __ cdbr(double_base, double_scratch);
+ __ bne(&not_minus_inf2, Label::kNear);
+ __ ldr(double_result, kDoubleRegZero);
__ b(&done);
__ bind(&not_minus_inf2);
// Add +0 to convert -0 to +0.
- __ fadd(double_scratch, double_base, kDoubleRegZero);
+ __ ldr(double_scratch, double_base);
+ __ lzdr(kDoubleRegZero);
+ __ adbr(double_scratch, kDoubleRegZero);
__ LoadDoubleLiteral(double_result, 1.0, scratch);
- __ fsqrt(double_scratch, double_scratch);
- __ fdiv(double_result, double_result, double_scratch);
+ __ sqdbr(double_scratch, double_scratch);
+ __ ddbr(double_result, double_scratch);
__ b(&done);
}
- __ mflr(r0);
- __ push(r0);
+ __ push(r14);
{
AllowExternalCallThatCantCauseGC scope(masm);
__ PrepareCallCFunction(0, 2, scratch);
@@ -875,8 +845,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
__ CallCFunction(
ExternalReference::power_double_double_function(isolate()), 0, 2);
}
- __ pop(r0);
- __ mtlr(r0);
+ __ pop(r14);
__ MovFromFloatResult(double_result);
__ b(&done);
}
@@ -886,49 +855,49 @@ void MathPowStub::Generate(MacroAssembler* masm) {
// Get two copies of exponent in the registers scratch and exponent.
if (exponent_type() == INTEGER) {
- __ mr(scratch, exponent);
+ __ LoadRR(scratch, exponent);
} else {
// Exponent has previously been stored into scratch as untagged integer.
- __ mr(exponent, scratch);
+ __ LoadRR(exponent, scratch);
}
- __ fmr(double_scratch, double_base); // Back up base.
- __ li(scratch2, Operand(1));
+ __ ldr(double_scratch, double_base); // Back up base.
+ __ LoadImmP(scratch2, Operand(1));
__ ConvertIntToDouble(scratch2, double_result);
// Get absolute value of exponent.
- __ cmpi(scratch, Operand::Zero());
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ neg(scratch2, scratch);
- __ isel(lt, scratch, scratch2, scratch);
- } else {
- Label positive_exponent;
- __ bge(&positive_exponent);
- __ neg(scratch, scratch);
- __ bind(&positive_exponent);
- }
+ Label positive_exponent;
+ __ CmpP(scratch, Operand::Zero());
+ __ bge(&positive_exponent, Label::kNear);
+ __ LoadComplementRR(scratch, scratch);
+ __ bind(&positive_exponent);
Label while_true, no_carry, loop_end;
__ bind(&while_true);
- __ andi(scratch2, scratch, Operand(1));
- __ beq(&no_carry, cr0);
- __ fmul(double_result, double_result, double_scratch);
+ __ mov(scratch2, Operand(1));
+ __ AndP(scratch2, scratch);
+ __ beq(&no_carry, Label::kNear);
+ __ mdbr(double_result, double_scratch);
__ bind(&no_carry);
- __ ShiftRightArithImm(scratch, scratch, 1, SetRC);
- __ beq(&loop_end, cr0);
- __ fmul(double_scratch, double_scratch, double_scratch);
+ __ ShiftRightArithP(scratch, scratch, Operand(1));
+ __ beq(&loop_end, Label::kNear);
+ __ mdbr(double_scratch, double_scratch);
__ b(&while_true);
__ bind(&loop_end);
- __ cmpi(exponent, Operand::Zero());
+ __ CmpP(exponent, Operand::Zero());
__ bge(&done);
- __ li(scratch2, Operand(1));
- __ ConvertIntToDouble(scratch2, double_scratch);
- __ fdiv(double_result, double_scratch, double_result);
+ // get 1/double_result:
+ __ ldr(double_scratch, double_result);
+ __ LoadImmP(scratch2, Operand(1));
+ __ ConvertIntToDouble(scratch2, double_result);
+ __ ddbr(double_result, double_scratch);
+
// Test whether result is zero. Bail out to check for subnormal result.
// Due to subnormals, x^-y == (1/x)^y does not hold in all cases.
- __ fcmpu(double_result, kDoubleRegZero);
- __ bne(&done);
+ __ lzdr(kDoubleRegZero);
+ __ cdbr(double_result, kDoubleRegZero);
+ __ bne(&done, Label::kNear);
// double_exponent may not containe the exponent value if the input was a
// smi. We set it with exponent value before bailing out.
__ ConvertIntToDouble(exponent, double_exponent);
@@ -944,13 +913,12 @@ void MathPowStub::Generate(MacroAssembler* masm) {
__ bind(&done);
__ AllocateHeapNumber(heapnumber, scratch, scratch2, heapnumbermap,
&call_runtime);
- __ stfd(double_result,
- FieldMemOperand(heapnumber, HeapNumber::kValueOffset));
- DCHECK(heapnumber.is(r3));
+ __ StoreDouble(double_result,
+ FieldMemOperand(heapnumber, HeapNumber::kValueOffset));
+ DCHECK(heapnumber.is(r2));
__ Ret(2);
} else {
- __ mflr(r0);
- __ push(r0);
+ __ push(r14);
{
AllowExternalCallThatCantCauseGC scope(masm);
__ PrepareCallCFunction(0, 2, scratch);
@@ -958,8 +926,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
__ CallCFunction(
ExternalReference::power_double_double_function(isolate()), 0, 2);
}
- __ pop(r0);
- __ mtlr(r0);
+ __ pop(r14);
__ MovFromFloatResult(double_result);
__ bind(&done);
@@ -967,10 +934,8 @@ void MathPowStub::Generate(MacroAssembler* masm) {
}
}
-
bool CEntryStub::NeedsImmovableCode() { return true; }
-
void CodeStub::GenerateStubsAheadOfTime(Isolate* isolate) {
CEntryStub::GenerateAheadOfTime(isolate);
StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime(isolate);
@@ -986,56 +951,49 @@ void CodeStub::GenerateStubsAheadOfTime(Isolate* isolate) {
TypeofStub::GenerateAheadOfTime(isolate);
}
-
void StoreRegistersStateStub::GenerateAheadOfTime(Isolate* isolate) {
StoreRegistersStateStub stub(isolate);
stub.GetCode();
}
-
void RestoreRegistersStateStub::GenerateAheadOfTime(Isolate* isolate) {
RestoreRegistersStateStub stub(isolate);
stub.GetCode();
}
-
void CodeStub::GenerateFPStubs(Isolate* isolate) {
- // Generate if not already in cache.
SaveFPRegsMode mode = kSaveFPRegs;
CEntryStub(isolate, 1, mode).GetCode();
StoreBufferOverflowStub(isolate, mode).GetCode();
isolate->set_fp_stubs_generated(true);
}
-
void CEntryStub::GenerateAheadOfTime(Isolate* isolate) {
CEntryStub stub(isolate, 1, kDontSaveFPRegs);
stub.GetCode();
}
-
void CEntryStub::Generate(MacroAssembler* masm) {
// Called from JavaScript; parameters are on stack as if calling JS function.
- // r3: number of arguments including receiver
- // r4: pointer to builtin function
+ // r2: number of arguments including receiver
+ // r3: pointer to builtin function
// fp: frame pointer (restored after C call)
// sp: stack pointer (restored as callee's sp after C call)
// cp: current context (C callee-saved)
//
// If argv_in_register():
- // r5: pointer to the first argument
+ // r4: pointer to the first argument
ProfileEntryHookStub::MaybeCallEntryHook(masm);
- __ mr(r15, r4);
+ __ LoadRR(r7, r3);
if (argv_in_register()) {
// Move argv into the correct register.
- __ mr(r4, r5);
+ __ LoadRR(r3, r4);
} else {
// Compute the argv pointer.
- __ ShiftLeftImm(r4, r3, Operand(kPointerSizeLog2));
- __ add(r4, r4, sp);
- __ subi(r4, r4, Operand(kPointerSize));
+ __ ShiftLeftP(r3, r2, Operand(kPointerSizeLog2));
+ __ lay(r3, MemOperand(r3, sp, -kPointerSize));
}
// Enter the exit frame that transitions from JavaScript to C++.
@@ -1047,68 +1005,72 @@ void CEntryStub::Generate(MacroAssembler* masm) {
// Pass buffer for return value on stack if necessary
bool needs_return_buffer =
result_size() > 2 ||
- (result_size() == 2 && !ABI_RETURNS_OBJECT_PAIRS_IN_REGS);
+ (result_size() == 2 && !ABI_RETURNS_OBJECTPAIR_IN_REGS);
if (needs_return_buffer) {
arg_stack_space += result_size();
}
- __ EnterExitFrame(save_doubles(), arg_stack_space);
+#if V8_TARGET_ARCH_S390X
+ // 64-bit linux pass Argument object by reference not value
+ arg_stack_space += 2;
+#endif
- // Store a copy of argc in callee-saved registers for later.
- __ mr(r14, r3);
+ __ EnterExitFrame(save_doubles(), arg_stack_space);
- // r3, r14: number of arguments including receiver (C callee-saved)
- // r4: pointer to the first argument
- // r15: pointer to builtin function (C callee-saved)
+ // Store a copy of argc, argv in callee-saved registers for later.
+ __ LoadRR(r6, r2);
+ __ LoadRR(r8, r3);
+ // r2, r6: number of arguments including receiver (C callee-saved)
+ // r3, r8: pointer to the first argument
+ // r7: pointer to builtin function (C callee-saved)
// Result returned in registers or stack, depending on result size and ABI.
- Register isolate_reg = r5;
+ Register isolate_reg = r4;
if (needs_return_buffer) {
- // The return value is a non-scalar value.
+ // The return value is 16-byte non-scalar value.
// Use frame storage reserved by calling function to pass return
- // buffer as implicit first argument.
- __ mr(r5, r4);
- __ mr(r4, r3);
- __ addi(r3, sp, Operand((kStackFrameExtraParamSlot + 1) * kPointerSize));
- isolate_reg = r6;
+ // buffer as implicit first argument in R2. Shfit original parameters
+ // by one register each.
+ __ LoadRR(r4, r3);
+ __ LoadRR(r3, r2);
+ __ la(r2, MemOperand(sp, (kStackFrameExtraParamSlot + 1) * kPointerSize));
+ isolate_reg = r5;
}
-
// Call C built-in.
__ mov(isolate_reg, Operand(ExternalReference::isolate_address(isolate())));
- Register target = r15;
- if (ABI_USES_FUNCTION_DESCRIPTORS) {
- // AIX/PPC64BE Linux use a function descriptor.
- __ LoadP(ToRegister(ABI_TOC_REGISTER), MemOperand(r15, kPointerSize));
- __ LoadP(ip, MemOperand(r15, 0)); // Instruction address
- target = ip;
- } else if (ABI_CALL_VIA_IP) {
- __ Move(ip, r15);
- target = ip;
- }
+ Register target = r7;
// To let the GC traverse the return address of the exit frames, we need to
// know where the return address is. The CEntryStub is unmovable, so
// we can store the address on the stack to be able to find it again and
// we never have to restore it, because it will not change.
- Label after_call;
- __ mov_label_addr(r0, &after_call);
- __ StoreP(r0, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize));
- __ Call(target);
- __ bind(&after_call);
+ {
+ Label return_label;
+ __ larl(r14, &return_label); // Generate the return addr of call later.
+ __ StoreP(r14, MemOperand(sp, kStackFrameRASlot * kPointerSize));
+
+ // zLinux ABI requires caller's frame to have sufficient space for callee
+ // preserved regsiter save area.
+ // __ lay(sp, MemOperand(sp, -kCalleeRegisterSaveAreaSize));
+ __ positions_recorder()->WriteRecordedPositions();
+ __ b(target);
+ __ bind(&return_label);
+ // __ la(sp, MemOperand(sp, +kCalleeRegisterSaveAreaSize));
+ }
// If return value is on the stack, pop it to registers.
if (needs_return_buffer) {
- if (result_size() > 2) __ LoadP(r5, MemOperand(r3, 2 * kPointerSize));
- __ LoadP(r4, MemOperand(r3, kPointerSize));
- __ LoadP(r3, MemOperand(r3));
+ if (result_size() > 2) __ LoadP(r4, MemOperand(r2, 2 * kPointerSize));
+ __ LoadP(r3, MemOperand(r2, kPointerSize));
+ __ LoadP(r2, MemOperand(r2));
}
// Check result for exception sentinel.
Label exception_returned;
- __ CompareRoot(r3, Heap::kExceptionRootIndex);
- __ beq(&exception_returned);
+ __ CompareRoot(r2, Heap::kExceptionRootIndex);
+ __ beq(&exception_returned, Label::kNear);
// Check that there is no pending exception, otherwise we
// should have returned the exception sentinel.
@@ -1116,18 +1078,17 @@ void CEntryStub::Generate(MacroAssembler* masm) {
Label okay;
ExternalReference pending_exception_address(
Isolate::kPendingExceptionAddress, isolate());
-
- __ mov(r6, Operand(pending_exception_address));
- __ LoadP(r6, MemOperand(r6));
- __ CompareRoot(r6, Heap::kTheHoleValueRootIndex);
+ __ mov(r4, Operand(pending_exception_address));
+ __ LoadP(r4, MemOperand(r4));
+ __ CompareRoot(r4, Heap::kTheHoleValueRootIndex);
// Cannot use check here as it attempts to generate call into runtime.
- __ beq(&okay);
+ __ beq(&okay, Label::kNear);
__ stop("Unexpected pending exception");
__ bind(&okay);
}
// Exit C frame and return.
- // r3:r4: result
+ // r2:r3: result
// sp: stack pointer
// fp: frame pointer
Register argc;
@@ -1135,11 +1096,11 @@ void CEntryStub::Generate(MacroAssembler* masm) {
// We don't want to pop arguments so set argc to no_reg.
argc = no_reg;
} else {
- // r14: still holds argc (callee-saved).
- argc = r14;
+ // r6: still holds argc (callee-saved).
+ argc = r6;
}
__ LeaveExitFrame(save_doubles(), argc, true);
- __ blr();
+ __ b(r14);
// Handling of exception.
__ bind(&exception_returned);
@@ -1161,10 +1122,10 @@ void CEntryStub::Generate(MacroAssembler* masm) {
isolate());
{
FrameScope scope(masm, StackFrame::MANUAL);
- __ PrepareCallCFunction(3, 0, r3);
- __ li(r3, Operand::Zero());
- __ li(r4, Operand::Zero());
- __ mov(r5, Operand(ExternalReference::isolate_address(isolate())));
+ __ PrepareCallCFunction(3, 0, r2);
+ __ LoadImmP(r2, Operand::Zero());
+ __ LoadImmP(r3, Operand::Zero());
+ __ mov(r4, Operand(ExternalReference::isolate_address(isolate())));
__ CallCFunction(find_handler, 3);
}
@@ -1179,96 +1140,110 @@ void CEntryStub::Generate(MacroAssembler* masm) {
// If the handler is a JS frame, restore the context to the frame. Note that
// the context will be set to (cp == 0) for non-JS frames.
Label skip;
- __ cmpi(cp, Operand::Zero());
- __ beq(&skip);
+ __ CmpP(cp, Operand::Zero());
+ __ beq(&skip, Label::kNear);
__ StoreP(cp, MemOperand(fp, StandardFrameConstants::kContextOffset));
__ bind(&skip);
// Compute the handler entry address and jump to it.
- ConstantPoolUnavailableScope constant_pool_unavailable(masm);
- __ mov(r4, Operand(pending_handler_code_address));
+ __ mov(r3, Operand(pending_handler_code_address));
+ __ LoadP(r3, MemOperand(r3));
+ __ mov(r4, Operand(pending_handler_offset_address));
__ LoadP(r4, MemOperand(r4));
- __ mov(r5, Operand(pending_handler_offset_address));
- __ LoadP(r5, MemOperand(r5));
- __ addi(r4, r4, Operand(Code::kHeaderSize - kHeapObjectTag)); // Code start
- if (FLAG_enable_embedded_constant_pool) {
- __ LoadConstantPoolPointerRegisterFromCodeTargetAddress(r4);
- }
- __ add(ip, r4, r5);
+ __ AddP(r3, r3, Operand(Code::kHeaderSize - kHeapObjectTag)); // Code start
+ __ AddP(ip, r3, r4);
__ Jump(ip);
}
-
void JSEntryStub::Generate(MacroAssembler* masm) {
- // r3: code entry
- // r4: function
- // r5: receiver
- // r6: argc
- // [sp+0]: argv
+ // r2: code entry
+ // r3: function
+ // r4: receiver
+ // r5: argc
+ // r6: argv
Label invoke, handler_entry, exit;
-// Called from C
- __ function_descriptor();
-
ProfileEntryHookStub::MaybeCallEntryHook(masm);
- // PPC LINUX ABI:
- // preserve LR in pre-reserved slot in caller's frame
- __ mflr(r0);
- __ StoreP(r0, MemOperand(sp, kStackFrameLRSlot * kPointerSize));
+// saving floating point registers
+#if V8_HOST_ARCH_S390X
+ // 64bit ABI requires f8 to f15 be saved
+ __ lay(sp, MemOperand(sp, -8 * kDoubleSize));
+ __ std(d8, MemOperand(sp));
+ __ std(d9, MemOperand(sp, 1 * kDoubleSize));
+ __ std(d10, MemOperand(sp, 2 * kDoubleSize));
+ __ std(d11, MemOperand(sp, 3 * kDoubleSize));
+ __ std(d12, MemOperand(sp, 4 * kDoubleSize));
+ __ std(d13, MemOperand(sp, 5 * kDoubleSize));
+ __ std(d14, MemOperand(sp, 6 * kDoubleSize));
+ __ std(d15, MemOperand(sp, 7 * kDoubleSize));
+#else
+ // 31bit ABI requires you to store f4 and f6:
+ // http://refspecs.linuxbase.org/ELF/zSeries/lzsabi0_s390.html#AEN417
+ __ lay(sp, MemOperand(sp, -2 * kDoubleSize));
+ __ std(d4, MemOperand(sp));
+ __ std(d6, MemOperand(sp, kDoubleSize));
+#endif
- // Save callee saved registers on the stack.
- __ MultiPush(kCalleeSaved);
+ // zLinux ABI
+ // Incoming parameters:
+ // r2: code entry
+ // r3: function
+ // r4: receiver
+ // r5: argc
+ // r6: argv
+ // Requires us to save the callee-preserved registers r6-r13
+ // General convention is to also save r14 (return addr) and
+ // sp/r15 as well in a single STM/STMG
+ __ lay(sp, MemOperand(sp, -10 * kPointerSize));
+ __ StoreMultipleP(r6, sp, MemOperand(sp, 0));
- // Save callee-saved double registers.
- __ MultiPushDoubles(kCalleeSavedDoubles);
// Set up the reserved register for 0.0.
- __ LoadDoubleLiteral(kDoubleRegZero, 0.0, r0);
+ // __ LoadDoubleLiteral(kDoubleRegZero, 0.0, r0);
// Push a frame with special values setup to mark it as an entry frame.
- // r3: code entry
- // r4: function
- // r5: receiver
- // r6: argc
- // r7: argv
- __ li(r0, Operand(-1)); // Push a bad frame pointer to fail if it is used.
- __ push(r0);
- if (FLAG_enable_embedded_constant_pool) {
- __ li(kConstantPoolRegister, Operand::Zero());
- __ push(kConstantPoolRegister);
- }
+ // Bad FP (-1)
+ // SMI Marker
+ // SMI Marker
+ // kCEntryFPAddress
+ // Frame type
+ __ lay(sp, MemOperand(sp, -5 * kPointerSize));
+ // Push a bad frame pointer to fail if it is used.
+ __ LoadImmP(r10, Operand(-1));
+
int marker = type();
- __ LoadSmiLiteral(r0, Smi::FromInt(marker));
- __ push(r0);
- __ push(r0);
+ __ LoadSmiLiteral(r9, Smi::FromInt(marker));
+ __ LoadSmiLiteral(r8, Smi::FromInt(marker));
// Save copies of the top frame descriptor on the stack.
- __ mov(r8, Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate())));
- __ LoadP(r0, MemOperand(r8));
- __ push(r0);
-
+ __ mov(r7, Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate())));
+ __ LoadP(r7, MemOperand(r7));
+ __ StoreMultipleP(r7, r10, MemOperand(sp, kPointerSize));
// Set up frame pointer for the frame to be pushed.
- __ addi(fp, sp, Operand(-EntryFrameConstants::kCallerFPOffset));
+ // Need to add kPointerSize, because sp has one extra
+ // frame already for the frame type being pushed later.
+ __ lay(fp,
+ MemOperand(sp, -EntryFrameConstants::kCallerFPOffset + kPointerSize));
// If this is the outermost JS call, set js_entry_sp value.
Label non_outermost_js;
ExternalReference js_entry_sp(Isolate::kJSEntrySPAddress, isolate());
- __ mov(r8, Operand(ExternalReference(js_entry_sp)));
- __ LoadP(r9, MemOperand(r8));
- __ cmpi(r9, Operand::Zero());
- __ bne(&non_outermost_js);
- __ StoreP(fp, MemOperand(r8));
+ __ mov(r7, Operand(ExternalReference(js_entry_sp)));
+ __ LoadAndTestP(r8, MemOperand(r7));
+ __ bne(&non_outermost_js, Label::kNear);
+ __ StoreP(fp, MemOperand(r7));
__ LoadSmiLiteral(ip, Smi::FromInt(StackFrame::OUTERMOST_JSENTRY_FRAME));
Label cont;
- __ b(&cont);
+ __ b(&cont, Label::kNear);
__ bind(&non_outermost_js);
__ LoadSmiLiteral(ip, Smi::FromInt(StackFrame::INNER_JSENTRY_FRAME));
+
__ bind(&cont);
- __ push(ip); // frame-type
+ __ StoreP(ip, MemOperand(sp)); // frame-type
// Jump to a faked try block that does the invoke, with a faked catch
// block that sets the pending exception.
- __ b(&invoke);
+ __ b(&invoke, Label::kNear);
__ bind(&handler_entry);
handler_offset_ = handler_entry.pos();
@@ -1279,13 +1254,13 @@ void JSEntryStub::Generate(MacroAssembler* masm) {
__ mov(ip, Operand(ExternalReference(Isolate::kPendingExceptionAddress,
isolate())));
- __ StoreP(r3, MemOperand(ip));
- __ LoadRoot(r3, Heap::kExceptionRootIndex);
- __ b(&exit);
+ __ StoreP(r2, MemOperand(ip));
+ __ LoadRoot(r2, Heap::kExceptionRootIndex);
+ __ b(&exit, Label::kNear);
// Invoke: Link this frame into the handler chain.
__ bind(&invoke);
- // Must preserve r3-r7.
+ // Must preserve r2-r6.
__ PushStackHandler();
// If an exception not caught by another handler occurs, this handler
// returns control to the code after the b(&invoke) above, which
@@ -1293,21 +1268,21 @@ void JSEntryStub::Generate(MacroAssembler* masm) {
// saved values before returning a failure to C.
// Clear any pending exceptions.
- __ mov(r8, Operand(isolate()->factory()->the_hole_value()));
__ mov(ip, Operand(ExternalReference(Isolate::kPendingExceptionAddress,
isolate())));
- __ StoreP(r8, MemOperand(ip));
+ __ mov(r7, Operand(isolate()->factory()->the_hole_value()));
+ __ StoreP(r7, MemOperand(ip));
// Invoke the function by calling through JS entry trampoline builtin.
// Notice that we cannot store a reference to the trampoline code directly in
// this stub, because runtime stubs are not traversed when doing GC.
// Expected registers by Builtins::JSEntryTrampoline
- // r3: code entry
- // r4: function
- // r5: receiver
- // r6: argc
- // r7: argv
+ // r2: code entry
+ // r3: function
+ // r4: receiver
+ // r5: argc
+ // r6: argv
if (type() == StackFrame::ENTRY_CONSTRUCT) {
ExternalReference construct_entry(Builtins::kJSConstructEntryTrampoline,
isolate());
@@ -1320,52 +1295,69 @@ void JSEntryStub::Generate(MacroAssembler* masm) {
// Branch and link to JSEntryTrampoline.
// the address points to the start of the code object, skip the header
- __ addi(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
- __ mtctr(ip);
- __ bctrl(); // make the call
+ __ AddP(ip, Operand(Code::kHeaderSize - kHeapObjectTag));
+ Label return_addr;
+ // __ basr(r14, ip);
+ __ larl(r14, &return_addr);
+ __ b(ip);
+ __ bind(&return_addr);
// Unlink this frame from the handler chain.
__ PopStackHandler();
- __ bind(&exit); // r3 holds result
+ __ bind(&exit); // r2 holds result
// Check if the current stack frame is marked as the outermost JS frame.
Label non_outermost_js_2;
- __ pop(r8);
- __ CmpSmiLiteral(r8, Smi::FromInt(StackFrame::OUTERMOST_JSENTRY_FRAME), r0);
- __ bne(&non_outermost_js_2);
- __ mov(r9, Operand::Zero());
- __ mov(r8, Operand(ExternalReference(js_entry_sp)));
- __ StoreP(r9, MemOperand(r8));
+ __ pop(r7);
+ __ CmpSmiLiteral(r7, Smi::FromInt(StackFrame::OUTERMOST_JSENTRY_FRAME), r0);
+ __ bne(&non_outermost_js_2, Label::kNear);
+ __ mov(r8, Operand::Zero());
+ __ mov(r7, Operand(ExternalReference(js_entry_sp)));
+ __ StoreP(r8, MemOperand(r7));
__ bind(&non_outermost_js_2);
// Restore the top frame descriptors from the stack.
- __ pop(r6);
+ __ pop(r5);
__ mov(ip, Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate())));
- __ StoreP(r6, MemOperand(ip));
+ __ StoreP(r5, MemOperand(ip));
// Reset the stack to the callee saved registers.
- __ addi(sp, sp, Operand(-EntryFrameConstants::kCallerFPOffset));
-
- // Restore callee-saved double registers.
- __ MultiPopDoubles(kCalleeSavedDoubles);
-
- // Restore callee-saved registers.
- __ MultiPop(kCalleeSaved);
+ __ lay(sp, MemOperand(sp, -EntryFrameConstants::kCallerFPOffset));
+
+ // Reload callee-saved preserved regs, return address reg (r14) and sp
+ __ LoadMultipleP(r6, sp, MemOperand(sp, 0));
+ __ la(sp, MemOperand(sp, 10 * kPointerSize));
+
+// saving floating point registers
+#if V8_HOST_ARCH_S390X
+ // 64bit ABI requires f8 to f15 be saved
+ __ ld(d8, MemOperand(sp));
+ __ ld(d9, MemOperand(sp, 1 * kDoubleSize));
+ __ ld(d10, MemOperand(sp, 2 * kDoubleSize));
+ __ ld(d11, MemOperand(sp, 3 * kDoubleSize));
+ __ ld(d12, MemOperand(sp, 4 * kDoubleSize));
+ __ ld(d13, MemOperand(sp, 5 * kDoubleSize));
+ __ ld(d14, MemOperand(sp, 6 * kDoubleSize));
+ __ ld(d15, MemOperand(sp, 7 * kDoubleSize));
+ __ la(sp, MemOperand(sp, 8 * kDoubleSize));
+#else
+ // 31bit ABI requires you to store f4 and f6:
+ // http://refspecs.linuxbase.org/ELF/zSeries/lzsabi0_s390.html#AEN417
+ __ ld(d4, MemOperand(sp));
+ __ ld(d6, MemOperand(sp, kDoubleSize));
+ __ la(sp, MemOperand(sp, 2 * kDoubleSize));
+#endif
- // Return
- __ LoadP(r0, MemOperand(sp, kStackFrameLRSlot * kPointerSize));
- __ mtlr(r0);
- __ blr();
+ __ b(r14);
}
-
void InstanceOfStub::Generate(MacroAssembler* masm) {
- Register const object = r4; // Object (lhs).
- Register const function = r3; // Function (rhs).
- Register const object_map = r5; // Map of {object}.
- Register const function_map = r6; // Map of {function}.
- Register const function_prototype = r7; // Prototype of {function}.
- Register const scratch = r8;
+ Register const object = r3; // Object (lhs).
+ Register const function = r2; // Function (rhs).
+ Register const object_map = r4; // Map of {object}.
+ Register const function_map = r5; // Map of {function}.
+ Register const function_prototype = r6; // Prototype of {function}.
+ Register const scratch = r7;
DCHECK(object.is(InstanceOfDescriptor::LeftRegister()));
DCHECK(function.is(InstanceOfDescriptor::RightRegister()));
@@ -1383,7 +1375,7 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
__ bne(&fast_case);
__ CompareRoot(object_map, Heap::kInstanceofCacheMapRootIndex);
__ bne(&fast_case);
- __ LoadRoot(r3, Heap::kInstanceofCacheAnswerRootIndex);
+ __ LoadRoot(r2, Heap::kInstanceofCacheAnswerRootIndex);
__ Ret();
// If {object} is a smi we can safely return false if {function} is a JS
@@ -1392,7 +1384,7 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
__ JumpIfSmi(function, &slow_case);
__ CompareObjectType(function, function_map, scratch, JS_FUNCTION_TYPE);
__ bne(&slow_case);
- __ LoadRoot(r3, Heap::kFalseValueRootIndex);
+ __ LoadRoot(r2, Heap::kFalseValueRootIndex);
__ Ret();
// Fast-case: The {function} must be a valid JSFunction.
@@ -1402,9 +1394,9 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
__ bne(&slow_case);
// Ensure that {function} has an instance prototype.
- __ lbz(scratch, FieldMemOperand(function_map, Map::kBitFieldOffset));
+ __ LoadlB(scratch, FieldMemOperand(function_map, Map::kBitFieldOffset));
__ TestBit(scratch, Map::kHasNonInstancePrototype, r0);
- __ bne(&slow_case, cr0);
+ __ bne(&slow_case);
// Get the "prototype" (or initial map) of the {function}.
__ LoadP(function_prototype,
@@ -1433,7 +1425,7 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
Register const object_instance_type = function_map;
Register const map_bit_field = function_map;
Register const null = scratch;
- Register const result = r3;
+ Register const result = r2;
Label done, loop, fast_runtime_fallback;
__ LoadRoot(result, Heap::kTrueValueRootIndex);
@@ -1441,17 +1433,17 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
__ bind(&loop);
// Check if the object needs to be access checked.
- __ lbz(map_bit_field, FieldMemOperand(object_map, Map::kBitFieldOffset));
+ __ LoadlB(map_bit_field, FieldMemOperand(object_map, Map::kBitFieldOffset));
__ TestBit(map_bit_field, Map::kIsAccessCheckNeeded, r0);
- __ bne(&fast_runtime_fallback, cr0);
+ __ bne(&fast_runtime_fallback);
// Check if the current object is a Proxy.
__ CompareInstanceType(object_map, object_instance_type, JS_PROXY_TYPE);
__ beq(&fast_runtime_fallback);
__ LoadP(object, FieldMemOperand(object_map, Map::kPrototypeOffset));
- __ cmp(object, function_prototype);
+ __ CmpP(object, function_prototype);
__ beq(&done);
- __ cmp(object, null);
+ __ CmpP(object, null);
__ LoadP(object_map, FieldMemOperand(object, HeapObject::kMapOffset));
__ bne(&loop);
__ LoadRoot(result, Heap::kFalseValueRootIndex);
@@ -1473,31 +1465,29 @@ void InstanceOfStub::Generate(MacroAssembler* masm) {
__ TailCallRuntime(Runtime::kInstanceOf);
}
-
void FunctionPrototypeStub::Generate(MacroAssembler* masm) {
Label miss;
Register receiver = LoadDescriptor::ReceiverRegister();
// Ensure that the vector and slot registers won't be clobbered before
// calling the miss handler.
- DCHECK(!AreAliased(r7, r8, LoadWithVectorDescriptor::VectorRegister(),
+ DCHECK(!AreAliased(r6, r7, LoadWithVectorDescriptor::VectorRegister(),
LoadWithVectorDescriptor::SlotRegister()));
- NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype(masm, receiver, r7,
- r8, &miss);
+ NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype(masm, receiver, r6,
+ r7, &miss);
__ bind(&miss);
PropertyAccessCompiler::TailCallBuiltin(
masm, PropertyAccessCompiler::MissBuiltin(Code::LOAD_IC));
}
-
void LoadIndexedStringStub::Generate(MacroAssembler* masm) {
// Return address is in lr.
Label miss;
Register receiver = LoadDescriptor::ReceiverRegister();
Register index = LoadDescriptor::NameRegister();
- Register scratch = r8;
- Register result = r3;
+ Register scratch = r7;
+ Register result = r2;
DCHECK(!scratch.is(receiver) && !scratch.is(index));
DCHECK(!scratch.is(LoadWithVectorDescriptor::VectorRegister()) &&
result.is(LoadWithVectorDescriptor::SlotRegister()));
@@ -1522,7 +1512,6 @@ void LoadIndexedStringStub::Generate(MacroAssembler* masm) {
masm, PropertyAccessCompiler::MissBuiltin(Code::KEYED_LOAD_IC));
}
-
void LoadIndexedInterceptorStub::Generate(MacroAssembler* masm) {
// Return address is in lr.
Label slow;
@@ -1532,7 +1521,7 @@ void LoadIndexedInterceptorStub::Generate(MacroAssembler* masm) {
// Check that the key is an array index, that is Uint32.
__ TestIfPositiveSmi(key, r0);
- __ bne(&slow, cr0);
+ __ bne(&slow);
// Everything is fine, call runtime.
__ Push(receiver, key); // Receiver, key.
@@ -1545,14 +1534,13 @@ void LoadIndexedInterceptorStub::Generate(MacroAssembler* masm) {
masm, PropertyAccessCompiler::MissBuiltin(Code::KEYED_LOAD_IC));
}
-
void RegExpExecStub::Generate(MacroAssembler* masm) {
// Just jump directly to runtime if native RegExp is not selected at compile
// time or if regexp entry in generated code is turned off runtime switch or
// at compilation.
#ifdef V8_INTERPRETED_REGEXP
__ TailCallRuntime(Runtime::kRegExpExec);
-#else // V8_INTERPRETED_REGEXP
+#else // V8_INTERPRETED_REGEXP
// Stack frame on entry.
// sp[0]: last_match_info (expected JSArray)
@@ -1572,10 +1560,12 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// this code is called using the normal C calling convention. When calling
// directly from generated code the native RegExp code will not do a GC and
// therefore the content of these registers are safe to use after the call.
- Register subject = r14;
- Register regexp_data = r15;
- Register last_match_info_elements = r16;
- Register code = r17;
+ Register subject = r6;
+ Register regexp_data = r7;
+ Register last_match_info_elements = r8;
+ Register code = r9;
+
+ __ CleanseP(r14);
// Ensure register assigments are consistent with callee save masks
DCHECK(subject.bit() & kCalleeSaved);
@@ -1588,56 +1578,55 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
ExternalReference::address_of_regexp_stack_memory_address(isolate());
ExternalReference address_of_regexp_stack_memory_size =
ExternalReference::address_of_regexp_stack_memory_size(isolate());
- __ mov(r3, Operand(address_of_regexp_stack_memory_size));
- __ LoadP(r3, MemOperand(r3, 0));
- __ cmpi(r3, Operand::Zero());
+ __ mov(r2, Operand(address_of_regexp_stack_memory_size));
+ __ LoadAndTestP(r2, MemOperand(r2));
__ beq(&runtime);
// Check that the first argument is a JSRegExp object.
- __ LoadP(r3, MemOperand(sp, kJSRegExpOffset));
- __ JumpIfSmi(r3, &runtime);
- __ CompareObjectType(r3, r4, r4, JS_REGEXP_TYPE);
+ __ LoadP(r2, MemOperand(sp, kJSRegExpOffset));
+ __ JumpIfSmi(r2, &runtime);
+ __ CompareObjectType(r2, r3, r3, JS_REGEXP_TYPE);
__ bne(&runtime);
// Check that the RegExp has been compiled (data contains a fixed array).
- __ LoadP(regexp_data, FieldMemOperand(r3, JSRegExp::kDataOffset));
+ __ LoadP(regexp_data, FieldMemOperand(r2, JSRegExp::kDataOffset));
if (FLAG_debug_code) {
- __ TestIfSmi(regexp_data, r0);
+ __ TestIfSmi(regexp_data);
__ Check(ne, kUnexpectedTypeForRegExpDataFixedArrayExpected, cr0);
- __ CompareObjectType(regexp_data, r3, r3, FIXED_ARRAY_TYPE);
+ __ CompareObjectType(regexp_data, r2, r2, FIXED_ARRAY_TYPE);
__ Check(eq, kUnexpectedTypeForRegExpDataFixedArrayExpected);
}
// regexp_data: RegExp data (FixedArray)
// Check the type of the RegExp. Only continue if type is JSRegExp::IRREGEXP.
- __ LoadP(r3, FieldMemOperand(regexp_data, JSRegExp::kDataTagOffset));
+ __ LoadP(r2, FieldMemOperand(regexp_data, JSRegExp::kDataTagOffset));
// DCHECK(Smi::FromInt(JSRegExp::IRREGEXP) < (char *)0xffffu);
- __ CmpSmiLiteral(r3, Smi::FromInt(JSRegExp::IRREGEXP), r0);
+ __ CmpSmiLiteral(r2, Smi::FromInt(JSRegExp::IRREGEXP), r0);
__ bne(&runtime);
// regexp_data: RegExp data (FixedArray)
// Check that the number of captures fit in the static offsets vector buffer.
- __ LoadP(r5,
+ __ LoadP(r4,
FieldMemOperand(regexp_data, JSRegExp::kIrregexpCaptureCountOffset));
// Check (number_of_captures + 1) * 2 <= offsets vector size
// Or number_of_captures * 2 <= offsets vector size - 2
// SmiToShortArrayOffset accomplishes the multiplication by 2 and
// SmiUntag (which is a nop for 32-bit).
- __ SmiToShortArrayOffset(r5, r5);
+ __ SmiToShortArrayOffset(r4, r4);
STATIC_ASSERT(Isolate::kJSRegexpStaticOffsetsVectorSize >= 2);
- __ cmpli(r5, Operand(Isolate::kJSRegexpStaticOffsetsVectorSize - 2));
+ __ CmpLogicalP(r4, Operand(Isolate::kJSRegexpStaticOffsetsVectorSize - 2));
__ bgt(&runtime);
// Reset offset for possibly sliced string.
- __ li(r11, Operand::Zero());
+ __ LoadImmP(ip, Operand::Zero());
__ LoadP(subject, MemOperand(sp, kSubjectOffset));
__ JumpIfSmi(subject, &runtime);
- __ mr(r6, subject); // Make a copy of the original subject string.
- __ LoadP(r3, FieldMemOperand(subject, HeapObject::kMapOffset));
- __ lbz(r3, FieldMemOperand(r3, Map::kInstanceTypeOffset));
+ __ LoadRR(r5, subject); // Make a copy of the original subject string.
+ __ LoadP(r2, FieldMemOperand(subject, HeapObject::kMapOffset));
+ __ LoadlB(r2, FieldMemOperand(r2, Map::kInstanceTypeOffset));
// subject: subject string
- // r6: subject string
- // r3: subject string instance type
+ // r5: subject string
+ // r2: subject string instance type
// regexp_data: RegExp data (FixedArray)
// Handle subject string according to its encoding and representation:
// (1) Sequential string? If yes, go to (5).
@@ -1662,10 +1651,11 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// (1) Sequential string? If yes, go to (5).
STATIC_ASSERT((kIsNotStringMask | kStringRepresentationMask |
kShortExternalStringMask) == 0x93);
- __ andi(r4, r3, Operand(kIsNotStringMask | kStringRepresentationMask |
- kShortExternalStringMask));
+ __ mov(r3, Operand(kIsNotStringMask | kStringRepresentationMask |
+ kShortExternalStringMask));
+ __ AndP(r3, r2);
STATIC_ASSERT((kStringTag | kSeqStringTag) == 0);
- __ beq(&seq_string, cr0); // Go to (5).
+ __ beq(&seq_string); // Go to (5).
// (2) Anything but sequential or cons? If yes, go to (6).
STATIC_ASSERT(kConsStringTag < kExternalStringTag);
@@ -1673,50 +1663,50 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
STATIC_ASSERT(kIsNotStringMask > kExternalStringTag);
STATIC_ASSERT(kShortExternalStringTag > kExternalStringTag);
STATIC_ASSERT(kExternalStringTag < 0xffffu);
- __ cmpi(r4, Operand(kExternalStringTag));
+ __ CmpP(r3, Operand(kExternalStringTag));
__ bge(&not_seq_nor_cons); // Go to (6).
// (3) Cons string. Check that it's flat.
// Replace subject with first string and reload instance type.
- __ LoadP(r3, FieldMemOperand(subject, ConsString::kSecondOffset));
- __ CompareRoot(r3, Heap::kempty_stringRootIndex);
+ __ LoadP(r2, FieldMemOperand(subject, ConsString::kSecondOffset));
+ __ CompareRoot(r2, Heap::kempty_stringRootIndex);
__ bne(&runtime);
__ LoadP(subject, FieldMemOperand(subject, ConsString::kFirstOffset));
// (4) Is subject external? If yes, go to (7).
__ bind(&check_underlying);
- __ LoadP(r3, FieldMemOperand(subject, HeapObject::kMapOffset));
- __ lbz(r3, FieldMemOperand(r3, Map::kInstanceTypeOffset));
+ __ LoadP(r2, FieldMemOperand(subject, HeapObject::kMapOffset));
+ __ LoadlB(r2, FieldMemOperand(r2, Map::kInstanceTypeOffset));
STATIC_ASSERT(kSeqStringTag == 0);
STATIC_ASSERT(kStringRepresentationMask == 3);
- __ andi(r0, r3, Operand(kStringRepresentationMask));
+ __ tmll(r2, Operand(kStringRepresentationMask));
// The underlying external string is never a short external string.
STATIC_ASSERT(ExternalString::kMaxShortLength < ConsString::kMinLength);
STATIC_ASSERT(ExternalString::kMaxShortLength < SlicedString::kMinLength);
- __ bne(&external_string, cr0); // Go to (7).
+ __ bne(&external_string); // Go to (7).
// (5) Sequential string. Load regexp code according to encoding.
__ bind(&seq_string);
// subject: sequential subject string (or look-alike, external string)
- // r6: original subject string
- // Load previous index and check range before r6 is overwritten. We have to
- // use r6 instead of subject here because subject might have been only made
+ // r5: original subject string
+ // Load previous index and check range before r5 is overwritten. We have to
+ // use r5 instead of subject here because subject might have been only made
// to look like a sequential string when it actually is an external string.
- __ LoadP(r4, MemOperand(sp, kPreviousIndexOffset));
- __ JumpIfNotSmi(r4, &runtime);
- __ LoadP(r6, FieldMemOperand(r6, String::kLengthOffset));
- __ cmpl(r6, r4);
+ __ LoadP(r3, MemOperand(sp, kPreviousIndexOffset));
+ __ JumpIfNotSmi(r3, &runtime);
+ __ LoadP(r5, FieldMemOperand(r5, String::kLengthOffset));
+ __ CmpLogicalP(r5, r3);
__ ble(&runtime);
- __ SmiUntag(r4);
+ __ SmiUntag(r3);
STATIC_ASSERT(4 == kOneByteStringTag);
STATIC_ASSERT(kTwoByteStringTag == 0);
STATIC_ASSERT(kStringEncodingMask == 4);
- __ ExtractBitMask(r6, r3, kStringEncodingMask, SetRC);
- __ beq(&encoding_type_UC16, cr0);
+ __ ExtractBitMask(r5, r2, kStringEncodingMask, SetRC);
+ __ beq(&encoding_type_UC16, Label::kNear);
__ LoadP(code,
FieldMemOperand(regexp_data, JSRegExp::kDataOneByteCodeOffset));
- __ b(&br_over);
+ __ b(&br_over, Label::kNear);
__ bind(&encoding_type_UC16);
__ LoadP(code, FieldMemOperand(regexp_data, JSRegExp::kDataUC16CodeOffset));
__ bind(&br_over);
@@ -1728,111 +1718,123 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// a smi (code flushing support).
__ JumpIfSmi(code, &runtime);
- // r4: previous index
- // r6: encoding of subject string (1 if one_byte, 0 if two_byte);
+ // r3: previous index
+ // r5: encoding of subject string (1 if one_byte, 0 if two_byte);
// code: Address of generated regexp code
// subject: Subject string
// regexp_data: RegExp data (FixedArray)
// All checks done. Now push arguments for native regexp code.
- __ IncrementCounter(isolate()->counters()->regexp_entry_native(), 1, r3, r5);
+ __ IncrementCounter(isolate()->counters()->regexp_entry_native(), 1, r2, r4);
// Isolates: note we add an additional parameter here (isolate pointer).
const int kRegExpExecuteArguments = 10;
- const int kParameterRegisters = 8;
+ const int kParameterRegisters = 5;
__ EnterExitFrame(false, kRegExpExecuteArguments - kParameterRegisters);
// Stack pointer now points to cell where return address is to be written.
// Arguments are before that on the stack or in registers.
// Argument 10 (in stack parameter area): Pass current isolate address.
- __ mov(r3, Operand(ExternalReference::isolate_address(isolate())));
- __ StoreP(r3, MemOperand(sp, (kStackFrameExtraParamSlot + 1) * kPointerSize));
+ __ mov(r2, Operand(ExternalReference::isolate_address(isolate())));
+ __ StoreP(r2, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize +
+ 4 * kPointerSize));
// Argument 9 is a dummy that reserves the space used for
// the return address added by the ExitFrame in native calls.
-
- // Argument 8 (r10): Indicate that this is a direct call from JavaScript.
- __ li(r10, Operand(1));
-
- // Argument 7 (r9): Start (high end) of backtracking stack memory area.
- __ mov(r3, Operand(address_of_regexp_stack_memory_address));
- __ LoadP(r3, MemOperand(r3, 0));
- __ mov(r5, Operand(address_of_regexp_stack_memory_size));
- __ LoadP(r5, MemOperand(r5, 0));
- __ add(r9, r3, r5);
-
- // Argument 6 (r8): Set the number of capture registers to zero to force
+ __ mov(r2, Operand::Zero());
+ __ StoreP(r2, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize +
+ 3 * kPointerSize));
+
+ // Argument 8: Indicate that this is a direct call from JavaScript.
+ __ mov(r2, Operand(1));
+ __ StoreP(r2, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize +
+ 2 * kPointerSize));
+
+ // Argument 7: Start (high end) of backtracking stack memory area.
+ __ mov(r2, Operand(address_of_regexp_stack_memory_address));
+ __ LoadP(r2, MemOperand(r2, 0));
+ __ mov(r1, Operand(address_of_regexp_stack_memory_size));
+ __ LoadP(r1, MemOperand(r1, 0));
+ __ AddP(r2, r1);
+ __ StoreP(r2, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize +
+ 1 * kPointerSize));
+
+ // Argument 6: Set the number of capture registers to zero to force
// global egexps to behave as non-global. This does not affect non-global
// regexps.
- __ li(r8, Operand::Zero());
+ __ mov(r2, Operand::Zero());
+ __ StoreP(r2, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize +
+ 0 * kPointerSize));
+
+ // Argument 1 (r2): Subject string.
+ // Load the length from the original subject string from the previous stack
+ // frame. Therefore we have to use fp, which points exactly to 15 pointer
+ // sizes below the previous sp. (Because creating a new stack frame pushes
+ // the previous fp onto the stack and moves up sp by 2 * kPointerSize and
+ // 13 registers saved on the stack previously)
+ __ LoadP(r2, MemOperand(fp, kSubjectOffset + 2 * kPointerSize));
+
+ // Argument 2 (r3): Previous index.
+ // Already there
+ __ AddP(r1, subject, Operand(SeqString::kHeaderSize - kHeapObjectTag));
- // Argument 5 (r7): static offsets vector buffer.
+ // Argument 5 (r6): static offsets vector buffer.
__ mov(
- r7,
+ r6,
Operand(ExternalReference::address_of_static_offsets_vector(isolate())));
- // For arguments 4 (r6) and 3 (r5) get string length, calculate start of data
- // and calculate the shift of the index (0 for one-byte and 1 for two-byte).
- __ addi(r18, subject, Operand(SeqString::kHeaderSize - kHeapObjectTag));
- __ xori(r6, r6, Operand(1));
- // Load the length from the original subject string from the previous stack
- // frame. Therefore we have to use fp, which points exactly to two pointer
- // sizes below the previous sp. (Because creating a new stack frame pushes
- // the previous fp onto the stack and moves up sp by 2 * kPointerSize.)
- __ LoadP(subject, MemOperand(fp, kSubjectOffset + 2 * kPointerSize));
+ // For arguments 4 (r5) and 3 (r4) get string length, calculate start of data
+ // and calculate the shift of the index (0 for one-byte and 1 for two byte).
+ __ XorP(r5, Operand(1));
// If slice offset is not 0, load the length from the original sliced string.
- // Argument 4, r6: End of string data
- // Argument 3, r5: Start of string data
+ // Argument 3, r4: Start of string data
// Prepare start and end index of the input.
- __ ShiftLeft_(r11, r11, r6);
- __ add(r11, r18, r11);
- __ ShiftLeft_(r5, r4, r6);
- __ add(r5, r11, r5);
-
- __ LoadP(r18, FieldMemOperand(subject, String::kLengthOffset));
- __ SmiUntag(r18);
- __ ShiftLeft_(r6, r18, r6);
- __ add(r6, r11, r6);
+ __ ShiftLeftP(ip, ip, r5);
+ __ AddP(ip, r1, ip);
+ __ ShiftLeftP(r4, r3, r5);
+ __ AddP(r4, ip, r4);
- // Argument 2 (r4): Previous index.
- // Already there
-
- // Argument 1 (r3): Subject string.
- __ mr(r3, subject);
+ // Argument 4, r5: End of string data
+ __ LoadP(r1, FieldMemOperand(r2, String::kLengthOffset));
+ __ SmiUntag(r1);
+ __ ShiftLeftP(r0, r1, r5);
+ __ AddP(r5, ip, r0);
// Locate the code entry and call it.
- __ addi(code, code, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ AddP(code, Operand(Code::kHeaderSize - kHeapObjectTag));
DirectCEntryStub stub(isolate());
stub.GenerateCall(masm, code);
__ LeaveExitFrame(false, no_reg, true);
- // r3: result (int32)
- // subject: subject string (callee saved)
+ // r2: result (int32)
+ // subject: subject string -- needed to reload
+ __ LoadP(subject, MemOperand(sp, kSubjectOffset));
+
// regexp_data: RegExp data (callee saved)
// last_match_info_elements: Last match info elements (callee saved)
// Check the result.
Label success;
- __ cmpwi(r3, Operand(1));
+ __ Cmp32(r2, Operand(1));
// We expect exactly one result since we force the called regexp to behave
// as non-global.
__ beq(&success);
Label failure;
- __ cmpwi(r3, Operand(NativeRegExpMacroAssembler::FAILURE));
+ __ Cmp32(r2, Operand(NativeRegExpMacroAssembler::FAILURE));
__ beq(&failure);
- __ cmpwi(r3, Operand(NativeRegExpMacroAssembler::EXCEPTION));
+ __ Cmp32(r2, Operand(NativeRegExpMacroAssembler::EXCEPTION));
// If not exception it can only be retry. Handle that in the runtime system.
__ bne(&runtime);
// Result must now be exception. If there is no pending exception already a
// stack overflow (on the backtrack stack) was detected in RegExp code but
// haven't created the exception yet. Handle that in the runtime system.
// TODO(592): Rerunning the RegExp to get the stack overflow exception.
- __ mov(r4, Operand(isolate()->factory()->the_hole_value()));
- __ mov(r5, Operand(ExternalReference(Isolate::kPendingExceptionAddress,
+ __ mov(r3, Operand(isolate()->factory()->the_hole_value()));
+ __ mov(r4, Operand(ExternalReference(Isolate::kPendingExceptionAddress,
isolate())));
- __ LoadP(r3, MemOperand(r5, 0));
- __ cmp(r3, r4);
+ __ LoadP(r2, MemOperand(r4, 0));
+ __ CmpP(r2, r3);
__ beq(&runtime);
// For exception, throw the exception again.
@@ -1840,87 +1842,85 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
__ bind(&failure);
// For failure and exception return null.
- __ mov(r3, Operand(isolate()->factory()->null_value()));
- __ addi(sp, sp, Operand(4 * kPointerSize));
+ __ mov(r2, Operand(isolate()->factory()->null_value()));
+ __ la(sp, MemOperand(sp, (4 * kPointerSize)));
__ Ret();
// Process the result from the native regexp code.
__ bind(&success);
- __ LoadP(r4,
+ __ LoadP(r3,
FieldMemOperand(regexp_data, JSRegExp::kIrregexpCaptureCountOffset));
// Calculate number of capture registers (number_of_captures + 1) * 2.
// SmiToShortArrayOffset accomplishes the multiplication by 2 and
// SmiUntag (which is a nop for 32-bit).
- __ SmiToShortArrayOffset(r4, r4);
- __ addi(r4, r4, Operand(2));
+ __ SmiToShortArrayOffset(r3, r3);
+ __ AddP(r3, Operand(2));
- __ LoadP(r3, MemOperand(sp, kLastMatchInfoOffset));
- __ JumpIfSmi(r3, &runtime);
- __ CompareObjectType(r3, r5, r5, JS_ARRAY_TYPE);
+ __ LoadP(r2, MemOperand(sp, kLastMatchInfoOffset));
+ __ JumpIfSmi(r2, &runtime);
+ __ CompareObjectType(r2, r4, r4, JS_ARRAY_TYPE);
__ bne(&runtime);
// Check that the JSArray is in fast case.
__ LoadP(last_match_info_elements,
- FieldMemOperand(r3, JSArray::kElementsOffset));
- __ LoadP(r3,
+ FieldMemOperand(r2, JSArray::kElementsOffset));
+ __ LoadP(r2,
FieldMemOperand(last_match_info_elements, HeapObject::kMapOffset));
- __ CompareRoot(r3, Heap::kFixedArrayMapRootIndex);
+ __ CompareRoot(r2, Heap::kFixedArrayMapRootIndex);
__ bne(&runtime);
// Check that the last match info has space for the capture registers and the
// additional information.
__ LoadP(
- r3, FieldMemOperand(last_match_info_elements, FixedArray::kLengthOffset));
- __ addi(r5, r4, Operand(RegExpImpl::kLastMatchOverhead));
- __ SmiUntag(r0, r3);
- __ cmp(r5, r0);
+ r2, FieldMemOperand(last_match_info_elements, FixedArray::kLengthOffset));
+ __ AddP(r4, r3, Operand(RegExpImpl::kLastMatchOverhead));
+ __ SmiUntag(r0, r2);
+ __ CmpP(r4, r0);
__ bgt(&runtime);
- // r4: number of capture registers
+ // r3: number of capture registers
// subject: subject string
// Store the capture count.
- __ SmiTag(r5, r4);
- __ StoreP(r5, FieldMemOperand(last_match_info_elements,
- RegExpImpl::kLastCaptureCountOffset),
- r0);
+ __ SmiTag(r4, r3);
+ __ StoreP(r4, FieldMemOperand(last_match_info_elements,
+ RegExpImpl::kLastCaptureCountOffset));
// Store last subject and last input.
__ StoreP(subject, FieldMemOperand(last_match_info_elements,
- RegExpImpl::kLastSubjectOffset),
- r0);
- __ mr(r5, subject);
+ RegExpImpl::kLastSubjectOffset));
+ __ LoadRR(r4, subject);
__ RecordWriteField(last_match_info_elements, RegExpImpl::kLastSubjectOffset,
- subject, r10, kLRHasNotBeenSaved, kDontSaveFPRegs);
- __ mr(subject, r5);
+ subject, r9, kLRHasNotBeenSaved, kDontSaveFPRegs);
+ __ LoadRR(subject, r4);
__ StoreP(subject, FieldMemOperand(last_match_info_elements,
- RegExpImpl::kLastInputOffset),
- r0);
+ RegExpImpl::kLastInputOffset));
__ RecordWriteField(last_match_info_elements, RegExpImpl::kLastInputOffset,
- subject, r10, kLRHasNotBeenSaved, kDontSaveFPRegs);
+ subject, r9, kLRHasNotBeenSaved, kDontSaveFPRegs);
// Get the static offsets vector filled by the native regexp code.
ExternalReference address_of_static_offsets_vector =
ExternalReference::address_of_static_offsets_vector(isolate());
- __ mov(r5, Operand(address_of_static_offsets_vector));
+ __ mov(r4, Operand(address_of_static_offsets_vector));
- // r4: number of capture registers
- // r5: offsets vector
+ // r3: number of capture registers
+ // r4: offsets vector
Label next_capture;
// Capture register counter starts from number of capture registers and
// counts down until wraping after zero.
- __ addi(
- r3, last_match_info_elements,
+ __ AddP(
+ r2, last_match_info_elements,
Operand(RegExpImpl::kFirstCaptureOffset - kHeapObjectTag - kPointerSize));
- __ addi(r5, r5, Operand(-kIntSize)); // bias down for lwzu
- __ mtctr(r4);
+ __ AddP(r4, Operand(-kIntSize)); // bias down for lwzu
__ bind(&next_capture);
// Read the value from the static offsets vector buffer.
- __ lwzu(r6, MemOperand(r5, kIntSize));
+ __ ly(r5, MemOperand(r4, kIntSize));
+ __ lay(r4, MemOperand(r4, kIntSize));
// Store the smi value in the last match info.
- __ SmiTag(r6);
- __ StorePU(r6, MemOperand(r3, kPointerSize));
- __ bdnz(&next_capture);
+ __ SmiTag(r5);
+ __ StoreP(r5, MemOperand(r2, kPointerSize));
+ __ lay(r2, MemOperand(r2, kPointerSize));
+ __ BranchOnCount(r3, &next_capture);
// Return last match info.
- __ LoadP(r3, MemOperand(sp, kLastMatchInfoOffset));
- __ addi(sp, sp, Operand(4 * kPointerSize));
+ __ LoadP(r2, MemOperand(sp, kLastMatchInfoOffset));
+ __ la(sp, MemOperand(sp, (4 * kPointerSize)));
__ Ret();
// Do the runtime call to execute the regexp.
@@ -1935,65 +1935,64 @@ void RegExpExecStub::Generate(MacroAssembler* masm) {
// (7) External string. Make it, offset-wise, look like a sequential string.
__ bind(&external_string);
- __ LoadP(r3, FieldMemOperand(subject, HeapObject::kMapOffset));
- __ lbz(r3, FieldMemOperand(r3, Map::kInstanceTypeOffset));
+ __ LoadP(r2, FieldMemOperand(subject, HeapObject::kMapOffset));
+ __ LoadlB(r2, FieldMemOperand(r2, Map::kInstanceTypeOffset));
if (FLAG_debug_code) {
// Assert that we do not have a cons or slice (indirect strings) here.
// Sequential strings have already been ruled out.
STATIC_ASSERT(kIsIndirectStringMask == 1);
- __ andi(r0, r3, Operand(kIsIndirectStringMask));
+ __ tmll(r2, Operand(kIsIndirectStringMask));
__ Assert(eq, kExternalStringExpectedButNotFound, cr0);
}
__ LoadP(subject,
FieldMemOperand(subject, ExternalString::kResourceDataOffset));
// Move the pointer so that offset-wise, it looks like a sequential string.
STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
- __ subi(subject, subject,
+ __ SubP(subject, subject,
Operand(SeqTwoByteString::kHeaderSize - kHeapObjectTag));
__ b(&seq_string); // Go to (5).
// (8) Short external string or not a string? If yes, bail out to runtime.
__ bind(&not_long_external);
STATIC_ASSERT(kNotStringTag != 0 && kShortExternalStringTag != 0);
- __ andi(r0, r4, Operand(kIsNotStringMask | kShortExternalStringMask));
- __ bne(&runtime, cr0);
+ __ mov(r0, Operand(kIsNotStringMask | kShortExternalStringMask));
+ __ AndP(r0, r3);
+ __ bne(&runtime);
// (9) Sliced string. Replace subject with parent. Go to (4).
- // Load offset into r11 and replace subject string with parent.
- __ LoadP(r11, FieldMemOperand(subject, SlicedString::kOffsetOffset));
- __ SmiUntag(r11);
+ // Load offset into ip and replace subject string with parent.
+ __ LoadP(ip, FieldMemOperand(subject, SlicedString::kOffsetOffset));
+ __ SmiUntag(ip);
__ LoadP(subject, FieldMemOperand(subject, SlicedString::kParentOffset));
__ b(&check_underlying); // Go to (4).
#endif // V8_INTERPRETED_REGEXP
}
-
static void CallStubInRecordCallTarget(MacroAssembler* masm, CodeStub* stub) {
- // r3 : number of arguments to the construct function
- // r4 : the function to call
- // r5 : feedback vector
- // r6 : slot in feedback vector (Smi)
- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
+ // r2 : number of arguments to the construct function
+ // r3 : the function to call
+ // r4 : feedback vector
+ // r5 : slot in feedback vector (Smi)
+ FrameScope scope(masm, StackFrame::INTERNAL);
// Number-of-arguments register must be smi-tagged to call out.
- __ SmiTag(r3);
- __ Push(r6, r5, r4, r3);
+ __ SmiTag(r2);
+ __ Push(r5, r4, r3, r2);
__ CallStub(stub);
- __ Pop(r6, r5, r4, r3);
- __ SmiUntag(r3);
+ __ Pop(r5, r4, r3, r2);
+ __ SmiUntag(r2);
}
-
static void GenerateRecordCallTarget(MacroAssembler* masm) {
// Cache the called function in a feedback vector slot. Cache states
// are uninitialized, monomorphic (indicated by a JSFunction), and
// megamorphic.
- // r3 : number of arguments to the construct function
- // r4 : the function to call
- // r5 : feedback vector
- // r6 : slot in feedback vector (Smi)
+ // r2 : number of arguments to the construct function
+ // r3 : the function to call
+ // r4 : feedback vector
+ // r5 : slot in feedback vector (Smi)
Label initialize, done, miss, megamorphic, not_array_function;
DCHECK_EQ(*TypeFeedbackVector::MegamorphicSentinel(masm->isolate()),
@@ -2001,24 +2000,24 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
DCHECK_EQ(*TypeFeedbackVector::UninitializedSentinel(masm->isolate()),
masm->isolate()->heap()->uninitialized_symbol());
- // Load the cache state into r8.
- __ SmiToPtrArrayOffset(r8, r6);
- __ add(r8, r5, r8);
- __ LoadP(r8, FieldMemOperand(r8, FixedArray::kHeaderSize));
+ // Load the cache state into r7.
+ __ SmiToPtrArrayOffset(r7, r5);
+ __ AddP(r7, r4, r7);
+ __ LoadP(r7, FieldMemOperand(r7, FixedArray::kHeaderSize));
// A monomorphic cache hit or an already megamorphic state: invoke the
// function without changing the state.
- // We don't know if r8 is a WeakCell or a Symbol, but it's harmless to read at
+ // We don't know if r7 is a WeakCell or a Symbol, but it's harmless to read at
// this position in a symbol (see static asserts in type-feedback-vector.h).
Label check_allocation_site;
- Register feedback_map = r9;
- Register weak_value = r10;
- __ LoadP(weak_value, FieldMemOperand(r8, WeakCell::kValueOffset));
- __ cmp(r4, weak_value);
+ Register feedback_map = r8;
+ Register weak_value = r9;
+ __ LoadP(weak_value, FieldMemOperand(r7, WeakCell::kValueOffset));
+ __ CmpP(r3, weak_value);
__ beq(&done);
- __ CompareRoot(r8, Heap::kmegamorphic_symbolRootIndex);
+ __ CompareRoot(r7, Heap::kmegamorphic_symbolRootIndex);
__ beq(&done);
- __ LoadP(feedback_map, FieldMemOperand(r8, HeapObject::kMapOffset));
+ __ LoadP(feedback_map, FieldMemOperand(r7, HeapObject::kMapOffset));
__ CompareRoot(feedback_map, Heap::kWeakCellMapRootIndex);
__ bne(&check_allocation_site);
@@ -2035,8 +2034,8 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
__ bne(&miss);
// Make sure the function is the Array() function
- __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r8);
- __ cmp(r4, r8);
+ __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r7);
+ __ CmpP(r3, r7);
__ bne(&megamorphic);
__ b(&done);
@@ -2044,23 +2043,23 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
// A monomorphic miss (i.e, here the cache is not uninitialized) goes
// megamorphic.
- __ CompareRoot(r8, Heap::kuninitialized_symbolRootIndex);
+ __ CompareRoot(r7, Heap::kuninitialized_symbolRootIndex);
__ beq(&initialize);
// MegamorphicSentinel is an immortal immovable object (undefined) so no
// write-barrier is needed.
__ bind(&megamorphic);
- __ SmiToPtrArrayOffset(r8, r6);
- __ add(r8, r5, r8);
+ __ SmiToPtrArrayOffset(r7, r5);
+ __ AddP(r7, r4, r7);
__ LoadRoot(ip, Heap::kmegamorphic_symbolRootIndex);
- __ StoreP(ip, FieldMemOperand(r8, FixedArray::kHeaderSize), r0);
+ __ StoreP(ip, FieldMemOperand(r7, FixedArray::kHeaderSize), r0);
__ jmp(&done);
// An uninitialized cache is patched with the function
__ bind(&initialize);
// Make sure the function is the Array() function.
- __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r8);
- __ cmp(r4, r8);
+ __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r7);
+ __ CmpP(r3, r7);
__ bne(&not_array_function);
// The target function is the Array constructor,
@@ -2077,94 +2076,86 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
__ bind(&done);
}
-
void CallConstructStub::Generate(MacroAssembler* masm) {
- // r3 : number of arguments
- // r4 : the function to call
- // r5 : feedback vector
- // r6 : slot in feedback vector (Smi, for RecordCallTarget)
+ // r2 : number of arguments
+ // r3 : the function to call
+ // r4 : feedback vector
+ // r5 : slot in feedback vector (Smi, for RecordCallTarget)
Label non_function;
// Check that the function is not a smi.
- __ JumpIfSmi(r4, &non_function);
+ __ JumpIfSmi(r3, &non_function);
// Check that the function is a JSFunction.
- __ CompareObjectType(r4, r8, r8, JS_FUNCTION_TYPE);
+ __ CompareObjectType(r3, r7, r7, JS_FUNCTION_TYPE);
__ bne(&non_function);
GenerateRecordCallTarget(masm);
- __ SmiToPtrArrayOffset(r8, r6);
- __ add(r8, r5, r8);
- // Put the AllocationSite from the feedback vector into r5, or undefined.
- __ LoadP(r5, FieldMemOperand(r8, FixedArray::kHeaderSize));
- __ LoadP(r8, FieldMemOperand(r5, AllocationSite::kMapOffset));
- __ CompareRoot(r8, Heap::kAllocationSiteMapRootIndex);
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ LoadRoot(r8, Heap::kUndefinedValueRootIndex);
- __ isel(eq, r5, r5, r8);
- } else {
- Label feedback_register_initialized;
- __ beq(&feedback_register_initialized);
- __ LoadRoot(r5, Heap::kUndefinedValueRootIndex);
- __ bind(&feedback_register_initialized);
- }
+ __ SmiToPtrArrayOffset(r7, r5);
+ __ AddP(r7, r4, r7);
+ // Put the AllocationSite from the feedback vector into r4, or undefined.
+ __ LoadP(r4, FieldMemOperand(r7, FixedArray::kHeaderSize));
+ __ LoadP(r7, FieldMemOperand(r4, AllocationSite::kMapOffset));
+ __ CompareRoot(r7, Heap::kAllocationSiteMapRootIndex);
+ Label feedback_register_initialized;
+ __ beq(&feedback_register_initialized);
+ __ LoadRoot(r4, Heap::kUndefinedValueRootIndex);
+ __ bind(&feedback_register_initialized);
- __ AssertUndefinedOrAllocationSite(r5, r8);
+ __ AssertUndefinedOrAllocationSite(r4, r7);
// Pass function as new target.
- __ mr(r6, r4);
+ __ LoadRR(r5, r3);
// Tail call to the function-specific construct stub (still in the caller
// context at this point).
- __ LoadP(r7, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
- __ LoadP(r7, FieldMemOperand(r7, SharedFunctionInfo::kConstructStubOffset));
- __ addi(ip, r7, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ LoadP(r6, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
+ __ LoadP(r6, FieldMemOperand(r6, SharedFunctionInfo::kConstructStubOffset));
+ __ AddP(ip, r6, Operand(Code::kHeaderSize - kHeapObjectTag));
__ JumpToJSEntry(ip);
__ bind(&non_function);
- __ mr(r6, r4);
+ __ LoadRR(r5, r3);
__ Jump(isolate()->builtins()->Construct(), RelocInfo::CODE_TARGET);
}
-
void CallICStub::HandleArrayCase(MacroAssembler* masm, Label* miss) {
- // r4 - function
- // r6 - slot id
- // r5 - vector
- // r7 - allocation site (loaded from vector[slot])
- __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r8);
- __ cmp(r4, r8);
+ // r3 - function
+ // r5 - slot id
+ // r4 - vector
+ // r6 - allocation site (loaded from vector[slot])
+ __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r7);
+ __ CmpP(r3, r7);
__ bne(miss);
- __ mov(r3, Operand(arg_count()));
+ __ mov(r2, Operand(arg_count()));
// Increment the call count for monomorphic function calls.
const int count_offset = FixedArray::kHeaderSize + kPointerSize;
- __ SmiToPtrArrayOffset(r8, r6);
- __ add(r5, r5, r8);
- __ LoadP(r6, FieldMemOperand(r5, count_offset));
- __ AddSmiLiteral(r6, r6, Smi::FromInt(CallICNexus::kCallCountIncrement), r0);
- __ StoreP(r6, FieldMemOperand(r5, count_offset), r0);
-
- __ mr(r5, r7);
- __ mr(r6, r4);
+ __ SmiToPtrArrayOffset(r7, r5);
+ __ AddP(r4, r4, r7);
+ __ LoadP(r5, FieldMemOperand(r4, count_offset));
+ __ AddSmiLiteral(r5, r5, Smi::FromInt(CallICNexus::kCallCountIncrement), r0);
+ __ StoreP(r5, FieldMemOperand(r4, count_offset), r0);
+
+ __ LoadRR(r4, r6);
+ __ LoadRR(r5, r3);
ArrayConstructorStub stub(masm->isolate(), arg_count());
__ TailCallStub(&stub);
}
-
void CallICStub::Generate(MacroAssembler* masm) {
- // r4 - function
- // r6 - slot id (Smi)
- // r5 - vector
+ // r3 - function
+ // r5 - slot id (Smi)
+ // r4 - vector
Label extra_checks_or_miss, call, call_function;
int argc = arg_count();
ParameterCount actual(argc);
- // The checks. First, does r4 match the recorded monomorphic target?
- __ SmiToPtrArrayOffset(r9, r6);
- __ add(r9, r5, r9);
- __ LoadP(r7, FieldMemOperand(r9, FixedArray::kHeaderSize));
+ // The checks. First, does r3 match the recorded monomorphic target?
+ __ SmiToPtrArrayOffset(r8, r5);
+ __ AddP(r8, r4, r8);
+ __ LoadP(r6, FieldMemOperand(r8, FixedArray::kHeaderSize));
// We don't know that we have a weak cell. We might have a private symbol
// or an AllocationSite, but the memory is safe to examine.
@@ -2180,22 +2171,22 @@ void CallICStub::Generate(MacroAssembler* masm) {
WeakCell::kValueOffset &&
WeakCell::kValueOffset == Symbol::kHashFieldSlot);
- __ LoadP(r8, FieldMemOperand(r7, WeakCell::kValueOffset));
- __ cmp(r4, r8);
- __ bne(&extra_checks_or_miss);
+ __ LoadP(r7, FieldMemOperand(r6, WeakCell::kValueOffset));
+ __ CmpP(r3, r7);
+ __ bne(&extra_checks_or_miss, Label::kNear);
// The compare above could have been a SMI/SMI comparison. Guard against this
// convincing us that we have a monomorphic JSFunction.
- __ JumpIfSmi(r4, &extra_checks_or_miss);
+ __ JumpIfSmi(r3, &extra_checks_or_miss);
// Increment the call count for monomorphic function calls.
const int count_offset = FixedArray::kHeaderSize + kPointerSize;
- __ LoadP(r6, FieldMemOperand(r9, count_offset));
- __ AddSmiLiteral(r6, r6, Smi::FromInt(CallICNexus::kCallCountIncrement), r0);
- __ StoreP(r6, FieldMemOperand(r9, count_offset), r0);
+ __ LoadP(r5, FieldMemOperand(r8, count_offset));
+ __ AddSmiLiteral(r5, r5, Smi::FromInt(CallICNexus::kCallCountIncrement), r0);
+ __ StoreP(r5, FieldMemOperand(r8, count_offset), r0);
__ bind(&call_function);
- __ mov(r3, Operand(argc));
+ __ mov(r2, Operand(argc));
__ Jump(masm->isolate()->builtins()->CallFunction(convert_mode(),
tail_call_mode()),
RelocInfo::CODE_TARGET);
@@ -2203,12 +2194,12 @@ void CallICStub::Generate(MacroAssembler* masm) {
__ bind(&extra_checks_or_miss);
Label uninitialized, miss, not_allocation_site;
- __ CompareRoot(r7, Heap::kmegamorphic_symbolRootIndex);
+ __ CompareRoot(r6, Heap::kmegamorphic_symbolRootIndex);
__ beq(&call);
- // Verify that r7 contains an AllocationSite
- __ LoadP(r8, FieldMemOperand(r7, HeapObject::kMapOffset));
- __ CompareRoot(r8, Heap::kAllocationSiteMapRootIndex);
+ // Verify that r6 contains an AllocationSite
+ __ LoadP(r7, FieldMemOperand(r6, HeapObject::kMapOffset));
+ __ CompareRoot(r7, Heap::kAllocationSiteMapRootIndex);
__ bne(&not_allocation_site);
// We have an allocation site.
@@ -2222,58 +2213,58 @@ void CallICStub::Generate(MacroAssembler* masm) {
__ b(&miss);
}
- __ CompareRoot(r7, Heap::kuninitialized_symbolRootIndex);
+ __ CompareRoot(r6, Heap::kuninitialized_symbolRootIndex);
__ beq(&uninitialized);
// We are going megamorphic. If the feedback is a JSFunction, it is fine
// to handle it here. More complex cases are dealt with in the runtime.
- __ AssertNotSmi(r7);
- __ CompareObjectType(r7, r8, r8, JS_FUNCTION_TYPE);
+ __ AssertNotSmi(r6);
+ __ CompareObjectType(r6, r7, r7, JS_FUNCTION_TYPE);
__ bne(&miss);
__ LoadRoot(ip, Heap::kmegamorphic_symbolRootIndex);
- __ StoreP(ip, FieldMemOperand(r9, FixedArray::kHeaderSize), r0);
+ __ StoreP(ip, FieldMemOperand(r8, FixedArray::kHeaderSize), r0);
__ bind(&call);
- __ mov(r3, Operand(argc));
+ __ mov(r2, Operand(argc));
__ Jump(masm->isolate()->builtins()->Call(convert_mode(), tail_call_mode()),
RelocInfo::CODE_TARGET);
__ bind(&uninitialized);
// We are going monomorphic, provided we actually have a JSFunction.
- __ JumpIfSmi(r4, &miss);
+ __ JumpIfSmi(r3, &miss);
// Goto miss case if we do not have a function.
- __ CompareObjectType(r4, r7, r7, JS_FUNCTION_TYPE);
+ __ CompareObjectType(r3, r6, r6, JS_FUNCTION_TYPE);
__ bne(&miss);
// Make sure the function is not the Array() function, which requires special
// behavior on MISS.
- __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r7);
- __ cmp(r4, r7);
+ __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r6);
+ __ CmpP(r3, r6);
__ beq(&miss);
// Make sure the function belongs to the same native context.
- __ LoadP(r7, FieldMemOperand(r4, JSFunction::kContextOffset));
- __ LoadP(r7, ContextMemOperand(r7, Context::NATIVE_CONTEXT_INDEX));
+ __ LoadP(r6, FieldMemOperand(r3, JSFunction::kContextOffset));
+ __ LoadP(r6, ContextMemOperand(r6, Context::NATIVE_CONTEXT_INDEX));
__ LoadP(ip, NativeContextMemOperand());
- __ cmp(r7, ip);
+ __ CmpP(r6, ip);
__ bne(&miss);
// Initialize the call counter.
- __ LoadSmiLiteral(r8, Smi::FromInt(CallICNexus::kCallCountIncrement));
- __ StoreP(r8, FieldMemOperand(r9, count_offset), r0);
+ __ LoadSmiLiteral(r7, Smi::FromInt(CallICNexus::kCallCountIncrement));
+ __ StoreP(r7, FieldMemOperand(r8, count_offset), r0);
// Store the function. Use a stub since we need a frame for allocation.
- // r5 - vector
- // r6 - slot
- // r4 - function
+ // r4 - vector
+ // r5 - slot
+ // r3 - function
{
- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
+ FrameScope scope(masm, StackFrame::INTERNAL);
CreateWeakCellStub create_stub(masm->isolate());
- __ Push(r4);
+ __ Push(r3);
__ CallStub(&create_stub);
- __ Pop(r4);
+ __ Pop(r3);
}
__ b(&call_function);
@@ -2286,21 +2277,19 @@ void CallICStub::Generate(MacroAssembler* masm) {
__ b(&call);
}
-
void CallICStub::GenerateMiss(MacroAssembler* masm) {
- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
+ FrameScope scope(masm, StackFrame::INTERNAL);
// Push the function and feedback info.
- __ Push(r4, r5, r6);
+ __ Push(r3, r4, r5);
// Call the entry.
__ CallRuntime(Runtime::kCallIC_Miss);
- // Move result to r4 and exit the internal frame.
- __ mr(r4, r3);
+ // Move result to r3 and exit the internal frame.
+ __ LoadRR(r3, r2);
}
-
// StringCharCodeAtGenerator
void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) {
// If the receiver is a smi trigger the non-string case.
@@ -2309,10 +2298,11 @@ void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) {
// Fetch the instance type of the receiver into result register.
__ LoadP(result_, FieldMemOperand(object_, HeapObject::kMapOffset));
- __ lbz(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
+ __ LoadlB(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
// If the receiver is not a string trigger the non-string case.
- __ andi(r0, result_, Operand(kIsNotStringMask));
- __ bne(receiver_not_string_, cr0);
+ __ mov(r0, Operand(kIsNotStringMask));
+ __ AndP(r0, result_);
+ __ bne(receiver_not_string_);
}
// If the index is non-smi trigger the non-smi case.
@@ -2321,7 +2311,7 @@ void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) {
// Check for index out of range.
__ LoadP(ip, FieldMemOperand(object_, String::kLengthOffset));
- __ cmpl(ip, index_);
+ __ CmpLogicalP(ip, index_);
__ ble(index_out_of_range_);
__ SmiUntag(index_);
@@ -2333,7 +2323,6 @@ void StringCharCodeAtGenerator::GenerateFast(MacroAssembler* masm) {
__ bind(&exit_);
}
-
void StringCharCodeAtGenerator::GenerateSlow(
MacroAssembler* masm, EmbedMode embed_mode,
const RuntimeCallHelper& call_helper) {
@@ -2361,7 +2350,7 @@ void StringCharCodeAtGenerator::GenerateSlow(
}
// Save the conversion result before the pop instructions below
// have a chance to overwrite it.
- __ Move(index_, r3);
+ __ Move(index_, r2);
if (embed_mode == PART_OF_IC_HANDLER) {
__ Pop(LoadWithVectorDescriptor::VectorRegister(),
LoadWithVectorDescriptor::SlotRegister(), object_);
@@ -2370,7 +2359,7 @@ void StringCharCodeAtGenerator::GenerateSlow(
}
// Reload the instance type.
__ LoadP(result_, FieldMemOperand(object_, HeapObject::kMapOffset));
- __ lbz(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
+ __ LoadlB(result_, FieldMemOperand(result_, Map::kInstanceTypeOffset));
call_helper.AfterCall(masm);
// If index is still not a smi, it must be out of range.
__ JumpIfNotSmi(index_, index_out_of_range_);
@@ -2385,14 +2374,13 @@ void StringCharCodeAtGenerator::GenerateSlow(
__ SmiTag(index_);
__ Push(object_, index_);
__ CallRuntime(Runtime::kStringCharCodeAtRT);
- __ Move(result_, r3);
+ __ Move(result_, r2);
call_helper.AfterCall(masm);
__ b(&exit_);
__ Abort(kUnexpectedFallthroughFromCharCodeAtSlowCase);
}
-
// -------------------------------------------------------------------------
// StringCharFromCodeGenerator
@@ -2400,23 +2388,22 @@ void StringCharFromCodeGenerator::GenerateFast(MacroAssembler* masm) {
// Fast case of Heap::LookupSingleCharacterStringFromCode.
DCHECK(base::bits::IsPowerOfTwo32(String::kMaxOneByteCharCodeU + 1));
__ LoadSmiLiteral(r0, Smi::FromInt(~String::kMaxOneByteCharCodeU));
- __ ori(r0, r0, Operand(kSmiTagMask));
- __ and_(r0, code_, r0, SetRC);
- __ bne(&slow_case_, cr0);
+ __ OrP(r0, r0, Operand(kSmiTagMask));
+ __ AndP(r0, code_, r0);
+ __ bne(&slow_case_);
__ LoadRoot(result_, Heap::kSingleCharacterStringCacheRootIndex);
// At this point code register contains smi tagged one-byte char code.
- __ mr(r0, code_);
+ __ LoadRR(r0, code_);
__ SmiToPtrArrayOffset(code_, code_);
- __ add(result_, result_, code_);
- __ mr(code_, r0);
+ __ AddP(result_, code_);
+ __ LoadRR(code_, r0);
__ LoadP(result_, FieldMemOperand(result_, FixedArray::kHeaderSize));
__ CompareRoot(result_, Heap::kUndefinedValueRootIndex);
__ beq(&slow_case_);
__ bind(&exit_);
}
-
void StringCharFromCodeGenerator::GenerateSlow(
MacroAssembler* masm, const RuntimeCallHelper& call_helper) {
__ Abort(kUnexpectedFallthroughToCharFromCodeSlowCase);
@@ -2425,16 +2412,14 @@ void StringCharFromCodeGenerator::GenerateSlow(
call_helper.BeforeCall(masm);
__ push(code_);
__ CallRuntime(Runtime::kStringCharFromCode);
- __ Move(result_, r3);
+ __ Move(result_, r2);
call_helper.AfterCall(masm);
__ b(&exit_);
__ Abort(kUnexpectedFallthroughFromCharFromCodeSlowCase);
}
-
-enum CopyCharactersFlags { COPY_ONE_BYTE = 1, DEST_ALWAYS_ALIGNED = 2 };
-
+enum CopyCharactersFlags { COPY_ASCII = 1, DEST_ALWAYS_ALIGNED = 2 };
void StringHelper::GenerateCopyCharacters(MacroAssembler* masm, Register dest,
Register src, Register count,
@@ -2442,7 +2427,8 @@ void StringHelper::GenerateCopyCharacters(MacroAssembler* masm, Register dest,
String::Encoding encoding) {
if (FLAG_debug_code) {
// Check that destination is word aligned.
- __ andi(r0, dest, Operand(kPointerAlignmentMask));
+ __ mov(r0, Operand(kPointerAlignmentMask));
+ __ AndP(r0, dest);
__ Check(eq, kDestinationOfCopyNotAligned, cr0);
}
@@ -2450,27 +2436,26 @@ void StringHelper::GenerateCopyCharacters(MacroAssembler* masm, Register dest,
Label done;
if (encoding == String::TWO_BYTE_ENCODING) {
// double the length
- __ add(count, count, count, LeaveOE, SetRC);
- __ beq(&done, cr0);
+ __ AddP(count, count, count);
+ __ beq(&done, Label::kNear);
} else {
- __ cmpi(count, Operand::Zero());
- __ beq(&done);
+ __ CmpP(count, Operand::Zero());
+ __ beq(&done, Label::kNear);
}
// Copy count bytes from src to dst.
Label byte_loop;
- __ mtctr(count);
+ // TODO(joransiu): Convert into MVC loop
__ bind(&byte_loop);
- __ lbz(scratch, MemOperand(src));
- __ addi(src, src, Operand(1));
- __ stb(scratch, MemOperand(dest));
- __ addi(dest, dest, Operand(1));
- __ bdnz(&byte_loop);
+ __ LoadlB(scratch, MemOperand(src));
+ __ la(src, MemOperand(src, 1));
+ __ stc(scratch, MemOperand(dest));
+ __ la(dest, MemOperand(dest, 1));
+ __ BranchOnCount(count, &byte_loop);
__ bind(&done);
}
-
void SubStringStub::Generate(MacroAssembler* masm) {
Label runtime;
@@ -2491,95 +2476,97 @@ void SubStringStub::Generate(MacroAssembler* masm) {
const int kFromOffset = 1 * kPointerSize;
const int kStringOffset = 2 * kPointerSize;
- __ LoadP(r5, MemOperand(sp, kToOffset));
- __ LoadP(r6, MemOperand(sp, kFromOffset));
+ __ LoadP(r4, MemOperand(sp, kToOffset));
+ __ LoadP(r5, MemOperand(sp, kFromOffset));
// If either to or from had the smi tag bit set, then fail to generic runtime
+ __ JumpIfNotSmi(r4, &runtime);
__ JumpIfNotSmi(r5, &runtime);
- __ JumpIfNotSmi(r6, &runtime);
+ __ SmiUntag(r4);
__ SmiUntag(r5);
- __ SmiUntag(r6, SetRC);
- // Both r5 and r6 are untagged integers.
+ // Both r4 and r5 are untagged integers.
// We want to bailout to runtime here if From is negative.
- __ blt(&runtime, cr0); // From < 0.
+ __ blt(&runtime); // From < 0.
- __ cmpl(r6, r5);
+ __ CmpLogicalP(r5, r4);
__ bgt(&runtime); // Fail if from > to.
- __ sub(r5, r5, r6);
+ __ SubP(r4, r4, r5);
// Make sure first argument is a string.
- __ LoadP(r3, MemOperand(sp, kStringOffset));
- __ JumpIfSmi(r3, &runtime);
- Condition is_string = masm->IsObjectStringType(r3, r4);
- __ b(NegateCondition(is_string), &runtime, cr0);
+ __ LoadP(r2, MemOperand(sp, kStringOffset));
+ __ JumpIfSmi(r2, &runtime);
+ Condition is_string = masm->IsObjectStringType(r2, r3);
+ __ b(NegateCondition(is_string), &runtime);
Label single_char;
- __ cmpi(r5, Operand(1));
+ __ CmpP(r4, Operand(1));
__ b(eq, &single_char);
// Short-cut for the case of trivial substring.
- Label return_r3;
- // r3: original string
- // r5: result string length
- __ LoadP(r7, FieldMemOperand(r3, String::kLengthOffset));
- __ SmiUntag(r0, r7);
- __ cmpl(r5, r0);
+ Label return_r2;
+ // r2: original string
+ // r4: result string length
+ __ LoadP(r6, FieldMemOperand(r2, String::kLengthOffset));
+ __ SmiUntag(r0, r6);
+ __ CmpLogicalP(r4, r0);
// Return original string.
- __ beq(&return_r3);
+ __ beq(&return_r2);
// Longer than original string's length or negative: unsafe arguments.
__ bgt(&runtime);
// Shorter than original string's length: an actual substring.
// Deal with different string types: update the index if necessary
- // and put the underlying string into r8.
- // r3: original string
- // r4: instance type
- // r5: length
- // r6: from index (untagged)
+ // and put the underlying string into r7.
+ // r2: original string
+ // r3: instance type
+ // r4: length
+ // r5: from index (untagged)
Label underlying_unpacked, sliced_string, seq_or_external_string;
// If the string is not indirect, it can only be sequential or external.
STATIC_ASSERT(kIsIndirectStringMask == (kSlicedStringTag & kConsStringTag));
STATIC_ASSERT(kIsIndirectStringMask != 0);
- __ andi(r0, r4, Operand(kIsIndirectStringMask));
- __ beq(&seq_or_external_string, cr0);
+ __ mov(r0, Operand(kIsIndirectStringMask));
+ __ AndP(r0, r3);
+ __ beq(&seq_or_external_string);
- __ andi(r0, r4, Operand(kSlicedNotConsMask));
- __ bne(&sliced_string, cr0);
+ __ mov(r0, Operand(kSlicedNotConsMask));
+ __ AndP(r0, r3);
+ __ bne(&sliced_string);
// Cons string. Check whether it is flat, then fetch first part.
- __ LoadP(r8, FieldMemOperand(r3, ConsString::kSecondOffset));
- __ CompareRoot(r8, Heap::kempty_stringRootIndex);
+ __ LoadP(r7, FieldMemOperand(r2, ConsString::kSecondOffset));
+ __ CompareRoot(r7, Heap::kempty_stringRootIndex);
__ bne(&runtime);
- __ LoadP(r8, FieldMemOperand(r3, ConsString::kFirstOffset));
+ __ LoadP(r7, FieldMemOperand(r2, ConsString::kFirstOffset));
// Update instance type.
- __ LoadP(r4, FieldMemOperand(r8, HeapObject::kMapOffset));
- __ lbz(r4, FieldMemOperand(r4, Map::kInstanceTypeOffset));
+ __ LoadP(r3, FieldMemOperand(r7, HeapObject::kMapOffset));
+ __ LoadlB(r3, FieldMemOperand(r3, Map::kInstanceTypeOffset));
__ b(&underlying_unpacked);
__ bind(&sliced_string);
// Sliced string. Fetch parent and correct start index by offset.
- __ LoadP(r8, FieldMemOperand(r3, SlicedString::kParentOffset));
- __ LoadP(r7, FieldMemOperand(r3, SlicedString::kOffsetOffset));
- __ SmiUntag(r4, r7);
- __ add(r6, r6, r4); // Add offset to index.
+ __ LoadP(r7, FieldMemOperand(r2, SlicedString::kParentOffset));
+ __ LoadP(r6, FieldMemOperand(r2, SlicedString::kOffsetOffset));
+ __ SmiUntag(r3, r6);
+ __ AddP(r5, r3); // Add offset to index.
// Update instance type.
- __ LoadP(r4, FieldMemOperand(r8, HeapObject::kMapOffset));
- __ lbz(r4, FieldMemOperand(r4, Map::kInstanceTypeOffset));
+ __ LoadP(r3, FieldMemOperand(r7, HeapObject::kMapOffset));
+ __ LoadlB(r3, FieldMemOperand(r3, Map::kInstanceTypeOffset));
__ b(&underlying_unpacked);
__ bind(&seq_or_external_string);
// Sequential or external string. Just move string to the expected register.
- __ mr(r8, r3);
+ __ LoadRR(r7, r2);
__ bind(&underlying_unpacked);
if (FLAG_string_slices) {
Label copy_routine;
- // r8: underlying subject string
- // r4: instance type of underlying subject string
- // r5: length
- // r6: adjusted start index (untagged)
- __ cmpi(r5, Operand(SlicedString::kMinLength));
+ // r7: underlying subject string
+ // r3: instance type of underlying subject string
+ // r4: length
+ // r5: adjusted start index (untagged)
+ __ CmpP(r4, Operand(SlicedString::kMinLength));
// Short slice. Copy instead of slicing.
__ blt(&copy_routine);
// Allocate new sliced string. At this point we do not reload the instance
@@ -2590,89 +2577,93 @@ void SubStringStub::Generate(MacroAssembler* masm) {
Label two_byte_slice, set_slice_header;
STATIC_ASSERT((kStringEncodingMask & kOneByteStringTag) != 0);
STATIC_ASSERT((kStringEncodingMask & kTwoByteStringTag) == 0);
- __ andi(r0, r4, Operand(kStringEncodingMask));
- __ beq(&two_byte_slice, cr0);
- __ AllocateOneByteSlicedString(r3, r5, r9, r10, &runtime);
+ __ mov(r0, Operand(kStringEncodingMask));
+ __ AndP(r0, r3);
+ __ beq(&two_byte_slice);
+ __ AllocateOneByteSlicedString(r2, r4, r8, r9, &runtime);
__ b(&set_slice_header);
__ bind(&two_byte_slice);
- __ AllocateTwoByteSlicedString(r3, r5, r9, r10, &runtime);
+ __ AllocateTwoByteSlicedString(r2, r4, r8, r9, &runtime);
__ bind(&set_slice_header);
- __ SmiTag(r6);
- __ StoreP(r8, FieldMemOperand(r3, SlicedString::kParentOffset), r0);
- __ StoreP(r6, FieldMemOperand(r3, SlicedString::kOffsetOffset), r0);
- __ b(&return_r3);
+ __ SmiTag(r5);
+ __ StoreP(r7, FieldMemOperand(r2, SlicedString::kParentOffset));
+ __ StoreP(r5, FieldMemOperand(r2, SlicedString::kOffsetOffset));
+ __ b(&return_r2);
__ bind(&copy_routine);
}
- // r8: underlying subject string
- // r4: instance type of underlying subject string
- // r5: length
- // r6: adjusted start index (untagged)
+ // r7: underlying subject string
+ // r3: instance type of underlying subject string
+ // r4: length
+ // r5: adjusted start index (untagged)
Label two_byte_sequential, sequential_string, allocate_result;
STATIC_ASSERT(kExternalStringTag != 0);
STATIC_ASSERT(kSeqStringTag == 0);
- __ andi(r0, r4, Operand(kExternalStringTag));
- __ beq(&sequential_string, cr0);
+ __ mov(r0, Operand(kExternalStringTag));
+ __ AndP(r0, r3);
+ __ beq(&sequential_string);
// Handle external string.
// Rule out short external strings.
STATIC_ASSERT(kShortExternalStringTag != 0);
- __ andi(r0, r4, Operand(kShortExternalStringTag));
- __ bne(&runtime, cr0);
- __ LoadP(r8, FieldMemOperand(r8, ExternalString::kResourceDataOffset));
- // r8 already points to the first character of underlying string.
+ __ mov(r0, Operand(kShortExternalStringTag));
+ __ AndP(r0, r3);
+ __ bne(&runtime);
+ __ LoadP(r7, FieldMemOperand(r7, ExternalString::kResourceDataOffset));
+ // r7 already points to the first character of underlying string.
__ b(&allocate_result);
__ bind(&sequential_string);
// Locate first character of underlying subject string.
STATIC_ASSERT(SeqTwoByteString::kHeaderSize == SeqOneByteString::kHeaderSize);
- __ addi(r8, r8, Operand(SeqOneByteString::kHeaderSize - kHeapObjectTag));
+ __ AddP(r7, Operand(SeqOneByteString::kHeaderSize - kHeapObjectTag));
__ bind(&allocate_result);
// Sequential acii string. Allocate the result.
STATIC_ASSERT((kOneByteStringTag & kStringEncodingMask) != 0);
- __ andi(r0, r4, Operand(kStringEncodingMask));
- __ beq(&two_byte_sequential, cr0);
+ __ mov(r0, Operand(kStringEncodingMask));
+ __ AndP(r0, r3);
+ __ beq(&two_byte_sequential);
// Allocate and copy the resulting one-byte string.
- __ AllocateOneByteString(r3, r5, r7, r9, r10, &runtime);
+ __ AllocateOneByteString(r2, r4, r6, r8, r9, &runtime);
// Locate first character of substring to copy.
- __ add(r8, r8, r6);
+ __ AddP(r7, r5);
// Locate first character of result.
- __ addi(r4, r3, Operand(SeqOneByteString::kHeaderSize - kHeapObjectTag));
+ __ AddP(r3, r2, Operand(SeqOneByteString::kHeaderSize - kHeapObjectTag));
- // r3: result string
- // r4: first character of result string
- // r5: result string length
- // r8: first character of substring to copy
+ // r2: result string
+ // r3: first character of result string
+ // r4: result string length
+ // r7: first character of substring to copy
STATIC_ASSERT((SeqOneByteString::kHeaderSize & kObjectAlignmentMask) == 0);
- StringHelper::GenerateCopyCharacters(masm, r4, r8, r5, r6,
+ StringHelper::GenerateCopyCharacters(masm, r3, r7, r4, r5,
String::ONE_BYTE_ENCODING);
- __ b(&return_r3);
+ __ b(&return_r2);
// Allocate and copy the resulting two-byte string.
__ bind(&two_byte_sequential);
- __ AllocateTwoByteString(r3, r5, r7, r9, r10, &runtime);
+ __ AllocateTwoByteString(r2, r4, r6, r8, r9, &runtime);
// Locate first character of substring to copy.
- __ ShiftLeftImm(r4, r6, Operand(1));
- __ add(r8, r8, r4);
+ __ ShiftLeftP(r3, r5, Operand(1));
+ __ AddP(r7, r3);
// Locate first character of result.
- __ addi(r4, r3, Operand(SeqTwoByteString::kHeaderSize - kHeapObjectTag));
+ __ AddP(r3, r2, Operand(SeqTwoByteString::kHeaderSize - kHeapObjectTag));
- // r3: result string.
- // r4: first character of result.
- // r5: result length.
- // r8: first character of substring to copy.
+ // r2: result string.
+ // r3: first character of result.
+ // r4: result length.
+ // r7: first character of substring to copy.
STATIC_ASSERT((SeqTwoByteString::kHeaderSize & kObjectAlignmentMask) == 0);
- StringHelper::GenerateCopyCharacters(masm, r4, r8, r5, r6,
+ StringHelper::GenerateCopyCharacters(masm, r3, r7, r4, r5,
String::TWO_BYTE_ENCODING);
- __ bind(&return_r3);
+ __ bind(&return_r2);
Counters* counters = isolate()->counters();
- __ IncrementCounter(counters->sub_string_native(), 1, r6, r7);
+ __ IncrementCounter(counters->sub_string_native(), 1, r5, r6);
__ Drop(3);
__ Ret();
@@ -2681,12 +2672,12 @@ void SubStringStub::Generate(MacroAssembler* masm) {
__ TailCallRuntime(Runtime::kSubString);
__ bind(&single_char);
- // r3: original string
- // r4: instance type
- // r5: length
- // r6: from index (untagged)
- __ SmiTag(r6, r6);
- StringCharAtGenerator generator(r3, r6, r5, r3, &runtime, &runtime, &runtime,
+ // r2: original string
+ // r3: instance type
+ // r4: length
+ // r5: from index (untagged)
+ __ SmiTag(r5, r5);
+ StringCharAtGenerator generator(r2, r5, r4, r2, &runtime, &runtime, &runtime,
STRING_INDEX_IS_NUMBER, RECEIVER_IS_STRING);
generator.GenerateFast(masm);
__ Drop(3);
@@ -2694,79 +2685,76 @@ void SubStringStub::Generate(MacroAssembler* masm) {
generator.SkipSlow(masm, &runtime);
}
-
void ToNumberStub::Generate(MacroAssembler* masm) {
- // The ToNumber stub takes one argument in r3.
+ // The ToNumber stub takes one argument in r2.
Label not_smi;
- __ JumpIfNotSmi(r3, &not_smi);
- __ blr();
+ __ JumpIfNotSmi(r2, &not_smi);
+ __ b(r14);
__ bind(&not_smi);
- __ CompareObjectType(r3, r4, r4, HEAP_NUMBER_TYPE);
- // r3: receiver
- // r4: receiver instance type
- __ Ret(eq);
+ __ CompareObjectType(r2, r3, r3, HEAP_NUMBER_TYPE);
+ // r2: receiver
+ // r3: receiver instance type
+ Label not_heap_number;
+ __ bne(&not_heap_number);
+ __ Ret();
+ __ bind(&not_heap_number);
Label not_string, slow_string;
- __ cmpli(r4, Operand(FIRST_NONSTRING_TYPE));
- __ bge(&not_string);
+ __ CmpLogicalP(r3, Operand(FIRST_NONSTRING_TYPE));
+ __ bge(&not_string, Label::kNear);
// Check if string has a cached array index.
- __ lwz(r5, FieldMemOperand(r3, String::kHashFieldOffset));
- __ And(r0, r5, Operand(String::kContainsCachedArrayIndexMask), SetRC);
- __ bne(&slow_string, cr0);
- __ IndexFromHash(r5, r3);
- __ blr();
+ __ LoadlW(r4, FieldMemOperand(r2, String::kHashFieldOffset));
+ __ AndP(r0, r4, Operand(String::kContainsCachedArrayIndexMask));
+ __ bne(&slow_string, Label::kNear);
+ __ IndexFromHash(r4, r2);
+ __ b(r14);
__ bind(&slow_string);
- __ push(r3); // Push argument.
+ __ push(r2); // Push argument.
__ TailCallRuntime(Runtime::kStringToNumber);
__ bind(&not_string);
Label not_oddball;
- __ cmpi(r4, Operand(ODDBALL_TYPE));
- __ bne(&not_oddball);
- __ LoadP(r3, FieldMemOperand(r3, Oddball::kToNumberOffset));
- __ blr();
+ __ CmpP(r3, Operand(ODDBALL_TYPE));
+ __ bne(&not_oddball, Label::kNear);
+ __ LoadP(r2, FieldMemOperand(r2, Oddball::kToNumberOffset));
+ __ b(r14);
__ bind(&not_oddball);
- __ push(r3); // Push argument.
+ __ push(r2); // Push argument.
__ TailCallRuntime(Runtime::kToNumber);
}
-
void ToLengthStub::Generate(MacroAssembler* masm) {
- // The ToLength stub takes one argument in r3.
+ // The ToLength stub takes one argument in r2.
Label not_smi;
- __ JumpIfNotSmi(r3, &not_smi);
+ __ JumpIfNotSmi(r2, &not_smi);
STATIC_ASSERT(kSmiTag == 0);
- __ cmpi(r3, Operand::Zero());
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ isel(lt, r3, r0, r3);
- } else {
- Label positive;
- __ bgt(&positive);
- __ li(r3, Operand::Zero());
- __ bind(&positive);
- }
+ __ CmpP(r2, Operand::Zero());
+ Label positive;
+ __ bgt(&positive);
+ __ LoadImmP(r2, Operand::Zero());
+ __ bind(&positive);
__ Ret();
__ bind(&not_smi);
- __ push(r3); // Push argument.
+ __ push(r2); // Push argument.
__ TailCallRuntime(Runtime::kToLength);
}
-
void ToStringStub::Generate(MacroAssembler* masm) {
- // The ToString stub takes one argument in r3.
+ // The ToString stub takes one argument in r2.
+ Label done;
Label is_number;
- __ JumpIfSmi(r3, &is_number);
+ __ JumpIfSmi(r2, &is_number);
- __ CompareObjectType(r3, r4, r4, FIRST_NONSTRING_TYPE);
- // r3: receiver
- // r4: receiver instance type
- __ Ret(lt);
+ __ CompareObjectType(r2, r3, r3, FIRST_NONSTRING_TYPE);
+ // r2: receiver
+ // r3: receiver instance type
+ __ blt(&done);
Label not_heap_number;
- __ cmpi(r4, Operand(HEAP_NUMBER_TYPE));
+ __ CmpP(r3, Operand(HEAP_NUMBER_TYPE));
__ bne(&not_heap_number);
__ bind(&is_number);
NumberToStringStub stub(isolate());
@@ -2774,30 +2762,32 @@ void ToStringStub::Generate(MacroAssembler* masm) {
__ bind(&not_heap_number);
Label not_oddball;
- __ cmpi(r4, Operand(ODDBALL_TYPE));
+ __ CmpP(r3, Operand(ODDBALL_TYPE));
__ bne(&not_oddball);
- __ LoadP(r3, FieldMemOperand(r3, Oddball::kToStringOffset));
+ __ LoadP(r2, FieldMemOperand(r2, Oddball::kToStringOffset));
__ Ret();
__ bind(&not_oddball);
- __ push(r3); // Push argument.
+ __ push(r2); // Push argument.
__ TailCallRuntime(Runtime::kToString);
-}
+ __ bind(&done);
+ __ Ret();
+}
void ToNameStub::Generate(MacroAssembler* masm) {
- // The ToName stub takes one argument in r3.
+ // The ToName stub takes one argument in r2.
Label is_number;
- __ JumpIfSmi(r3, &is_number);
+ __ JumpIfSmi(r2, &is_number);
STATIC_ASSERT(FIRST_NAME_TYPE == FIRST_TYPE);
- __ CompareObjectType(r3, r4, r4, LAST_NAME_TYPE);
- // r3: receiver
- // r4: receiver instance type
+ __ CompareObjectType(r2, r3, r3, LAST_NAME_TYPE);
+ // r2: receiver
+ // r3: receiver instance type
__ Ret(le);
Label not_heap_number;
- __ cmpi(r4, Operand(HEAP_NUMBER_TYPE));
+ __ CmpP(r3, Operand(HEAP_NUMBER_TYPE));
__ bne(&not_heap_number);
__ bind(&is_number);
NumberToStringStub stub(isolate());
@@ -2805,17 +2795,16 @@ void ToNameStub::Generate(MacroAssembler* masm) {
__ bind(&not_heap_number);
Label not_oddball;
- __ cmpi(r4, Operand(ODDBALL_TYPE));
+ __ CmpP(r3, Operand(ODDBALL_TYPE));
__ bne(&not_oddball);
- __ LoadP(r3, FieldMemOperand(r3, Oddball::kToStringOffset));
+ __ LoadP(r2, FieldMemOperand(r2, Oddball::kToStringOffset));
__ Ret();
__ bind(&not_oddball);
- __ push(r3); // Push argument.
+ __ push(r2); // Push argument.
__ TailCallRuntime(Runtime::kToName);
}
-
void StringHelper::GenerateFlatOneByteStringEquals(MacroAssembler* masm,
Register left,
Register right,
@@ -2827,19 +2816,19 @@ void StringHelper::GenerateFlatOneByteStringEquals(MacroAssembler* masm,
Label strings_not_equal, check_zero_length;
__ LoadP(length, FieldMemOperand(left, String::kLengthOffset));
__ LoadP(scratch2, FieldMemOperand(right, String::kLengthOffset));
- __ cmp(length, scratch2);
+ __ CmpP(length, scratch2);
__ beq(&check_zero_length);
__ bind(&strings_not_equal);
- __ LoadSmiLiteral(r3, Smi::FromInt(NOT_EQUAL));
+ __ LoadSmiLiteral(r2, Smi::FromInt(NOT_EQUAL));
__ Ret();
// Check if the length is zero.
Label compare_chars;
__ bind(&check_zero_length);
STATIC_ASSERT(kSmiTag == 0);
- __ cmpi(length, Operand::Zero());
+ __ CmpP(length, Operand::Zero());
__ bne(&compare_chars);
- __ LoadSmiLiteral(r3, Smi::FromInt(EQUAL));
+ __ LoadSmiLiteral(r2, Smi::FromInt(EQUAL));
__ Ret();
// Compare characters.
@@ -2848,31 +2837,26 @@ void StringHelper::GenerateFlatOneByteStringEquals(MacroAssembler* masm,
&strings_not_equal);
// Characters are equal.
- __ LoadSmiLiteral(r3, Smi::FromInt(EQUAL));
+ __ LoadSmiLiteral(r2, Smi::FromInt(EQUAL));
__ Ret();
}
-
void StringHelper::GenerateCompareFlatOneByteStrings(
MacroAssembler* masm, Register left, Register right, Register scratch1,
Register scratch2, Register scratch3) {
- Label result_not_equal, compare_lengths;
+ Label skip, result_not_equal, compare_lengths;
// Find minimum length and length difference.
__ LoadP(scratch1, FieldMemOperand(left, String::kLengthOffset));
__ LoadP(scratch2, FieldMemOperand(right, String::kLengthOffset));
- __ sub(scratch3, scratch1, scratch2, LeaveOE, SetRC);
+ __ SubP(scratch3, scratch1, scratch2 /*, LeaveOE, SetRC*/);
+ // Removing RC looks okay here.
Register length_delta = scratch3;
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ isel(gt, scratch1, scratch2, scratch1, cr0);
- } else {
- Label skip;
- __ ble(&skip, cr0);
- __ mr(scratch1, scratch2);
- __ bind(&skip);
- }
+ __ ble(&skip, Label::kNear);
+ __ LoadRR(scratch1, scratch2);
+ __ bind(&skip);
Register min_length = scratch1;
STATIC_ASSERT(kSmiTag == 0);
- __ cmpi(min_length, Operand::Zero());
+ __ CmpP(min_length, Operand::Zero());
__ beq(&compare_lengths);
// Compare loop.
@@ -2883,31 +2867,22 @@ void StringHelper::GenerateCompareFlatOneByteStrings(
__ bind(&compare_lengths);
DCHECK(Smi::FromInt(EQUAL) == static_cast<Smi*>(0));
// Use length_delta as result if it's zero.
- __ mr(r3, length_delta);
- __ cmpi(r3, Operand::Zero());
+ __ LoadRR(r2, length_delta);
+ __ CmpP(length_delta, Operand::Zero());
__ bind(&result_not_equal);
// Conditionally update the result based either on length_delta or
// the last comparion performed in the loop above.
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ LoadSmiLiteral(r4, Smi::FromInt(GREATER));
- __ LoadSmiLiteral(r5, Smi::FromInt(LESS));
- __ isel(eq, r3, r0, r4);
- __ isel(lt, r3, r5, r3);
- __ Ret();
- } else {
- Label less_equal, equal;
- __ ble(&less_equal);
- __ LoadSmiLiteral(r3, Smi::FromInt(GREATER));
- __ Ret();
- __ bind(&less_equal);
- __ beq(&equal);
- __ LoadSmiLiteral(r3, Smi::FromInt(LESS));
- __ bind(&equal);
- __ Ret();
- }
+ Label less_equal, equal;
+ __ ble(&less_equal);
+ __ LoadSmiLiteral(r2, Smi::FromInt(GREATER));
+ __ Ret();
+ __ bind(&less_equal);
+ __ beq(&equal);
+ __ LoadSmiLiteral(r2, Smi::FromInt(LESS));
+ __ bind(&equal);
+ __ Ret();
}
-
void StringHelper::GenerateOneByteCharsCompareLoop(
MacroAssembler* masm, Register left, Register right, Register length,
Register scratch1, Label* chars_not_equal) {
@@ -2915,83 +2890,80 @@ void StringHelper::GenerateOneByteCharsCompareLoop(
// start. This means that loop ends when index reaches zero, which
// doesn't need an additional compare.
__ SmiUntag(length);
- __ addi(scratch1, length,
+ __ AddP(scratch1, length,
Operand(SeqOneByteString::kHeaderSize - kHeapObjectTag));
- __ add(left, left, scratch1);
- __ add(right, right, scratch1);
- __ subfic(length, length, Operand::Zero());
+ __ AddP(left, scratch1);
+ __ AddP(right, scratch1);
+ __ LoadComplementRR(length, length);
Register index = length; // index = -length;
// Compare loop.
Label loop;
__ bind(&loop);
- __ lbzx(scratch1, MemOperand(left, index));
- __ lbzx(r0, MemOperand(right, index));
- __ cmp(scratch1, r0);
+ __ LoadlB(scratch1, MemOperand(left, index));
+ __ LoadlB(r0, MemOperand(right, index));
+ __ CmpP(scratch1, r0);
__ bne(chars_not_equal);
- __ addi(index, index, Operand(1));
- __ cmpi(index, Operand::Zero());
+ __ AddP(index, Operand(1));
+ __ CmpP(index, Operand::Zero());
__ bne(&loop);
}
-
void StringCompareStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r4 : left
- // -- r3 : right
- // -- lr : return address
+ // -- r3 : left
+ // -- r2 : right
+ // -- r14 : return address
// -----------------------------------
- __ AssertString(r4);
__ AssertString(r3);
+ __ AssertString(r2);
Label not_same;
- __ cmp(r3, r4);
+ __ CmpP(r2, r3);
__ bne(&not_same);
- __ LoadSmiLiteral(r3, Smi::FromInt(EQUAL));
- __ IncrementCounter(isolate()->counters()->string_compare_native(), 1, r4,
- r5);
+ __ LoadSmiLiteral(r2, Smi::FromInt(EQUAL));
+ __ IncrementCounter(isolate()->counters()->string_compare_native(), 1, r3,
+ r4);
__ Ret();
__ bind(&not_same);
// Check that both objects are sequential one-byte strings.
Label runtime;
- __ JumpIfNotBothSequentialOneByteStrings(r4, r3, r5, r6, &runtime);
+ __ JumpIfNotBothSequentialOneByteStrings(r3, r2, r4, r5, &runtime);
// Compare flat one-byte strings natively.
- __ IncrementCounter(isolate()->counters()->string_compare_native(), 1, r5,
- r6);
- StringHelper::GenerateCompareFlatOneByteStrings(masm, r4, r3, r5, r6, r7);
+ __ IncrementCounter(isolate()->counters()->string_compare_native(), 1, r4,
+ r5);
+ StringHelper::GenerateCompareFlatOneByteStrings(masm, r3, r2, r4, r5, r6);
// Call the runtime; it returns -1 (less), 0 (equal), or 1 (greater)
// tagged as a small integer.
__ bind(&runtime);
- __ Push(r4, r3);
+ __ Push(r3, r2);
__ TailCallRuntime(Runtime::kStringCompare);
}
-
void BinaryOpICWithAllocationSiteStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r4 : left
- // -- r3 : right
- // -- lr : return address
+ // -- r3 : left
+ // -- r2 : right
+ // r3: second string
// -----------------------------------
- // Load r5 with the allocation site. We stick an undefined dummy value here
+ // Load r4 with the allocation site. We stick an undefined dummy value here
// and replace it with the real allocation site later when we instantiate this
// stub in BinaryOpICWithAllocationSiteStub::GetCodeCopyFromTemplate().
- __ Move(r5, handle(isolate()->heap()->undefined_value()));
+ __ Move(r4, handle(isolate()->heap()->undefined_value()));
// Make sure that we actually patched the allocation site.
if (FLAG_debug_code) {
- __ TestIfSmi(r5, r0);
+ __ TestIfSmi(r4);
__ Assert(ne, kExpectedAllocationSite, cr0);
- __ push(r5);
- __ LoadP(r5, FieldMemOperand(r5, HeapObject::kMapOffset));
- __ LoadRoot(ip, Heap::kAllocationSiteMapRootIndex);
- __ cmp(r5, ip);
- __ pop(r5);
+ __ push(r4);
+ __ LoadP(r4, FieldMemOperand(r4, HeapObject::kMapOffset));
+ __ CompareRoot(r4, Heap::kAllocationSiteMapRootIndex);
+ __ pop(r4);
__ Assert(eq, kExpectedAllocationSite);
}
@@ -3001,42 +2973,40 @@ void BinaryOpICWithAllocationSiteStub::Generate(MacroAssembler* masm) {
__ TailCallStub(&stub);
}
-
void CompareICStub::GenerateBooleans(MacroAssembler* masm) {
DCHECK_EQ(CompareICState::BOOLEAN, state());
Label miss;
- __ CheckMap(r4, r5, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
- __ CheckMap(r3, r6, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
+ __ CheckMap(r3, r4, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
+ __ CheckMap(r2, r5, Heap::kBooleanMapRootIndex, &miss, DO_SMI_CHECK);
if (!Token::IsEqualityOp(op())) {
- __ LoadP(r4, FieldMemOperand(r4, Oddball::kToNumberOffset));
- __ AssertSmi(r4);
__ LoadP(r3, FieldMemOperand(r3, Oddball::kToNumberOffset));
__ AssertSmi(r3);
+ __ LoadP(r2, FieldMemOperand(r2, Oddball::kToNumberOffset));
+ __ AssertSmi(r2);
}
- __ sub(r3, r4, r3);
+ __ SubP(r2, r3, r2);
__ Ret();
__ bind(&miss);
GenerateMiss(masm);
}
-
void CompareICStub::GenerateSmis(MacroAssembler* masm) {
DCHECK(state() == CompareICState::SMI);
Label miss;
- __ orx(r5, r4, r3);
- __ JumpIfNotSmi(r5, &miss);
+ __ OrP(r4, r3, r2);
+ __ JumpIfNotSmi(r4, &miss);
if (GetCondition() == eq) {
// For equality we do not care about the sign of the result.
- // __ sub(r3, r3, r4, SetCC);
- __ sub(r3, r3, r4);
+ // __ sub(r2, r2, r3, SetCC);
+ __ SubP(r2, r2, r3);
} else {
// Untag before subtracting to avoid handling overflow.
- __ SmiUntag(r4);
__ SmiUntag(r3);
- __ sub(r3, r4, r3);
+ __ SmiUntag(r2);
+ __ SubP(r2, r3, r2);
}
__ Ret();
@@ -3044,7 +3014,6 @@ void CompareICStub::GenerateSmis(MacroAssembler* masm) {
GenerateMiss(masm);
}
-
void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
DCHECK(state() == CompareICState::NUMBER);
@@ -3054,62 +3023,53 @@ void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
Label equal, less_than;
if (left() == CompareICState::SMI) {
- __ JumpIfNotSmi(r4, &miss);
+ __ JumpIfNotSmi(r3, &miss);
}
if (right() == CompareICState::SMI) {
- __ JumpIfNotSmi(r3, &miss);
+ __ JumpIfNotSmi(r2, &miss);
}
// Inlining the double comparison and falling back to the general compare
// stub if NaN is involved.
// Load left and right operand.
Label done, left, left_smi, right_smi;
- __ JumpIfSmi(r3, &right_smi);
- __ CheckMap(r3, r5, Heap::kHeapNumberMapRootIndex, &maybe_undefined1,
+ __ JumpIfSmi(r2, &right_smi);
+ __ CheckMap(r2, r4, Heap::kHeapNumberMapRootIndex, &maybe_undefined1,
DONT_DO_SMI_CHECK);
- __ lfd(d1, FieldMemOperand(r3, HeapNumber::kValueOffset));
+ __ LoadDouble(d1, FieldMemOperand(r2, HeapNumber::kValueOffset));
__ b(&left);
__ bind(&right_smi);
- __ SmiToDouble(d1, r3);
+ __ SmiToDouble(d1, r2);
__ bind(&left);
- __ JumpIfSmi(r4, &left_smi);
- __ CheckMap(r4, r5, Heap::kHeapNumberMapRootIndex, &maybe_undefined2,
+ __ JumpIfSmi(r3, &left_smi);
+ __ CheckMap(r3, r4, Heap::kHeapNumberMapRootIndex, &maybe_undefined2,
DONT_DO_SMI_CHECK);
- __ lfd(d0, FieldMemOperand(r4, HeapNumber::kValueOffset));
+ __ LoadDouble(d0, FieldMemOperand(r3, HeapNumber::kValueOffset));
__ b(&done);
__ bind(&left_smi);
- __ SmiToDouble(d0, r4);
+ __ SmiToDouble(d0, r3);
__ bind(&done);
// Compare operands
- __ fcmpu(d0, d1);
+ __ cdbr(d0, d1);
// Don't base result on status bits when a NaN is involved.
__ bunordered(&unordered);
// Return a result of -1, 0, or 1, based on status bits.
- if (CpuFeatures::IsSupported(ISELECT)) {
- DCHECK(EQUAL == 0);
- __ li(r4, Operand(GREATER));
- __ li(r5, Operand(LESS));
- __ isel(eq, r3, r0, r4);
- __ isel(lt, r3, r5, r3);
- __ Ret();
- } else {
- __ beq(&equal);
- __ blt(&less_than);
- // assume greater than
- __ li(r3, Operand(GREATER));
- __ Ret();
- __ bind(&equal);
- __ li(r3, Operand(EQUAL));
- __ Ret();
- __ bind(&less_than);
- __ li(r3, Operand(LESS));
- __ Ret();
- }
+ __ beq(&equal);
+ __ blt(&less_than);
+ // assume greater than
+ __ LoadImmP(r2, Operand(GREATER));
+ __ Ret();
+ __ bind(&equal);
+ __ LoadImmP(r2, Operand(EQUAL));
+ __ Ret();
+ __ bind(&less_than);
+ __ LoadImmP(r2, Operand(LESS));
+ __ Ret();
__ bind(&unordered);
__ bind(&generic_stub);
@@ -3119,17 +3079,17 @@ void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
__ bind(&maybe_undefined1);
if (Token::IsOrderedRelationalCompareOp(op())) {
- __ CompareRoot(r3, Heap::kUndefinedValueRootIndex);
+ __ CompareRoot(r2, Heap::kUndefinedValueRootIndex);
__ bne(&miss);
- __ JumpIfSmi(r4, &unordered);
- __ CompareObjectType(r4, r5, r5, HEAP_NUMBER_TYPE);
+ __ JumpIfSmi(r3, &unordered);
+ __ CompareObjectType(r3, r4, r4, HEAP_NUMBER_TYPE);
__ bne(&maybe_undefined2);
__ b(&unordered);
}
__ bind(&maybe_undefined2);
if (Token::IsOrderedRelationalCompareOp(op())) {
- __ CompareRoot(r4, Heap::kUndefinedValueRootIndex);
+ __ CompareRoot(r3, Heap::kUndefinedValueRootIndex);
__ beq(&unordered);
}
@@ -3137,16 +3097,15 @@ void CompareICStub::GenerateNumbers(MacroAssembler* masm) {
GenerateMiss(masm);
}
-
void CompareICStub::GenerateInternalizedStrings(MacroAssembler* masm) {
DCHECK(state() == CompareICState::INTERNALIZED_STRING);
Label miss, not_equal;
// Registers containing left and right operands respectively.
- Register left = r4;
- Register right = r3;
- Register tmp1 = r5;
- Register tmp2 = r6;
+ Register left = r3;
+ Register right = r2;
+ Register tmp1 = r4;
+ Register tmp2 = r5;
// Check that both operands are heap objects.
__ JumpIfEitherSmi(left, right, &miss);
@@ -3154,22 +3113,22 @@ void CompareICStub::GenerateInternalizedStrings(MacroAssembler* masm) {
// Check that both operands are symbols.
__ LoadP(tmp1, FieldMemOperand(left, HeapObject::kMapOffset));
__ LoadP(tmp2, FieldMemOperand(right, HeapObject::kMapOffset));
- __ lbz(tmp1, FieldMemOperand(tmp1, Map::kInstanceTypeOffset));
- __ lbz(tmp2, FieldMemOperand(tmp2, Map::kInstanceTypeOffset));
+ __ LoadlB(tmp1, FieldMemOperand(tmp1, Map::kInstanceTypeOffset));
+ __ LoadlB(tmp2, FieldMemOperand(tmp2, Map::kInstanceTypeOffset));
STATIC_ASSERT(kInternalizedTag == 0 && kStringTag == 0);
- __ orx(tmp1, tmp1, tmp2);
- __ andi(r0, tmp1, Operand(kIsNotStringMask | kIsNotInternalizedMask));
- __ bne(&miss, cr0);
+ __ OrP(tmp1, tmp1, tmp2);
+ __ AndP(r0, tmp1, Operand(kIsNotStringMask | kIsNotInternalizedMask));
+ __ bne(&miss);
// Internalized strings are compared by identity.
- __ cmp(left, right);
+ __ CmpP(left, right);
__ bne(&not_equal);
- // Make sure r3 is non-zero. At this point input operands are
+ // Make sure r2 is non-zero. At this point input operands are
// guaranteed to be non-zero.
- DCHECK(right.is(r3));
+ DCHECK(right.is(r2));
STATIC_ASSERT(EQUAL == 0);
STATIC_ASSERT(kSmiTag == 0);
- __ LoadSmiLiteral(r3, Smi::FromInt(EQUAL));
+ __ LoadSmiLiteral(r2, Smi::FromInt(EQUAL));
__ bind(&not_equal);
__ Ret();
@@ -3177,17 +3136,16 @@ void CompareICStub::GenerateInternalizedStrings(MacroAssembler* masm) {
GenerateMiss(masm);
}
-
void CompareICStub::GenerateUniqueNames(MacroAssembler* masm) {
DCHECK(state() == CompareICState::UNIQUE_NAME);
DCHECK(GetCondition() == eq);
Label miss;
// Registers containing left and right operands respectively.
- Register left = r4;
- Register right = r3;
- Register tmp1 = r5;
- Register tmp2 = r6;
+ Register left = r3;
+ Register right = r2;
+ Register tmp1 = r4;
+ Register tmp2 = r5;
// Check that both operands are heap objects.
__ JumpIfEitherSmi(left, right, &miss);
@@ -3196,28 +3154,27 @@ void CompareICStub::GenerateUniqueNames(MacroAssembler* masm) {
// types loaded in tmp1 and tmp2.
__ LoadP(tmp1, FieldMemOperand(left, HeapObject::kMapOffset));
__ LoadP(tmp2, FieldMemOperand(right, HeapObject::kMapOffset));
- __ lbz(tmp1, FieldMemOperand(tmp1, Map::kInstanceTypeOffset));
- __ lbz(tmp2, FieldMemOperand(tmp2, Map::kInstanceTypeOffset));
+ __ LoadlB(tmp1, FieldMemOperand(tmp1, Map::kInstanceTypeOffset));
+ __ LoadlB(tmp2, FieldMemOperand(tmp2, Map::kInstanceTypeOffset));
__ JumpIfNotUniqueNameInstanceType(tmp1, &miss);
__ JumpIfNotUniqueNameInstanceType(tmp2, &miss);
// Unique names are compared by identity.
- __ cmp(left, right);
+ __ CmpP(left, right);
__ bne(&miss);
- // Make sure r3 is non-zero. At this point input operands are
+ // Make sure r2 is non-zero. At this point input operands are
// guaranteed to be non-zero.
- DCHECK(right.is(r3));
+ DCHECK(right.is(r2));
STATIC_ASSERT(EQUAL == 0);
STATIC_ASSERT(kSmiTag == 0);
- __ LoadSmiLiteral(r3, Smi::FromInt(EQUAL));
+ __ LoadSmiLiteral(r2, Smi::FromInt(EQUAL));
__ Ret();
__ bind(&miss);
GenerateMiss(masm);
}
-
void CompareICStub::GenerateStrings(MacroAssembler* masm) {
DCHECK(state() == CompareICState::STRING);
Label miss, not_identical, is_symbol;
@@ -3225,12 +3182,12 @@ void CompareICStub::GenerateStrings(MacroAssembler* masm) {
bool equality = Token::IsEqualityOp(op());
// Registers containing left and right operands respectively.
- Register left = r4;
- Register right = r3;
- Register tmp1 = r5;
- Register tmp2 = r6;
- Register tmp3 = r7;
- Register tmp4 = r8;
+ Register left = r3;
+ Register right = r2;
+ Register tmp1 = r4;
+ Register tmp2 = r5;
+ Register tmp3 = r6;
+ Register tmp4 = r7;
// Check that both operands are heap objects.
__ JumpIfEitherSmi(left, right, &miss);
@@ -3239,19 +3196,19 @@ void CompareICStub::GenerateStrings(MacroAssembler* masm) {
// types loaded in tmp1 and tmp2.
__ LoadP(tmp1, FieldMemOperand(left, HeapObject::kMapOffset));
__ LoadP(tmp2, FieldMemOperand(right, HeapObject::kMapOffset));
- __ lbz(tmp1, FieldMemOperand(tmp1, Map::kInstanceTypeOffset));
- __ lbz(tmp2, FieldMemOperand(tmp2, Map::kInstanceTypeOffset));
+ __ LoadlB(tmp1, FieldMemOperand(tmp1, Map::kInstanceTypeOffset));
+ __ LoadlB(tmp2, FieldMemOperand(tmp2, Map::kInstanceTypeOffset));
STATIC_ASSERT(kNotStringTag != 0);
- __ orx(tmp3, tmp1, tmp2);
- __ andi(r0, tmp3, Operand(kIsNotStringMask));
- __ bne(&miss, cr0);
+ __ OrP(tmp3, tmp1, tmp2);
+ __ AndP(r0, tmp3, Operand(kIsNotStringMask));
+ __ bne(&miss);
// Fast check for identical strings.
- __ cmp(left, right);
+ __ CmpP(left, right);
STATIC_ASSERT(EQUAL == 0);
STATIC_ASSERT(kSmiTag == 0);
__ bne(&not_identical);
- __ LoadSmiLiteral(r3, Smi::FromInt(EQUAL));
+ __ LoadSmiLiteral(r2, Smi::FromInt(EQUAL));
__ Ret();
__ bind(&not_identical);
@@ -3263,12 +3220,14 @@ void CompareICStub::GenerateStrings(MacroAssembler* masm) {
if (equality) {
DCHECK(GetCondition() == eq);
STATIC_ASSERT(kInternalizedTag == 0);
- __ orx(tmp3, tmp1, tmp2);
- __ andi(r0, tmp3, Operand(kIsNotInternalizedMask));
- // Make sure r3 is non-zero. At this point input operands are
+ __ OrP(tmp3, tmp1, tmp2);
+ __ AndP(r0, tmp3, Operand(kIsNotInternalizedMask));
+ __ bne(&is_symbol);
+ // Make sure r2 is non-zero. At this point input operands are
// guaranteed to be non-zero.
- DCHECK(right.is(r3));
- __ Ret(eq, cr0);
+ DCHECK(right.is(r2));
+ __ Ret();
+ __ bind(&is_symbol);
}
// Check that both strings are sequential one-byte.
@@ -3298,51 +3257,49 @@ void CompareICStub::GenerateStrings(MacroAssembler* masm) {
GenerateMiss(masm);
}
-
void CompareICStub::GenerateReceivers(MacroAssembler* masm) {
DCHECK_EQ(CompareICState::RECEIVER, state());
Label miss;
- __ and_(r5, r4, r3);
- __ JumpIfSmi(r5, &miss);
+ __ AndP(r4, r3, r2);
+ __ JumpIfSmi(r4, &miss);
STATIC_ASSERT(LAST_TYPE == LAST_JS_RECEIVER_TYPE);
- __ CompareObjectType(r3, r5, r5, FIRST_JS_RECEIVER_TYPE);
+ __ CompareObjectType(r2, r4, r4, FIRST_JS_RECEIVER_TYPE);
__ blt(&miss);
- __ CompareObjectType(r4, r5, r5, FIRST_JS_RECEIVER_TYPE);
+ __ CompareObjectType(r3, r4, r4, FIRST_JS_RECEIVER_TYPE);
__ blt(&miss);
DCHECK(GetCondition() == eq);
- __ sub(r3, r3, r4);
+ __ SubP(r2, r2, r3);
__ Ret();
__ bind(&miss);
GenerateMiss(masm);
}
-
void CompareICStub::GenerateKnownReceivers(MacroAssembler* masm) {
Label miss;
Handle<WeakCell> cell = Map::WeakCellForMap(known_map_);
- __ and_(r5, r4, r3);
- __ JumpIfSmi(r5, &miss);
- __ GetWeakValue(r7, cell);
+ __ AndP(r4, r3, r2);
+ __ JumpIfSmi(r4, &miss);
+ __ GetWeakValue(r6, cell);
+ __ LoadP(r4, FieldMemOperand(r2, HeapObject::kMapOffset));
__ LoadP(r5, FieldMemOperand(r3, HeapObject::kMapOffset));
- __ LoadP(r6, FieldMemOperand(r4, HeapObject::kMapOffset));
- __ cmp(r5, r7);
+ __ CmpP(r4, r6);
__ bne(&miss);
- __ cmp(r6, r7);
+ __ CmpP(r5, r6);
__ bne(&miss);
if (Token::IsEqualityOp(op())) {
- __ sub(r3, r3, r4);
+ __ SubP(r2, r2, r3);
__ Ret();
} else {
if (op() == Token::LT || op() == Token::LTE) {
- __ LoadSmiLiteral(r5, Smi::FromInt(GREATER));
+ __ LoadSmiLiteral(r4, Smi::FromInt(GREATER));
} else {
- __ LoadSmiLiteral(r5, Smi::FromInt(LESS));
+ __ LoadSmiLiteral(r4, Smi::FromInt(LESS));
}
- __ Push(r4, r3, r5);
+ __ Push(r3, r2, r4);
__ TailCallRuntime(Runtime::kCompare);
}
@@ -3350,56 +3307,49 @@ void CompareICStub::GenerateKnownReceivers(MacroAssembler* masm) {
GenerateMiss(masm);
}
-
void CompareICStub::GenerateMiss(MacroAssembler* masm) {
{
// Call the runtime system in a fresh internal frame.
- FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
- __ Push(r4, r3);
- __ Push(r4, r3);
+ FrameScope scope(masm, StackFrame::INTERNAL);
+ __ Push(r3, r2);
+ __ Push(r3, r2);
__ LoadSmiLiteral(r0, Smi::FromInt(op()));
__ push(r0);
__ CallRuntime(Runtime::kCompareIC_Miss);
// Compute the entry point of the rewritten stub.
- __ addi(r5, r3, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ AddP(r4, r2, Operand(Code::kHeaderSize - kHeapObjectTag));
// Restore registers.
- __ Pop(r4, r3);
+ __ Pop(r3, r2);
}
- __ JumpToJSEntry(r5);
+ __ JumpToJSEntry(r4);
}
-
// This stub is paired with DirectCEntryStub::GenerateCall
void DirectCEntryStub::Generate(MacroAssembler* masm) {
- // Place the return address on the stack, making the call
- // GC safe. The RegExp backend also relies on this.
- __ mflr(r0);
- __ StoreP(r0, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize));
- __ Call(ip); // Call the C++ function.
- __ LoadP(r0, MemOperand(sp, kStackFrameExtraParamSlot * kPointerSize));
- __ mtlr(r0);
- __ blr();
-}
+ __ CleanseP(r14);
+ // Statement positions are expected to be recorded when the target
+ // address is loaded.
+ __ positions_recorder()->WriteRecordedPositions();
+
+ __ b(ip); // Callee will return to R14 directly
+}
void DirectCEntryStub::GenerateCall(MacroAssembler* masm, Register target) {
- if (ABI_USES_FUNCTION_DESCRIPTORS) {
- // AIX/PPC64BE Linux use a function descriptor.
- __ LoadP(ToRegister(ABI_TOC_REGISTER), MemOperand(target, kPointerSize));
- __ LoadP(ip, MemOperand(target, 0)); // Instruction address
- } else {
- // ip needs to be set for DirectCEentryStub::Generate, and also
- // for ABI_CALL_VIA_IP.
- __ Move(ip, target);
- }
+#if ABI_USES_FUNCTION_DESCRIPTORS && !defined(USE_SIMULATOR)
+ // Native AIX/S390X Linux use a function descriptor.
+ __ LoadP(ToRegister(ABI_TOC_REGISTER), MemOperand(target, kPointerSize));
+ __ LoadP(target, MemOperand(target, 0)); // Instruction address
+#else
+ // ip needs to be set for DirectCEentryStub::Generate, and also
+ // for ABI_CALL_VIA_IP.
+ __ Move(ip, target);
+#endif
- intptr_t code = reinterpret_cast<intptr_t>(GetCode().location());
- __ mov(r0, Operand(code, RelocInfo::CODE_TARGET));
- __ Call(r0); // Call the stub.
+ __ call(GetCode(), RelocInfo::CODE_TARGET); // Call the stub.
}
-
void NameDictionaryLookupStub::GenerateNegativeLookup(
MacroAssembler* masm, Label* miss, Label* done, Register receiver,
Register properties, Handle<Name> name, Register scratch0) {
@@ -3415,42 +3365,39 @@ void NameDictionaryLookupStub::GenerateNegativeLookup(
Register index = scratch0;
// Capacity is smi 2^n.
__ LoadP(index, FieldMemOperand(properties, kCapacityOffset));
- __ subi(index, index, Operand(1));
+ __ SubP(index, Operand(1));
__ LoadSmiLiteral(
ip, Smi::FromInt(name->Hash() + NameDictionary::GetProbeOffset(i)));
- __ and_(index, index, ip);
+ __ AndP(index, ip);
// Scale the index by multiplying by the entry size.
STATIC_ASSERT(NameDictionary::kEntrySize == 3);
- __ ShiftLeftImm(ip, index, Operand(1));
- __ add(index, index, ip); // index *= 3.
+ __ ShiftLeftP(ip, index, Operand(1));
+ __ AddP(index, ip); // index *= 3.
Register entity_name = scratch0;
// Having undefined at this place means the name is not contained.
Register tmp = properties;
__ SmiToPtrArrayOffset(ip, index);
- __ add(tmp, properties, ip);
+ __ AddP(tmp, properties, ip);
__ LoadP(entity_name, FieldMemOperand(tmp, kElementsStartOffset));
DCHECK(!tmp.is(entity_name));
- __ LoadRoot(tmp, Heap::kUndefinedValueRootIndex);
- __ cmp(entity_name, tmp);
+ __ CompareRoot(entity_name, Heap::kUndefinedValueRootIndex);
__ beq(done);
- // Load the hole ready for use below:
- __ LoadRoot(tmp, Heap::kTheHoleValueRootIndex);
-
// Stop if found the property.
- __ Cmpi(entity_name, Operand(Handle<Name>(name)), r0);
+ __ CmpP(entity_name, Operand(Handle<Name>(name)));
__ beq(miss);
Label good;
- __ cmp(entity_name, tmp);
+ __ CompareRoot(entity_name, Heap::kTheHoleValueRootIndex);
__ beq(&good);
// Check if the entry name is not a unique name.
__ LoadP(entity_name, FieldMemOperand(entity_name, HeapObject::kMapOffset));
- __ lbz(entity_name, FieldMemOperand(entity_name, Map::kInstanceTypeOffset));
+ __ LoadlB(entity_name,
+ FieldMemOperand(entity_name, Map::kInstanceTypeOffset));
__ JumpIfNotUniqueNameInstanceType(entity_name, miss);
__ bind(&good);
@@ -3459,26 +3406,25 @@ void NameDictionaryLookupStub::GenerateNegativeLookup(
FieldMemOperand(receiver, JSObject::kPropertiesOffset));
}
- const int spill_mask = (r0.bit() | r9.bit() | r8.bit() | r7.bit() | r6.bit() |
- r5.bit() | r4.bit() | r3.bit());
+ const int spill_mask = (r0.bit() | r8.bit() | r7.bit() | r6.bit() | r5.bit() |
+ r4.bit() | r3.bit() | r2.bit());
- __ mflr(r0);
+ __ LoadRR(r0, r14);
__ MultiPush(spill_mask);
- __ LoadP(r3, FieldMemOperand(receiver, JSObject::kPropertiesOffset));
- __ mov(r4, Operand(Handle<Name>(name)));
+ __ LoadP(r2, FieldMemOperand(receiver, JSObject::kPropertiesOffset));
+ __ mov(r3, Operand(Handle<Name>(name)));
NameDictionaryLookupStub stub(masm->isolate(), NEGATIVE_LOOKUP);
__ CallStub(&stub);
- __ cmpi(r3, Operand::Zero());
+ __ CmpP(r2, Operand::Zero());
__ MultiPop(spill_mask); // MultiPop does not touch condition flags
- __ mtlr(r0);
+ __ LoadRR(r14, r0);
__ beq(done);
__ bne(miss);
}
-
// Probe the name dictionary in the |elements| register. Jump to the
// |done| label if a property with the given name is found. Jump to
// the |miss| label otherwise.
@@ -3496,95 +3442,95 @@ void NameDictionaryLookupStub::GeneratePositiveLookup(
// Compute the capacity mask.
__ LoadP(scratch1, FieldMemOperand(elements, kCapacityOffset));
__ SmiUntag(scratch1); // convert smi to int
- __ subi(scratch1, scratch1, Operand(1));
+ __ SubP(scratch1, Operand(1));
// Generate an unrolled loop that performs a few probes before
// giving up. Measurements done on Gmail indicate that 2 probes
// cover ~93% of loads from dictionaries.
for (int i = 0; i < kInlinedProbes; i++) {
// Compute the masked index: (hash + i + i * i) & mask.
- __ lwz(scratch2, FieldMemOperand(name, Name::kHashFieldOffset));
+ __ LoadlW(scratch2, FieldMemOperand(name, String::kHashFieldOffset));
if (i > 0) {
// Add the probe offset (i + i * i) left shifted to avoid right shifting
// the hash in a separate instruction. The value hash + i + i * i is right
// shifted in the following and instruction.
DCHECK(NameDictionary::GetProbeOffset(i) <
1 << (32 - Name::kHashFieldOffset));
- __ addi(scratch2, scratch2,
+ __ AddP(scratch2,
Operand(NameDictionary::GetProbeOffset(i) << Name::kHashShift));
}
- __ srwi(scratch2, scratch2, Operand(Name::kHashShift));
- __ and_(scratch2, scratch1, scratch2);
+ __ srl(scratch2, Operand(String::kHashShift));
+ __ AndP(scratch2, scratch1);
// Scale the index by multiplying by the entry size.
STATIC_ASSERT(NameDictionary::kEntrySize == 3);
// scratch2 = scratch2 * 3.
- __ ShiftLeftImm(ip, scratch2, Operand(1));
- __ add(scratch2, scratch2, ip);
+ __ ShiftLeftP(ip, scratch2, Operand(1));
+ __ AddP(scratch2, ip);
// Check if the key is identical to the name.
- __ ShiftLeftImm(ip, scratch2, Operand(kPointerSizeLog2));
- __ add(scratch2, elements, ip);
+ __ ShiftLeftP(ip, scratch2, Operand(kPointerSizeLog2));
+ __ AddP(scratch2, elements, ip);
__ LoadP(ip, FieldMemOperand(scratch2, kElementsStartOffset));
- __ cmp(name, ip);
+ __ CmpP(name, ip);
__ beq(done);
}
- const int spill_mask = (r0.bit() | r9.bit() | r8.bit() | r7.bit() | r6.bit() |
- r5.bit() | r4.bit() | r3.bit()) &
+ const int spill_mask = (r0.bit() | r8.bit() | r7.bit() | r6.bit() | r5.bit() |
+ r4.bit() | r3.bit() | r2.bit()) &
~(scratch1.bit() | scratch2.bit());
- __ mflr(r0);
+ __ LoadRR(r0, r14);
__ MultiPush(spill_mask);
- if (name.is(r3)) {
- DCHECK(!elements.is(r4));
- __ mr(r4, name);
- __ mr(r3, elements);
+ if (name.is(r2)) {
+ DCHECK(!elements.is(r3));
+ __ LoadRR(r3, name);
+ __ LoadRR(r2, elements);
} else {
- __ mr(r3, elements);
- __ mr(r4, name);
+ __ LoadRR(r2, elements);
+ __ LoadRR(r3, name);
}
NameDictionaryLookupStub stub(masm->isolate(), POSITIVE_LOOKUP);
__ CallStub(&stub);
- __ cmpi(r3, Operand::Zero());
- __ mr(scratch2, r5);
+ __ LoadRR(r1, r2);
+ __ LoadRR(scratch2, r4);
__ MultiPop(spill_mask);
- __ mtlr(r0);
+ __ LoadRR(r14, r0);
+ __ CmpP(r1, Operand::Zero());
__ bne(done);
__ beq(miss);
}
-
void NameDictionaryLookupStub::Generate(MacroAssembler* masm) {
// This stub overrides SometimesSetsUpAFrame() to return false. That means
// we cannot call anything that could cause a GC from this stub.
// Registers:
// result: NameDictionary to probe
- // r4: key
+ // r3: key
// dictionary: NameDictionary to probe.
// index: will hold an index of entry if lookup is successful.
// might alias with result_.
// Returns:
// result_ is zero if lookup failed, non zero otherwise.
- Register result = r3;
- Register dictionary = r3;
- Register key = r4;
- Register index = r5;
- Register mask = r6;
- Register hash = r7;
- Register undefined = r8;
- Register entry_key = r9;
- Register scratch = r9;
+ Register result = r2;
+ Register dictionary = r2;
+ Register key = r3;
+ Register index = r4;
+ Register mask = r5;
+ Register hash = r6;
+ Register undefined = r7;
+ Register entry_key = r8;
+ Register scratch = r8;
Label in_dictionary, maybe_in_dictionary, not_in_dictionary;
__ LoadP(mask, FieldMemOperand(dictionary, kCapacityOffset));
__ SmiUntag(mask);
- __ subi(mask, mask, Operand(1));
+ __ SubP(mask, Operand(1));
- __ lwz(hash, FieldMemOperand(key, Name::kHashFieldOffset));
+ __ LoadlW(hash, FieldMemOperand(key, String::kHashFieldOffset));
__ LoadRoot(undefined, Heap::kUndefinedValueRootIndex);
@@ -3597,35 +3543,36 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) {
// shifted in the following and instruction.
DCHECK(NameDictionary::GetProbeOffset(i) <
1 << (32 - Name::kHashFieldOffset));
- __ addi(index, hash,
+ __ AddP(index, hash,
Operand(NameDictionary::GetProbeOffset(i) << Name::kHashShift));
} else {
- __ mr(index, hash);
+ __ LoadRR(index, hash);
}
- __ srwi(r0, index, Operand(Name::kHashShift));
- __ and_(index, mask, r0);
+ __ ShiftRight(r0, index, Operand(String::kHashShift));
+ __ AndP(index, r0, mask);
// Scale the index by multiplying by the entry size.
STATIC_ASSERT(NameDictionary::kEntrySize == 3);
- __ ShiftLeftImm(scratch, index, Operand(1));
- __ add(index, index, scratch); // index *= 3.
+ __ ShiftLeftP(scratch, index, Operand(1));
+ __ AddP(index, scratch); // index *= 3.
- __ ShiftLeftImm(scratch, index, Operand(kPointerSizeLog2));
- __ add(index, dictionary, scratch);
+ __ ShiftLeftP(scratch, index, Operand(kPointerSizeLog2));
+ __ AddP(index, dictionary, scratch);
__ LoadP(entry_key, FieldMemOperand(index, kElementsStartOffset));
// Having undefined at this place means the name is not contained.
- __ cmp(entry_key, undefined);
+ __ CmpP(entry_key, undefined);
__ beq(&not_in_dictionary);
// Stop if found the property.
- __ cmp(entry_key, key);
+ __ CmpP(entry_key, key);
__ beq(&in_dictionary);
if (i != kTotalProbes - 1 && mode() == NEGATIVE_LOOKUP) {
// Check if the entry name is not a unique name.
__ LoadP(entry_key, FieldMemOperand(entry_key, HeapObject::kMapOffset));
- __ lbz(entry_key, FieldMemOperand(entry_key, Map::kInstanceTypeOffset));
+ __ LoadlB(entry_key,
+ FieldMemOperand(entry_key, Map::kInstanceTypeOffset));
__ JumpIfNotUniqueNameInstanceType(entry_key, &maybe_in_dictionary);
}
}
@@ -3635,20 +3582,19 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) {
// treated as a lookup success. For positive lookup probing failure
// should be treated as lookup failure.
if (mode() == POSITIVE_LOOKUP) {
- __ li(result, Operand::Zero());
+ __ LoadImmP(result, Operand::Zero());
__ Ret();
}
__ bind(&in_dictionary);
- __ li(result, Operand(1));
+ __ LoadImmP(result, Operand(1));
__ Ret();
__ bind(&not_in_dictionary);
- __ li(result, Operand::Zero());
+ __ LoadImmP(result, Operand::Zero());
__ Ret();
}
-
void StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime(
Isolate* isolate) {
StoreBufferOverflowStub stub1(isolate, kDontSaveFPRegs);
@@ -3658,7 +3604,6 @@ void StoreBufferOverflowStub::GenerateFixedRegStubsAheadOfTime(
stub2.GetCode();
}
-
// Takes the input in 3 registers: address_ value_ and object_. A pointer to
// the value has just been written into the object, now this stub makes sure
// we keep the GC informed. The word in the object where the value has been
@@ -3674,9 +3619,8 @@ void RecordWriteStub::Generate(MacroAssembler* masm) {
// See RecordWriteStub::Patch for details.
// Clear the bit, branch on True for NOP action initially
- __ crclr(Assembler::encode_crbit(cr2, CR_LT));
- __ blt(&skip_to_incremental_noncompacting, cr2);
- __ blt(&skip_to_incremental_compacting, cr2);
+ __ b(CC_NOP, &skip_to_incremental_noncompacting);
+ __ b(CC_NOP, &skip_to_incremental_compacting);
if (remembered_set_action() == EMIT_REMEMBERED_SET) {
__ RememberedSetHelper(object(), address(), value(), save_fp_regs_mode(),
@@ -3692,10 +3636,9 @@ void RecordWriteStub::Generate(MacroAssembler* masm) {
// Initial mode of the stub is expected to be STORE_BUFFER_ONLY.
// Will be checked in IncrementalMarking::ActivateGeneratedStub.
- // patching not required on PPC as the initial path is effectively NOP
+ // patching not required on S390 as the initial path is effectively NOP
}
-
void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) {
regs_.Save(masm);
@@ -3728,19 +3671,18 @@ void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) {
__ Ret();
}
-
void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm) {
regs_.SaveCallerSaveRegisters(masm, save_fp_regs_mode());
int argument_count = 3;
__ PrepareCallCFunction(argument_count, regs_.scratch0());
Register address =
- r3.is(regs_.address()) ? regs_.scratch0() : regs_.address();
+ r2.is(regs_.address()) ? regs_.scratch0() : regs_.address();
DCHECK(!address.is(regs_.object()));
- DCHECK(!address.is(r3));
- __ mr(address, regs_.address());
- __ mr(r3, regs_.object());
- __ mr(r4, address);
- __ mov(r5, Operand(ExternalReference::isolate_address(isolate())));
+ DCHECK(!address.is(r2));
+ __ LoadRR(address, regs_.address());
+ __ LoadRR(r2, regs_.object());
+ __ LoadRR(r3, address);
+ __ mov(r4, Operand(ExternalReference::isolate_address(isolate())));
AllowExternalCallThatCantCauseGC scope(masm);
__ CallCFunction(
@@ -3749,7 +3691,6 @@ void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm) {
regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode());
}
-
void RecordWriteStub::CheckNeedsToInformIncrementalMarker(
MacroAssembler* masm, OnNoNeedToInformIncrementalMarker on_no_need,
Mode mode) {
@@ -3758,16 +3699,15 @@ void RecordWriteStub::CheckNeedsToInformIncrementalMarker(
Label need_incremental_pop_scratch;
DCHECK((~Page::kPageAlignmentMask & 0xffff) == 0);
- __ lis(r0, Operand((~Page::kPageAlignmentMask >> 16)));
- __ and_(regs_.scratch0(), regs_.object(), r0);
+ __ AndP(regs_.scratch0(), regs_.object(), Operand(~Page::kPageAlignmentMask));
__ LoadP(
regs_.scratch1(),
MemOperand(regs_.scratch0(), MemoryChunk::kWriteBarrierCounterOffset));
- __ subi(regs_.scratch1(), regs_.scratch1(), Operand(1));
+ __ SubP(regs_.scratch1(), regs_.scratch1(), Operand(1));
__ StoreP(
regs_.scratch1(),
MemOperand(regs_.scratch0(), MemoryChunk::kWriteBarrierCounterOffset));
- __ cmpi(regs_.scratch1(), Operand::Zero()); // PPC, we could do better here
+ __ CmpP(regs_.scratch1(), Operand::Zero()); // S390, we could do better here
__ blt(&need_incremental);
// Let's look at the color of the object: If it is not black we don't have
@@ -3829,52 +3769,45 @@ void RecordWriteStub::CheckNeedsToInformIncrementalMarker(
// Fall through when we need to inform the incremental marker.
}
-
void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
CEntryStub ces(isolate(), 1, kSaveFPRegs);
__ Call(ces.GetCode(), RelocInfo::CODE_TARGET);
int parameter_count_offset =
StubFailureTrampolineFrame::kCallerStackParameterCountFrameOffset;
- __ LoadP(r4, MemOperand(fp, parameter_count_offset));
+ __ LoadP(r3, MemOperand(fp, parameter_count_offset));
if (function_mode() == JS_FUNCTION_STUB_MODE) {
- __ addi(r4, r4, Operand(1));
+ __ AddP(r3, Operand(1));
}
masm->LeaveFrame(StackFrame::STUB_FAILURE_TRAMPOLINE);
- __ slwi(r4, r4, Operand(kPointerSizeLog2));
- __ add(sp, sp, r4);
+ __ ShiftLeftP(r3, r3, Operand(kPointerSizeLog2));
+ __ la(sp, MemOperand(r3, sp));
__ Ret();
}
-
void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
__ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
LoadICStub stub(isolate(), state());
stub.GenerateForTrampoline(masm);
}
-
void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) {
__ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
KeyedLoadICStub stub(isolate(), state());
stub.GenerateForTrampoline(masm);
}
-
void CallICTrampolineStub::Generate(MacroAssembler* masm) {
- __ EmitLoadTypeFeedbackVector(r5);
+ __ EmitLoadTypeFeedbackVector(r4);
CallICStub stub(isolate(), state());
__ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
}
-
void LoadICStub::Generate(MacroAssembler* masm) { GenerateImpl(masm, false); }
-
void LoadICStub::GenerateForTrampoline(MacroAssembler* masm) {
GenerateImpl(masm, true);
}
-
static void HandleArrayCases(MacroAssembler* masm, Register feedback,
Register receiver_map, Register scratch1,
Register scratch2, bool is_polymorphic,
@@ -3888,16 +3821,15 @@ static void HandleArrayCases(MacroAssembler* masm, Register feedback,
__ LoadP(cached_map,
FieldMemOperand(feedback, FixedArray::OffsetOfElementAt(0)));
__ LoadP(cached_map, FieldMemOperand(cached_map, WeakCell::kValueOffset));
- __ cmp(receiver_map, cached_map);
- __ bne(&start_polymorphic);
+ __ CmpP(receiver_map, cached_map);
+ __ bne(&start_polymorphic, Label::kNear);
// found, now call handler.
Register handler = feedback;
__ LoadP(handler,
FieldMemOperand(feedback, FixedArray::OffsetOfElementAt(1)));
- __ addi(ip, handler, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ AddP(ip, handler, Operand(Code::kHeaderSize - kHeapObjectTag));
__ Jump(ip);
-
Register length = scratch2;
__ bind(&start_polymorphic);
__ LoadP(length, FieldMemOperand(feedback, FixedArray::kLengthOffset));
@@ -3922,30 +3854,29 @@ static void HandleArrayCases(MacroAssembler* masm, Register feedback,
// also need receiver_map
// use cached_map (scratch1) to look in the weak map values.
__ SmiToPtrArrayOffset(r0, length);
- __ add(too_far, feedback, r0);
- __ addi(too_far, too_far, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
- __ addi(pointer_reg, feedback,
+ __ AddP(too_far, feedback, r0);
+ __ AddP(too_far, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
+ __ AddP(pointer_reg, feedback,
Operand(FixedArray::OffsetOfElementAt(2) - kHeapObjectTag));
__ bind(&next_loop);
__ LoadP(cached_map, MemOperand(pointer_reg));
__ LoadP(cached_map, FieldMemOperand(cached_map, WeakCell::kValueOffset));
- __ cmp(receiver_map, cached_map);
- __ bne(&prepare_next);
+ __ CmpP(receiver_map, cached_map);
+ __ bne(&prepare_next, Label::kNear);
__ LoadP(handler, MemOperand(pointer_reg, kPointerSize));
- __ addi(ip, handler, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ AddP(ip, handler, Operand(Code::kHeaderSize - kHeapObjectTag));
__ Jump(ip);
__ bind(&prepare_next);
- __ addi(pointer_reg, pointer_reg, Operand(kPointerSize * 2));
- __ cmp(pointer_reg, too_far);
- __ blt(&next_loop);
+ __ AddP(pointer_reg, Operand(kPointerSize * 2));
+ __ CmpP(pointer_reg, too_far);
+ __ blt(&next_loop, Label::kNear);
// We exhausted our array of map handler pairs.
__ b(miss);
}
-
static void HandleMonomorphicCase(MacroAssembler* masm, Register receiver,
Register receiver_map, Register feedback,
Register vector, Register slot,
@@ -3957,30 +3888,27 @@ static void HandleMonomorphicCase(MacroAssembler* masm, Register receiver,
Register cached_map = scratch;
// Move the weak map into the weak_cell register.
__ LoadP(cached_map, FieldMemOperand(feedback, WeakCell::kValueOffset));
- __ cmp(cached_map, receiver_map);
+ __ CmpP(cached_map, receiver_map);
__ bne(try_array);
Register handler = feedback;
- __ SmiToPtrArrayOffset(r0, slot);
- __ add(handler, vector, r0);
+ __ SmiToPtrArrayOffset(r1, slot);
__ LoadP(handler,
- FieldMemOperand(handler, FixedArray::kHeaderSize + kPointerSize));
- __ addi(ip, handler, Operand(Code::kHeaderSize - kHeapObjectTag));
+ FieldMemOperand(r1, vector, FixedArray::kHeaderSize + kPointerSize));
+ __ AddP(ip, handler, Operand(Code::kHeaderSize - kHeapObjectTag));
__ Jump(ip);
}
-
void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
- Register receiver = LoadWithVectorDescriptor::ReceiverRegister(); // r4
- Register name = LoadWithVectorDescriptor::NameRegister(); // r5
- Register vector = LoadWithVectorDescriptor::VectorRegister(); // r6
- Register slot = LoadWithVectorDescriptor::SlotRegister(); // r3
- Register feedback = r7;
- Register receiver_map = r8;
- Register scratch1 = r9;
+ Register receiver = LoadWithVectorDescriptor::ReceiverRegister(); // r3
+ Register name = LoadWithVectorDescriptor::NameRegister(); // r4
+ Register vector = LoadWithVectorDescriptor::VectorRegister(); // r5
+ Register slot = LoadWithVectorDescriptor::SlotRegister(); // r2
+ Register feedback = r6;
+ Register receiver_map = r7;
+ Register scratch1 = r8;
- __ SmiToPtrArrayOffset(r0, slot);
- __ add(feedback, vector, r0);
- __ LoadP(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize));
+ __ SmiToPtrArrayOffset(r1, slot);
+ __ LoadP(feedback, FieldMemOperand(r1, vector, FixedArray::kHeaderSize));
// Try to quickly handle the monomorphic case without knowing for sure
// if we have a weak cell in feedback. We do know it's safe to look
@@ -3994,8 +3922,8 @@ void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ bind(&try_array);
__ LoadP(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset));
__ CompareRoot(scratch1, Heap::kFixedArrayMapRootIndex);
- __ bne(&not_array);
- HandleArrayCases(masm, feedback, receiver_map, scratch1, r10, true, &miss);
+ __ bne(&not_array, Label::kNear);
+ HandleArrayCases(masm, feedback, receiver_map, scratch1, r9, true, &miss);
__ bind(&not_array);
__ CompareRoot(feedback, Heap::kmegamorphic_symbolRootIndex);
@@ -4004,7 +3932,7 @@ void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
Code::ComputeHandlerFlags(Code::LOAD_IC));
masm->isolate()->stub_cache()->GenerateProbe(masm, Code::LOAD_IC, code_flags,
receiver, name, feedback,
- receiver_map, scratch1, r10);
+ receiver_map, scratch1, r9);
__ bind(&miss);
LoadIC::GenerateMiss(masm);
@@ -4014,29 +3942,25 @@ void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ b(&compare_map);
}
-
void KeyedLoadICStub::Generate(MacroAssembler* masm) {
GenerateImpl(masm, false);
}
-
void KeyedLoadICStub::GenerateForTrampoline(MacroAssembler* masm) {
GenerateImpl(masm, true);
}
-
void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
- Register receiver = LoadWithVectorDescriptor::ReceiverRegister(); // r4
- Register key = LoadWithVectorDescriptor::NameRegister(); // r5
- Register vector = LoadWithVectorDescriptor::VectorRegister(); // r6
- Register slot = LoadWithVectorDescriptor::SlotRegister(); // r3
- Register feedback = r7;
- Register receiver_map = r8;
- Register scratch1 = r9;
+ Register receiver = LoadWithVectorDescriptor::ReceiverRegister(); // r3
+ Register key = LoadWithVectorDescriptor::NameRegister(); // r4
+ Register vector = LoadWithVectorDescriptor::VectorRegister(); // r5
+ Register slot = LoadWithVectorDescriptor::SlotRegister(); // r2
+ Register feedback = r6;
+ Register receiver_map = r7;
+ Register scratch1 = r8;
- __ SmiToPtrArrayOffset(r0, slot);
- __ add(feedback, vector, r0);
- __ LoadP(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize));
+ __ SmiToPtrArrayOffset(r1, slot);
+ __ LoadP(feedback, FieldMemOperand(r1, vector, FixedArray::kHeaderSize));
// Try to quickly handle the monomorphic case without knowing for sure
// if we have a weak cell in feedback. We do know it's safe to look
@@ -4055,7 +3979,7 @@ void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
// We have a polymorphic element handler.
Label polymorphic, try_poly_name;
__ bind(&polymorphic);
- HandleArrayCases(masm, feedback, receiver_map, scratch1, r10, true, &miss);
+ HandleArrayCases(masm, feedback, receiver_map, scratch1, r9, true, &miss);
__ bind(&not_array);
// Is it generic?
@@ -4067,15 +3991,14 @@ void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ bind(&try_poly_name);
// We might have a name in feedback, and a fixed array in the next slot.
- __ cmp(key, feedback);
+ __ CmpP(key, feedback);
__ bne(&miss);
// If the name comparison succeeded, we know we have a fixed array with
// at least one map/handler pair.
- __ SmiToPtrArrayOffset(r0, slot);
- __ add(feedback, vector, r0);
+ __ SmiToPtrArrayOffset(r1, slot);
__ LoadP(feedback,
- FieldMemOperand(feedback, FixedArray::kHeaderSize + kPointerSize));
- HandleArrayCases(masm, feedback, receiver_map, scratch1, r10, false, &miss);
+ FieldMemOperand(r1, vector, FixedArray::kHeaderSize + kPointerSize));
+ HandleArrayCases(masm, feedback, receiver_map, scratch1, r9, false, &miss);
__ bind(&miss);
KeyedLoadIC::GenerateMiss(masm);
@@ -4085,43 +4008,38 @@ void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ b(&compare_map);
}
-
void VectorStoreICTrampolineStub::Generate(MacroAssembler* masm) {
__ EmitLoadTypeFeedbackVector(VectorStoreICDescriptor::VectorRegister());
VectorStoreICStub stub(isolate(), state());
stub.GenerateForTrampoline(masm);
}
-
void VectorKeyedStoreICTrampolineStub::Generate(MacroAssembler* masm) {
__ EmitLoadTypeFeedbackVector(VectorStoreICDescriptor::VectorRegister());
VectorKeyedStoreICStub stub(isolate(), state());
stub.GenerateForTrampoline(masm);
}
-
void VectorStoreICStub::Generate(MacroAssembler* masm) {
GenerateImpl(masm, false);
}
-
void VectorStoreICStub::GenerateForTrampoline(MacroAssembler* masm) {
GenerateImpl(masm, true);
}
-
void VectorStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
- Register receiver = VectorStoreICDescriptor::ReceiverRegister(); // r4
- Register key = VectorStoreICDescriptor::NameRegister(); // r5
- Register vector = VectorStoreICDescriptor::VectorRegister(); // r6
- Register slot = VectorStoreICDescriptor::SlotRegister(); // r7
- DCHECK(VectorStoreICDescriptor::ValueRegister().is(r3)); // r3
- Register feedback = r8;
- Register receiver_map = r9;
- Register scratch1 = r10;
+ Register receiver = VectorStoreICDescriptor::ReceiverRegister(); // r3
+ Register key = VectorStoreICDescriptor::NameRegister(); // r4
+ Register vector = VectorStoreICDescriptor::VectorRegister(); // r5
+ Register slot = VectorStoreICDescriptor::SlotRegister(); // r6
+ DCHECK(VectorStoreICDescriptor::ValueRegister().is(r2)); // r2
+ Register feedback = r7;
+ Register receiver_map = r8;
+ Register scratch1 = r9;
__ SmiToPtrArrayOffset(r0, slot);
- __ add(feedback, vector, r0);
+ __ AddP(feedback, vector, r0);
__ LoadP(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize));
// Try to quickly handle the monomorphic case without knowing for sure
@@ -4138,7 +4056,7 @@ void VectorStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ CompareRoot(scratch1, Heap::kFixedArrayMapRootIndex);
__ bne(&not_array);
- Register scratch2 = r11;
+ Register scratch2 = ip;
HandleArrayCases(masm, feedback, receiver_map, scratch1, scratch2, true,
&miss);
@@ -4159,17 +4077,14 @@ void VectorStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ b(&compare_map);
}
-
void VectorKeyedStoreICStub::Generate(MacroAssembler* masm) {
GenerateImpl(masm, false);
}
-
void VectorKeyedStoreICStub::GenerateForTrampoline(MacroAssembler* masm) {
GenerateImpl(masm, true);
}
-
static void HandlePolymorphicStoreCase(MacroAssembler* masm, Register feedback,
Register receiver_map, Register scratch1,
Register scratch2, Label* miss) {
@@ -4194,22 +4109,22 @@ static void HandlePolymorphicStoreCase(MacroAssembler* masm, Register feedback,
// also need receiver_map
// use cached_map (scratch1) to look in the weak map values.
__ SmiToPtrArrayOffset(r0, too_far);
- __ add(too_far, feedback, r0);
- __ addi(too_far, too_far, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
- __ addi(pointer_reg, feedback,
+ __ AddP(too_far, feedback, r0);
+ __ AddP(too_far, too_far, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
+ __ AddP(pointer_reg, feedback,
Operand(FixedArray::OffsetOfElementAt(0) - kHeapObjectTag));
__ bind(&next_loop);
__ LoadP(cached_map, MemOperand(pointer_reg));
__ LoadP(cached_map, FieldMemOperand(cached_map, WeakCell::kValueOffset));
- __ cmp(receiver_map, cached_map);
+ __ CmpP(receiver_map, cached_map);
__ bne(&prepare_next);
// Is it a transitioning store?
__ LoadP(too_far, MemOperand(pointer_reg, kPointerSize));
__ CompareRoot(too_far, Heap::kUndefinedValueRootIndex);
__ bne(&transition_call);
__ LoadP(pointer_reg, MemOperand(pointer_reg, kPointerSize * 2));
- __ addi(ip, pointer_reg, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ AddP(ip, pointer_reg, Operand(Code::kHeaderSize - kHeapObjectTag));
__ Jump(ip);
__ bind(&transition_call);
@@ -4220,33 +4135,32 @@ static void HandlePolymorphicStoreCase(MacroAssembler* masm, Register feedback,
// Load the map into the correct register.
DCHECK(feedback.is(VectorStoreTransitionDescriptor::MapRegister()));
- __ mr(feedback, too_far);
+ __ LoadRR(feedback, too_far);
- __ addi(ip, receiver_map, Operand(Code::kHeaderSize - kHeapObjectTag));
+ __ AddP(ip, receiver_map, Operand(Code::kHeaderSize - kHeapObjectTag));
__ Jump(ip);
__ bind(&prepare_next);
- __ addi(pointer_reg, pointer_reg, Operand(kPointerSize * 3));
- __ cmpl(pointer_reg, too_far);
+ __ AddP(pointer_reg, pointer_reg, Operand(kPointerSize * 3));
+ __ CmpLogicalP(pointer_reg, too_far);
__ blt(&next_loop);
// We exhausted our array of map handler pairs.
__ b(miss);
}
-
void VectorKeyedStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
- Register receiver = VectorStoreICDescriptor::ReceiverRegister(); // r4
- Register key = VectorStoreICDescriptor::NameRegister(); // r5
- Register vector = VectorStoreICDescriptor::VectorRegister(); // r6
- Register slot = VectorStoreICDescriptor::SlotRegister(); // r7
- DCHECK(VectorStoreICDescriptor::ValueRegister().is(r3)); // r3
- Register feedback = r8;
- Register receiver_map = r9;
- Register scratch1 = r10;
+ Register receiver = VectorStoreICDescriptor::ReceiverRegister(); // r3
+ Register key = VectorStoreICDescriptor::NameRegister(); // r4
+ Register vector = VectorStoreICDescriptor::VectorRegister(); // r5
+ Register slot = VectorStoreICDescriptor::SlotRegister(); // r6
+ DCHECK(VectorStoreICDescriptor::ValueRegister().is(r2)); // r2
+ Register feedback = r7;
+ Register receiver_map = r8;
+ Register scratch1 = r9;
__ SmiToPtrArrayOffset(r0, slot);
- __ add(feedback, vector, r0);
+ __ AddP(feedback, vector, r0);
__ LoadP(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize));
// Try to quickly handle the monomorphic case without knowing for sure
@@ -4267,7 +4181,7 @@ void VectorKeyedStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
Label polymorphic, try_poly_name;
__ bind(&polymorphic);
- Register scratch2 = r11;
+ Register scratch2 = ip;
HandlePolymorphicStoreCase(masm, feedback, receiver_map, scratch1, scratch2,
&miss);
@@ -4282,12 +4196,12 @@ void VectorKeyedStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ bind(&try_poly_name);
// We might have a name in feedback, and a fixed array in the next slot.
- __ cmp(key, feedback);
+ __ CmpP(key, feedback);
__ bne(&miss);
// If the name comparison succeeded, we know we have a fixed array with
// at least one map/handler pair.
__ SmiToPtrArrayOffset(r0, slot);
- __ add(feedback, vector, r0);
+ __ AddP(feedback, vector, r0);
__ LoadP(feedback,
FieldMemOperand(feedback, FixedArray::kHeaderSize + kPointerSize));
HandleArrayCases(masm, feedback, receiver_map, scratch1, scratch2, false,
@@ -4301,52 +4215,61 @@ void VectorKeyedStoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
__ b(&compare_map);
}
-
void ProfileEntryHookStub::MaybeCallEntryHook(MacroAssembler* masm) {
if (masm->isolate()->function_entry_hook() != NULL) {
PredictableCodeSizeScope predictable(masm,
-#if V8_TARGET_ARCH_PPC64
- 14 * Assembler::kInstrSize);
+#if V8_TARGET_ARCH_S390X
+ 40);
+#elif V8_HOST_ARCH_S390
+ 36);
#else
- 11 * Assembler::kInstrSize);
+ 32);
#endif
ProfileEntryHookStub stub(masm->isolate());
- __ mflr(r0);
- __ Push(r0, ip);
- __ CallStub(&stub);
- __ Pop(r0, ip);
- __ mtlr(r0);
+ __ CleanseP(r14);
+ __ Push(r14, ip);
+ __ CallStub(&stub); // BRASL
+ __ Pop(r14, ip);
}
}
-
void ProfileEntryHookStub::Generate(MacroAssembler* masm) {
- // The entry hook is a "push lr, ip" instruction, followed by a call.
+// The entry hook is a "push lr" instruction (LAY+ST/STG), followed by a call.
+#if V8_TARGET_ARCH_S390X
+ const int32_t kReturnAddressDistanceFromFunctionStart =
+ Assembler::kCallTargetAddressOffset + 18; // LAY + STG * 2
+#elif V8_HOST_ARCH_S390
+ const int32_t kReturnAddressDistanceFromFunctionStart =
+ Assembler::kCallTargetAddressOffset + 18; // NILH + LAY + ST * 2
+#else
const int32_t kReturnAddressDistanceFromFunctionStart =
- Assembler::kCallTargetAddressOffset + 3 * Assembler::kInstrSize;
+ Assembler::kCallTargetAddressOffset + 14; // LAY + ST * 2
+#endif
// This should contain all kJSCallerSaved registers.
const RegList kSavedRegs = kJSCallerSaved | // Caller saved registers.
- r15.bit(); // Saved stack pointer.
+ r7.bit(); // Saved stack pointer.
- // We also save lr, so the count here is one higher than the mask indicates.
- const int32_t kNumSavedRegs = kNumJSCallerSaved + 2;
+ // We also save r14+ip, so count here is one higher than the mask indicates.
+ const int32_t kNumSavedRegs = kNumJSCallerSaved + 3;
// Save all caller-save registers as this may be called from anywhere.
- __ mflr(ip);
+ __ CleanseP(r14);
+ __ LoadRR(ip, r14);
__ MultiPush(kSavedRegs | ip.bit());
// Compute the function's address for the first argument.
- __ subi(r3, ip, Operand(kReturnAddressDistanceFromFunctionStart));
+
+ __ SubP(r2, ip, Operand(kReturnAddressDistanceFromFunctionStart));
// The caller's return address is two slots above the saved temporaries.
// Grab that for the second argument to the hook.
- __ addi(r4, sp, Operand((kNumSavedRegs + 1) * kPointerSize));
+ __ lay(r3, MemOperand(sp, kNumSavedRegs * kPointerSize));
// Align the stack if necessary.
int frame_alignment = masm->ActivationFrameAlignment();
if (frame_alignment > kPointerSize) {
- __ mr(r15, sp);
+ __ LoadRR(r7, sp);
DCHECK(base::bits::IsPowerOfTwo32(frame_alignment));
__ ClearRightImm(sp, sp, Operand(WhichPowerOf2(frame_alignment)));
}
@@ -4354,45 +4277,51 @@ void ProfileEntryHookStub::Generate(MacroAssembler* masm) {
#if !defined(USE_SIMULATOR)
uintptr_t entry_hook =
reinterpret_cast<uintptr_t>(isolate()->function_entry_hook());
-#else
- // Under the simulator we need to indirect the entry hook through a
- // trampoline function at a known address.
- ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline));
- ExternalReference entry_hook = ExternalReference(
- &dispatcher, ExternalReference::BUILTIN_CALL, isolate());
-
- // It additionally takes an isolate as a third parameter
- __ mov(r5, Operand(ExternalReference::isolate_address(isolate())));
-#endif
-
__ mov(ip, Operand(entry_hook));
- if (ABI_USES_FUNCTION_DESCRIPTORS) {
- __ LoadP(ToRegister(ABI_TOC_REGISTER), MemOperand(ip, kPointerSize));
- __ LoadP(ip, MemOperand(ip, 0));
- }
- // ip set above, so nothing more to do for ABI_CALL_VIA_IP.
+#if ABI_USES_FUNCTION_DESCRIPTORS
+ // Function descriptor
+ __ LoadP(ToRegister(ABI_TOC_REGISTER), MemOperand(ip, kPointerSize));
+ __ LoadP(ip, MemOperand(ip, 0));
+// ip already set.
+#endif
+#endif
- // PPC LINUX ABI:
- __ li(r0, Operand::Zero());
- __ StorePU(r0, MemOperand(sp, -kNumRequiredStackFrameSlots * kPointerSize));
+ // zLinux ABI requires caller's frame to have sufficient space for callee
+ // preserved regsiter save area.
+ __ LoadImmP(r0, Operand::Zero());
+ __ StoreP(r0, MemOperand(sp, -kCalleeRegisterSaveAreaSize -
+ kNumRequiredStackFrameSlots * kPointerSize));
+ __ lay(sp, MemOperand(sp, -kCalleeRegisterSaveAreaSize -
+ kNumRequiredStackFrameSlots * kPointerSize));
+#if defined(USE_SIMULATOR)
+ // Under the simulator we need to indirect the entry hook through a
+ // trampoline function at a known address.
+ // It additionally takes an isolate as a third parameter
+ __ mov(r4, Operand(ExternalReference::isolate_address(isolate())));
+ ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline));
+ __ mov(ip, Operand(ExternalReference(
+ &dispatcher, ExternalReference::BUILTIN_CALL, isolate())));
+#endif
__ Call(ip);
- __ addi(sp, sp, Operand(kNumRequiredStackFrameSlots * kPointerSize));
+ // zLinux ABI requires caller's frame to have sufficient space for callee
+ // preserved regsiter save area.
+ __ la(sp, MemOperand(sp, kCalleeRegisterSaveAreaSize +
+ kNumRequiredStackFrameSlots * kPointerSize));
// Restore the stack pointer if needed.
if (frame_alignment > kPointerSize) {
- __ mr(sp, r15);
+ __ LoadRR(sp, r7);
}
// Also pop lr to get Ret(0).
__ MultiPop(kSavedRegs | ip.bit());
- __ mtlr(ip);
+ __ LoadRR(r14, ip);
__ Ret();
}
-
template <class T>
static void CreateArrayDispatch(MacroAssembler* masm,
AllocationSiteOverrideMode mode) {
@@ -4404,7 +4333,7 @@ static void CreateArrayDispatch(MacroAssembler* masm,
GetSequenceIndexFromFastElementsKind(TERMINAL_FAST_ELEMENTS_KIND);
for (int i = 0; i <= last_index; ++i) {
ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
- __ Cmpi(r6, Operand(kind), r0);
+ __ CmpP(r5, Operand(kind));
T stub(masm->isolate(), kind);
__ TailCallStub(&stub, eq);
}
@@ -4416,13 +4345,12 @@ static void CreateArrayDispatch(MacroAssembler* masm,
}
}
-
static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
AllocationSiteOverrideMode mode) {
- // r5 - allocation site (if mode != DISABLE_ALLOCATION_SITES)
- // r6 - kind (if mode != DISABLE_ALLOCATION_SITES)
- // r3 - number of arguments
- // r4 - constructor?
+ // r4 - allocation site (if mode != DISABLE_ALLOCATION_SITES)
+ // r5 - kind (if mode != DISABLE_ALLOCATION_SITES)
+ // r2 - number of arguments
+ // r3 - constructor?
// sp[0] - last argument
Label normal_sequence;
if (mode == DONT_OVERRIDE) {
@@ -4434,13 +4362,13 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
STATIC_ASSERT(FAST_HOLEY_DOUBLE_ELEMENTS == 5);
// is the low bit set? If so, we are holey and that is good.
- __ andi(r0, r6, Operand(1));
- __ bne(&normal_sequence, cr0);
+ __ AndP(r0, r5, Operand(1));
+ __ bne(&normal_sequence);
}
// look at the first argument
- __ LoadP(r8, MemOperand(sp, 0));
- __ cmpi(r8, Operand::Zero());
+ __ LoadP(r7, MemOperand(sp, 0));
+ __ CmpP(r7, Operand::Zero());
__ beq(&normal_sequence);
if (mode == DISABLE_ALLOCATION_SITES) {
@@ -4458,30 +4386,27 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
} else if (mode == DONT_OVERRIDE) {
// We are going to create a holey array, but our kind is non-holey.
// Fix kind and retry (only if we have an allocation site in the slot).
- __ addi(r6, r6, Operand(1));
-
+ __ AddP(r5, r5, Operand(1));
if (FLAG_debug_code) {
- __ LoadP(r8, FieldMemOperand(r5, 0));
- __ CompareRoot(r8, Heap::kAllocationSiteMapRootIndex);
+ __ LoadP(r7, FieldMemOperand(r4, 0));
+ __ CompareRoot(r7, Heap::kAllocationSiteMapRootIndex);
__ Assert(eq, kExpectedAllocationSite);
}
- // Save the resulting elements kind in type info. We can't just store r6
+ // Save the resulting elements kind in type info. We can't just store r5
// in the AllocationSite::transition_info field because elements kind is
// restricted to a portion of the field...upper bits need to be left alone.
STATIC_ASSERT(AllocationSite::ElementsKindBits::kShift == 0);
- __ LoadP(r7, FieldMemOperand(r5, AllocationSite::kTransitionInfoOffset));
- __ AddSmiLiteral(r7, r7, Smi::FromInt(kFastElementsKindPackedToHoley), r0);
- __ StoreP(r7, FieldMemOperand(r5, AllocationSite::kTransitionInfoOffset),
- r0);
+ __ LoadP(r6, FieldMemOperand(r4, AllocationSite::kTransitionInfoOffset));
+ __ AddSmiLiteral(r6, r6, Smi::FromInt(kFastElementsKindPackedToHoley), r0);
+ __ StoreP(r6, FieldMemOperand(r4, AllocationSite::kTransitionInfoOffset));
__ bind(&normal_sequence);
int last_index =
GetSequenceIndexFromFastElementsKind(TERMINAL_FAST_ELEMENTS_KIND);
for (int i = 0; i <= last_index; ++i) {
ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
- __ mov(r0, Operand(kind));
- __ cmp(r6, r0);
+ __ CmpP(r5, Operand(kind));
ArraySingleArgumentConstructorStub stub(masm->isolate(), kind);
__ TailCallStub(&stub, eq);
}
@@ -4493,7 +4418,6 @@ static void CreateArrayDispatchOneArgument(MacroAssembler* masm,
}
}
-
template <class T>
static void ArrayConstructorStubAheadOfTimeHelper(Isolate* isolate) {
int to_index =
@@ -4509,7 +4433,6 @@ static void ArrayConstructorStubAheadOfTimeHelper(Isolate* isolate) {
}
}
-
void ArrayConstructorStubBase::GenerateStubsAheadOfTime(Isolate* isolate) {
ArrayConstructorStubAheadOfTimeHelper<ArrayNoArgumentConstructorStub>(
isolate);
@@ -4519,7 +4442,6 @@ void ArrayConstructorStubBase::GenerateStubsAheadOfTime(Isolate* isolate) {
isolate);
}
-
void InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(
Isolate* isolate) {
ElementsKind kinds[2] = {FAST_ELEMENTS, FAST_HOLEY_ELEMENTS};
@@ -4534,17 +4456,16 @@ void InternalArrayConstructorStubBase::GenerateStubsAheadOfTime(
}
}
-
void ArrayConstructorStub::GenerateDispatchToArrayStub(
MacroAssembler* masm, AllocationSiteOverrideMode mode) {
if (argument_count() == ANY) {
Label not_zero_case, not_one_case;
- __ cmpi(r3, Operand::Zero());
+ __ CmpP(r2, Operand::Zero());
__ bne(&not_zero_case);
CreateArrayDispatch<ArrayNoArgumentConstructorStub>(masm, mode);
__ bind(&not_zero_case);
- __ cmpi(r3, Operand(1));
+ __ CmpP(r2, Operand(1));
__ bgt(&not_one_case);
CreateArrayDispatchOneArgument(masm, mode);
@@ -4561,13 +4482,12 @@ void ArrayConstructorStub::GenerateDispatchToArrayStub(
}
}
-
void ArrayConstructorStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r3 : argc (only if argument_count() == ANY)
- // -- r4 : constructor
- // -- r5 : AllocationSite or undefined
- // -- r6 : new target
+ // -- r2 : argc (only if argument_count() == ANY)
+ // -- r3 : constructor
+ // -- r4 : AllocationSite or undefined
+ // -- r5 : new target
// -- sp[0] : return address
// -- sp[4] : last argument
// -----------------------------------
@@ -4577,33 +4497,33 @@ void ArrayConstructorStub::Generate(MacroAssembler* masm) {
// builtin Array functions which always have maps.
// Initial map for the builtin Array function should be a map.
- __ LoadP(r7, FieldMemOperand(r4, JSFunction::kPrototypeOrInitialMapOffset));
+ __ LoadP(r6, FieldMemOperand(r3, JSFunction::kPrototypeOrInitialMapOffset));
// Will both indicate a NULL and a Smi.
- __ TestIfSmi(r7, r0);
+ __ TestIfSmi(r6);
__ Assert(ne, kUnexpectedInitialMapForArrayFunction, cr0);
- __ CompareObjectType(r7, r7, r8, MAP_TYPE);
+ __ CompareObjectType(r6, r6, r7, MAP_TYPE);
__ Assert(eq, kUnexpectedInitialMapForArrayFunction);
- // We should either have undefined in r5 or a valid AllocationSite
- __ AssertUndefinedOrAllocationSite(r5, r7);
+ // We should either have undefined in r4 or a valid AllocationSite
+ __ AssertUndefinedOrAllocationSite(r4, r6);
}
// Enter the context of the Array function.
- __ LoadP(cp, FieldMemOperand(r4, JSFunction::kContextOffset));
+ __ LoadP(cp, FieldMemOperand(r3, JSFunction::kContextOffset));
Label subclassing;
- __ cmp(r6, r4);
- __ bne(&subclassing);
+ __ CmpP(r5, r3);
+ __ bne(&subclassing, Label::kNear);
Label no_info;
// Get the elements kind and case on that.
- __ CompareRoot(r5, Heap::kUndefinedValueRootIndex);
+ __ CompareRoot(r4, Heap::kUndefinedValueRootIndex);
__ beq(&no_info);
- __ LoadP(r6, FieldMemOperand(r5, AllocationSite::kTransitionInfoOffset));
- __ SmiUntag(r6);
+ __ LoadP(r5, FieldMemOperand(r4, AllocationSite::kTransitionInfoOffset));
+ __ SmiUntag(r5);
STATIC_ASSERT(AllocationSite::ElementsKindBits::kShift == 0);
- __ And(r6, r6, Operand(AllocationSite::ElementsKindBits::kMask));
+ __ AndP(r5, Operand(AllocationSite::ElementsKindBits::kMask));
GenerateDispatchToArrayStub(masm, DONT_OVERRIDE);
__ bind(&no_info);
@@ -4613,28 +4533,27 @@ void ArrayConstructorStub::Generate(MacroAssembler* masm) {
switch (argument_count()) {
case ANY:
case MORE_THAN_ONE:
- __ ShiftLeftImm(r0, r3, Operand(kPointerSizeLog2));
- __ StorePX(r4, MemOperand(sp, r0));
- __ addi(r3, r3, Operand(3));
+ __ ShiftLeftP(r1, r2, Operand(kPointerSizeLog2));
+ __ StoreP(r3, MemOperand(sp, r1));
+ __ AddP(r2, r2, Operand(3));
break;
case NONE:
- __ StoreP(r4, MemOperand(sp, 0 * kPointerSize));
- __ li(r3, Operand(3));
+ __ StoreP(r3, MemOperand(sp, 0 * kPointerSize));
+ __ LoadImmP(r2, Operand(3));
break;
case ONE:
- __ StoreP(r4, MemOperand(sp, 1 * kPointerSize));
- __ li(r3, Operand(4));
+ __ StoreP(r3, MemOperand(sp, 1 * kPointerSize));
+ __ LoadImmP(r2, Operand(4));
break;
}
- __ Push(r6, r5);
+ __ Push(r5, r4);
__ JumpToExternalReference(ExternalReference(Runtime::kNewArray, isolate()));
}
-
void InternalArrayConstructorStub::GenerateCase(MacroAssembler* masm,
ElementsKind kind) {
- __ cmpli(r3, Operand(1));
+ __ CmpLogicalP(r2, Operand(1));
InternalArrayNoArgumentConstructorStub stub0(isolate(), kind);
__ TailCallStub(&stub0, lt);
@@ -4645,8 +4564,8 @@ void InternalArrayConstructorStub::GenerateCase(MacroAssembler* masm,
if (IsFastPackedElementsKind(kind)) {
// We might need to create a holey array
// look at the first argument
- __ LoadP(r6, MemOperand(sp, 0));
- __ cmpi(r6, Operand::Zero());
+ __ LoadP(r5, MemOperand(sp, 0));
+ __ CmpP(r5, Operand::Zero());
InternalArraySingleArgumentConstructorStub stub1_holey(
isolate(), GetHoleyElementsKind(kind));
@@ -4657,11 +4576,10 @@ void InternalArrayConstructorStub::GenerateCase(MacroAssembler* masm,
__ TailCallStub(&stub1);
}
-
void InternalArrayConstructorStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r3 : argc
- // -- r4 : constructor
+ // -- r2 : argc
+ // -- r3 : constructor
// -- sp[0] : return address
// -- sp[4] : last argument
// -----------------------------------
@@ -4671,32 +4589,32 @@ void InternalArrayConstructorStub::Generate(MacroAssembler* masm) {
// builtin Array functions which always have maps.
// Initial map for the builtin Array function should be a map.
- __ LoadP(r6, FieldMemOperand(r4, JSFunction::kPrototypeOrInitialMapOffset));
+ __ LoadP(r5, FieldMemOperand(r3, JSFunction::kPrototypeOrInitialMapOffset));
// Will both indicate a NULL and a Smi.
- __ TestIfSmi(r6, r0);
+ __ TestIfSmi(r5);
__ Assert(ne, kUnexpectedInitialMapForArrayFunction, cr0);
- __ CompareObjectType(r6, r6, r7, MAP_TYPE);
+ __ CompareObjectType(r5, r5, r6, MAP_TYPE);
__ Assert(eq, kUnexpectedInitialMapForArrayFunction);
}
// Figure out the right elements kind
- __ LoadP(r6, FieldMemOperand(r4, JSFunction::kPrototypeOrInitialMapOffset));
+ __ LoadP(r5, FieldMemOperand(r3, JSFunction::kPrototypeOrInitialMapOffset));
// Load the map's "bit field 2" into |result|.
- __ lbz(r6, FieldMemOperand(r6, Map::kBitField2Offset));
+ __ LoadlB(r5, FieldMemOperand(r5, Map::kBitField2Offset));
// Retrieve elements_kind from bit field 2.
- __ DecodeField<Map::ElementsKindBits>(r6);
+ __ DecodeField<Map::ElementsKindBits>(r5);
if (FLAG_debug_code) {
Label done;
- __ cmpi(r6, Operand(FAST_ELEMENTS));
+ __ CmpP(r5, Operand(FAST_ELEMENTS));
__ beq(&done);
- __ cmpi(r6, Operand(FAST_HOLEY_ELEMENTS));
+ __ CmpP(r5, Operand(FAST_HOLEY_ELEMENTS));
__ Assert(eq, kInvalidElementsKindForInternalArrayOrInternalPackedArray);
__ bind(&done);
}
Label fast_elements_case;
- __ cmpi(r6, Operand(FAST_ELEMENTS));
+ __ CmpP(r5, Operand(FAST_ELEMENTS));
__ beq(&fast_elements_case);
GenerateCase(masm, FAST_HOLEY_ELEMENTS);
@@ -4706,50 +4624,50 @@ void InternalArrayConstructorStub::Generate(MacroAssembler* masm) {
void FastNewObjectStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r4 : target
- // -- r6 : new target
+ // -- r3 : target
+ // -- r5 : new target
// -- cp : context
// -- lr : return address
// -----------------------------------
- __ AssertFunction(r4);
- __ AssertReceiver(r6);
+ __ AssertFunction(r3);
+ __ AssertReceiver(r5);
// Verify that the new target is a JSFunction.
Label new_object;
- __ CompareObjectType(r6, r5, r5, JS_FUNCTION_TYPE);
+ __ CompareObjectType(r5, r4, r4, JS_FUNCTION_TYPE);
__ bne(&new_object);
// Load the initial map and verify that it's in fact a map.
- __ LoadP(r5, FieldMemOperand(r6, JSFunction::kPrototypeOrInitialMapOffset));
- __ JumpIfSmi(r5, &new_object);
- __ CompareObjectType(r5, r3, r3, MAP_TYPE);
+ __ LoadP(r4, FieldMemOperand(r5, JSFunction::kPrototypeOrInitialMapOffset));
+ __ JumpIfSmi(r4, &new_object);
+ __ CompareObjectType(r4, r2, r2, MAP_TYPE);
__ bne(&new_object);
// Fall back to runtime if the target differs from the new target's
// initial map constructor.
- __ LoadP(r3, FieldMemOperand(r5, Map::kConstructorOrBackPointerOffset));
- __ cmp(r3, r4);
+ __ LoadP(r2, FieldMemOperand(r4, Map::kConstructorOrBackPointerOffset));
+ __ CmpP(r2, r3);
__ bne(&new_object);
// Allocate the JSObject on the heap.
Label allocate, done_allocate;
- __ lbz(r7, FieldMemOperand(r5, Map::kInstanceSizeOffset));
- __ Allocate(r7, r3, r8, r9, &allocate, SIZE_IN_WORDS);
+ __ LoadlB(r6, FieldMemOperand(r4, Map::kInstanceSizeOffset));
+ __ Allocate(r6, r2, r7, r8, &allocate, SIZE_IN_WORDS);
__ bind(&done_allocate);
// Initialize the JSObject fields.
- __ StoreP(r5, MemOperand(r3, JSObject::kMapOffset));
- __ LoadRoot(r6, Heap::kEmptyFixedArrayRootIndex);
- __ StoreP(r6, MemOperand(r3, JSObject::kPropertiesOffset));
- __ StoreP(r6, MemOperand(r3, JSObject::kElementsOffset));
+ __ StoreP(r4, MemOperand(r2, JSObject::kMapOffset));
+ __ LoadRoot(r5, Heap::kEmptyFixedArrayRootIndex);
+ __ StoreP(r5, MemOperand(r2, JSObject::kPropertiesOffset));
+ __ StoreP(r5, MemOperand(r2, JSObject::kElementsOffset));
STATIC_ASSERT(JSObject::kHeaderSize == 3 * kPointerSize);
- __ addi(r4, r3, Operand(JSObject::kHeaderSize));
+ __ AddP(r3, r2, Operand(JSObject::kHeaderSize));
// ----------- S t a t e -------------
- // -- r3 : result (untagged)
- // -- r4 : result fields (untagged)
- // -- r8 : result end (untagged)
- // -- r5 : initial map
+ // -- r2 : result (untagged)
+ // -- r3 : result fields (untagged)
+ // -- r7 : result end (untagged)
+ // -- r4 : initial map
// -- cp : context
// -- lr : return address
// -----------------------------------
@@ -4757,48 +4675,49 @@ void FastNewObjectStub::Generate(MacroAssembler* masm) {
// Perform in-object slack tracking if requested.
Label slack_tracking;
STATIC_ASSERT(Map::kNoSlackTracking == 0);
- __ LoadRoot(r9, Heap::kUndefinedValueRootIndex);
- __ lwz(r6, FieldMemOperand(r5, Map::kBitField3Offset));
- __ DecodeField<Map::ConstructionCounter>(r10, r6, SetRC);
- __ bne(&slack_tracking, cr0);
+ __ LoadRoot(r8, Heap::kUndefinedValueRootIndex);
+ __ LoadlW(r5, FieldMemOperand(r4, Map::kBitField3Offset));
+ __ DecodeField<Map::ConstructionCounter>(r9, r5);
+ __ LoadAndTestP(r9, r9);
+ __ bne(&slack_tracking);
{
// Initialize all in-object fields with undefined.
- __ InitializeFieldsWithFiller(r4, r8, r9);
+ __ InitializeFieldsWithFiller(r3, r7, r8);
// Add the object tag to make the JSObject real.
- __ addi(r3, r3, Operand(kHeapObjectTag));
+ __ AddP(r2, r2, Operand(kHeapObjectTag));
__ Ret();
}
__ bind(&slack_tracking);
{
// Decrease generous allocation count.
STATIC_ASSERT(Map::ConstructionCounter::kNext == 32);
- __ Add(r6, r6, -(1 << Map::ConstructionCounter::kShift), r0);
- __ stw(r6, FieldMemOperand(r5, Map::kBitField3Offset));
+ __ Add32(r5, r5, Operand(-(1 << Map::ConstructionCounter::kShift)));
+ __ StoreW(r5, FieldMemOperand(r4, Map::kBitField3Offset));
// Initialize the in-object fields with undefined.
- __ lbz(r7, FieldMemOperand(r5, Map::kUnusedPropertyFieldsOffset));
- __ ShiftLeftImm(r7, r7, Operand(kPointerSizeLog2));
- __ sub(r7, r8, r7);
- __ InitializeFieldsWithFiller(r4, r7, r9);
+ __ LoadlB(r6, FieldMemOperand(r4, Map::kUnusedPropertyFieldsOffset));
+ __ ShiftLeftP(r6, r6, Operand(kPointerSizeLog2));
+ __ SubP(r6, r7, r6);
+ __ InitializeFieldsWithFiller(r3, r6, r8);
// Initialize the remaining (reserved) fields with one pointer filler map.
- __ LoadRoot(r9, Heap::kOnePointerFillerMapRootIndex);
- __ InitializeFieldsWithFiller(r4, r8, r9);
+ __ LoadRoot(r8, Heap::kOnePointerFillerMapRootIndex);
+ __ InitializeFieldsWithFiller(r3, r7, r8);
// Add the object tag to make the JSObject real.
- __ addi(r3, r3, Operand(kHeapObjectTag));
+ __ AddP(r2, r2, Operand(kHeapObjectTag));
// Check if we can finalize the instance size.
- __ cmpi(r10, Operand(Map::kSlackTrackingCounterEnd));
+ __ CmpP(r9, Operand(Map::kSlackTrackingCounterEnd));
__ Ret(ne);
// Finalize the instance size.
{
FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
- __ Push(r3, r5);
+ __ Push(r2, r4);
__ CallRuntime(Runtime::kFinalizeInstanceSize);
- __ Pop(r3);
+ __ Pop(r2);
}
__ Ret();
}
@@ -4808,69 +4727,69 @@ void FastNewObjectStub::Generate(MacroAssembler* masm) {
{
FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
STATIC_ASSERT(kSmiTag == 0);
- __ ShiftLeftImm(r7, r7,
- Operand(kPointerSizeLog2 + kSmiTagSize + kSmiShiftSize));
- __ Push(r5, r7);
+ __ ShiftLeftP(r6, r6,
+ Operand(kPointerSizeLog2 + kSmiTagSize + kSmiShiftSize));
+ __ Push(r4, r6);
__ CallRuntime(Runtime::kAllocateInNewSpace);
- __ Pop(r5);
+ __ Pop(r4);
}
- __ subi(r3, r3, Operand(kHeapObjectTag));
- __ lbz(r8, FieldMemOperand(r5, Map::kInstanceSizeOffset));
- __ ShiftLeftImm(r8, r8, Operand(kPointerSizeLog2));
- __ add(r8, r3, r8);
+ __ SubP(r2, r2, Operand(kHeapObjectTag));
+ __ LoadlB(r7, FieldMemOperand(r4, Map::kInstanceSizeOffset));
+ __ ShiftLeftP(r7, r7, Operand(kPointerSizeLog2));
+ __ AddP(r7, r2, r7);
__ b(&done_allocate);
// Fall back to %NewObject.
__ bind(&new_object);
- __ Push(r4, r6);
+ __ Push(r3, r5);
__ TailCallRuntime(Runtime::kNewObject);
}
void FastNewRestParameterStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r4 : function
+ // -- r3 : function
// -- cp : context
// -- fp : frame pointer
// -- lr : return address
// -----------------------------------
- __ AssertFunction(r4);
+ __ AssertFunction(r3);
// For Ignition we need to skip all possible handler/stub frames until
// we reach the JavaScript frame for the function (similar to what the
- // runtime fallback implementation does). So make r5 point to that
+ // runtime fallback implementation does). So make r4 point to that
// JavaScript frame.
{
Label loop, loop_entry;
- __ mr(r5, fp);
+ __ LoadRR(r4, fp);
__ b(&loop_entry);
__ bind(&loop);
- __ LoadP(r5, MemOperand(r5, StandardFrameConstants::kCallerFPOffset));
+ __ LoadP(r4, MemOperand(r4, StandardFrameConstants::kCallerFPOffset));
__ bind(&loop_entry);
- __ LoadP(ip, MemOperand(r5, StandardFrameConstants::kMarkerOffset));
- __ cmp(ip, r4);
+ __ LoadP(ip, MemOperand(r4, StandardFrameConstants::kMarkerOffset));
+ __ CmpP(ip, r3);
__ bne(&loop);
}
// Check if we have rest parameters (only possible if we have an
// arguments adaptor frame below the function frame).
Label no_rest_parameters;
- __ LoadP(r5, MemOperand(r5, StandardFrameConstants::kCallerFPOffset));
- __ LoadP(ip, MemOperand(r5, StandardFrameConstants::kContextOffset));
+ __ LoadP(r4, MemOperand(r4, StandardFrameConstants::kCallerFPOffset));
+ __ LoadP(ip, MemOperand(r4, StandardFrameConstants::kContextOffset));
__ CmpSmiLiteral(ip, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR), r0);
__ bne(&no_rest_parameters);
// Check if the arguments adaptor frame contains more arguments than
// specified by the function's internal formal parameter count.
Label rest_parameters;
- __ LoadP(r3, MemOperand(r5, ArgumentsAdaptorFrameConstants::kLengthOffset));
- __ LoadP(r4, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
- __ LoadWordArith(
- r4, FieldMemOperand(r4, SharedFunctionInfo::kFormalParameterCountOffset));
-#if V8_TARGET_ARCH_PPC64
- __ SmiTag(r4);
+ __ LoadP(r2, MemOperand(r4, ArgumentsAdaptorFrameConstants::kLengthOffset));
+ __ LoadP(r3, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
+ __ LoadW(
+ r3, FieldMemOperand(r3, SharedFunctionInfo::kFormalParameterCountOffset));
+#if V8_TARGET_ARCH_S390X
+ __ SmiTag(r3);
#endif
- __ sub(r3, r3, r4, LeaveOE, SetRC);
- __ bgt(&rest_parameters, cr0);
+ __ SubP(r2, r2, r3);
+ __ bgt(&rest_parameters);
// Return an empty rest parameter array.
__ bind(&no_rest_parameters);
@@ -4882,17 +4801,17 @@ void FastNewRestParameterStub::Generate(MacroAssembler* masm) {
// Allocate an empty rest parameter array.
Label allocate, done_allocate;
- __ Allocate(JSArray::kSize, r3, r4, r5, &allocate, TAG_OBJECT);
+ __ Allocate(JSArray::kSize, r2, r3, r4, &allocate, TAG_OBJECT);
__ bind(&done_allocate);
// Setup the rest parameter array in r0.
- __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, r4);
- __ StoreP(r4, FieldMemOperand(r3, JSArray::kMapOffset), r0);
- __ LoadRoot(r4, Heap::kEmptyFixedArrayRootIndex);
- __ StoreP(r4, FieldMemOperand(r3, JSArray::kPropertiesOffset), r0);
- __ StoreP(r4, FieldMemOperand(r3, JSArray::kElementsOffset), r0);
- __ li(r4, Operand::Zero());
- __ StoreP(r4, FieldMemOperand(r3, JSArray::kLengthOffset), r0);
+ __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, r3);
+ __ StoreP(r3, FieldMemOperand(r2, JSArray::kMapOffset), r0);
+ __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
+ __ StoreP(r3, FieldMemOperand(r2, JSArray::kPropertiesOffset), r0);
+ __ StoreP(r3, FieldMemOperand(r2, JSArray::kElementsOffset), r0);
+ __ LoadImmP(r3, Operand::Zero());
+ __ StoreP(r3, FieldMemOperand(r2, JSArray::kLengthOffset), r0);
STATIC_ASSERT(JSArray::kSize == 4 * kPointerSize);
__ Ret();
@@ -4909,62 +4828,65 @@ void FastNewRestParameterStub::Generate(MacroAssembler* masm) {
__ bind(&rest_parameters);
{
// Compute the pointer to the first rest parameter (skippping the receiver).
- __ SmiToPtrArrayOffset(r9, r3);
- __ add(r5, r5, r9);
- __ addi(r5, r5, Operand(StandardFrameConstants::kCallerSPOffset));
+ __ SmiToPtrArrayOffset(r8, r2);
+ __ AddP(r4, r4, r8);
+ __ AddP(r4, r4, Operand(StandardFrameConstants::kCallerSPOffset));
// ----------- S t a t e -------------
// -- cp : context
- // -- r3 : number of rest parameters (tagged)
- // -- r5 : pointer just past first rest parameters
- // -- r9 : size of rest parameters
+ // -- r2 : number of rest parameters (tagged)
+ // -- r4 : pointer just past first rest parameters
+ // -- r8 : size of rest parameters
// -- lr : return address
// -----------------------------------
// Allocate space for the rest parameter array plus the backing store.
Label allocate, done_allocate;
- __ mov(r4, Operand(JSArray::kSize + FixedArray::kHeaderSize));
- __ add(r4, r4, r9);
- __ Allocate(r4, r6, r7, r8, &allocate, TAG_OBJECT);
+ __ mov(r3, Operand(JSArray::kSize + FixedArray::kHeaderSize));
+ __ AddP(r3, r3, r8);
+ __ Allocate(r3, r5, r6, r7, &allocate, TAG_OBJECT);
__ bind(&done_allocate);
- // Setup the elements array in r6.
- __ LoadRoot(r4, Heap::kFixedArrayMapRootIndex);
- __ StoreP(r4, FieldMemOperand(r6, FixedArray::kMapOffset), r0);
- __ StoreP(r3, FieldMemOperand(r6, FixedArray::kLengthOffset), r0);
- __ addi(r7, r6,
+ // Setup the elements array in r5.
+ __ LoadRoot(r3, Heap::kFixedArrayMapRootIndex);
+ __ StoreP(r3, FieldMemOperand(r5, FixedArray::kMapOffset), r0);
+ __ StoreP(r2, FieldMemOperand(r5, FixedArray::kLengthOffset), r0);
+ __ AddP(r6, r5,
Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
{
Label loop;
- __ SmiUntag(r0, r3);
- __ mtctr(r0);
+ __ SmiUntag(r1, r2);
+ // __ mtctr(r0);
__ bind(&loop);
- __ LoadPU(ip, MemOperand(r5, -kPointerSize));
- __ StorePU(ip, MemOperand(r7, kPointerSize));
- __ bdnz(&loop);
- __ addi(r7, r7, Operand(kPointerSize));
+ __ lay(r4, MemOperand(r4, -kPointerSize));
+ __ LoadP(ip, MemOperand(r4));
+ __ la(r6, MemOperand(r6, kPointerSize));
+ __ StoreP(ip, MemOperand(r6));
+ // __ bdnz(&loop);
+ __ BranchOnCount(r1, &loop);
+ __ AddP(r6, r6, Operand(kPointerSize));
}
- // Setup the rest parameter array in r7.
- __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, r4);
- __ StoreP(r4, MemOperand(r7, JSArray::kMapOffset));
- __ LoadRoot(r4, Heap::kEmptyFixedArrayRootIndex);
- __ StoreP(r4, MemOperand(r7, JSArray::kPropertiesOffset));
- __ StoreP(r6, MemOperand(r7, JSArray::kElementsOffset));
- __ StoreP(r3, MemOperand(r7, JSArray::kLengthOffset));
+ // Setup the rest parameter array in r6.
+ __ LoadNativeContextSlot(Context::JS_ARRAY_FAST_ELEMENTS_MAP_INDEX, r3);
+ __ StoreP(r3, MemOperand(r6, JSArray::kMapOffset));
+ __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
+ __ StoreP(r3, MemOperand(r6, JSArray::kPropertiesOffset));
+ __ StoreP(r5, MemOperand(r6, JSArray::kElementsOffset));
+ __ StoreP(r2, MemOperand(r6, JSArray::kLengthOffset));
STATIC_ASSERT(JSArray::kSize == 4 * kPointerSize);
- __ addi(r3, r7, Operand(kHeapObjectTag));
+ __ AddP(r2, r6, Operand(kHeapObjectTag));
__ Ret();
// Fall back to %AllocateInNewSpace.
__ bind(&allocate);
{
FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
- __ SmiTag(r4);
- __ Push(r3, r5, r4);
+ __ SmiTag(r3);
+ __ Push(r2, r4, r3);
__ CallRuntime(Runtime::kAllocateInNewSpace);
- __ mr(r6, r3);
- __ Pop(r3, r5);
+ __ LoadRR(r5, r2);
+ __ Pop(r2, r4);
}
__ b(&done_allocate);
}
@@ -4972,63 +4894,59 @@ void FastNewRestParameterStub::Generate(MacroAssembler* masm) {
void FastNewSloppyArgumentsStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r4 : function
+ // -- r3 : function
// -- cp : context
// -- fp : frame pointer
// -- lr : return address
// -----------------------------------
- __ AssertFunction(r4);
+ __ AssertFunction(r3);
// TODO(bmeurer): Cleanup to match the FastNewStrictArgumentsStub.
- __ LoadP(r5, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
- __ LoadWordArith(
- r5, FieldMemOperand(r5, SharedFunctionInfo::kFormalParameterCountOffset));
-#if V8_TARGET_ARCH_PPC64
- __ SmiTag(r5);
+ __ LoadP(r4, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
+ __ LoadW(
+ r4, FieldMemOperand(r4, SharedFunctionInfo::kFormalParameterCountOffset));
+#if V8_TARGET_ARCH_S390X
+ __ SmiTag(r4);
#endif
- __ SmiToPtrArrayOffset(r6, r5);
- __ add(r6, fp, r6);
- __ addi(r6, r6, Operand(StandardFrameConstants::kCallerSPOffset));
+ __ SmiToPtrArrayOffset(r5, r4);
+ __ AddP(r5, fp, r5);
+ __ AddP(r5, r5, Operand(StandardFrameConstants::kCallerSPOffset));
- // r4 : function
- // r5 : number of parameters (tagged)
- // r6 : parameters pointer
+ // r3 : function
+ // r4 : number of parameters (tagged)
+ // r5 : parameters pointer
// Registers used over whole function:
- // r8 : arguments count (tagged)
- // r9 : mapped parameter count (tagged)
+ // r7 : arguments count (tagged)
+ // r8 : mapped parameter count (tagged)
// Check if the calling frame is an arguments adaptor frame.
Label adaptor_frame, try_allocate, runtime;
- __ LoadP(r7, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
- __ LoadP(r3, MemOperand(r7, StandardFrameConstants::kContextOffset));
- __ CmpSmiLiteral(r3, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR), r0);
+ __ LoadP(r6, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
+ __ LoadP(r2, MemOperand(r6, StandardFrameConstants::kContextOffset));
+ __ CmpSmiLiteral(r2, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR), r0);
__ beq(&adaptor_frame);
// No adaptor, parameter count = argument count.
- __ mr(r8, r5);
- __ mr(r9, r5);
+ __ LoadRR(r7, r4);
+ __ LoadRR(r8, r4);
__ b(&try_allocate);
// We have an adaptor frame. Patch the parameters pointer.
__ bind(&adaptor_frame);
- __ LoadP(r8, MemOperand(r7, ArgumentsAdaptorFrameConstants::kLengthOffset));
- __ SmiToPtrArrayOffset(r6, r8);
- __ add(r6, r6, r7);
- __ addi(r6, r6, Operand(StandardFrameConstants::kCallerSPOffset));
-
- // r8 = argument count (tagged)
- // r9 = parameter count (tagged)
- // Compute the mapped parameter count = min(r5, r8) in r9.
- __ cmp(r5, r8);
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ isel(lt, r9, r5, r8);
- } else {
- Label skip;
- __ mr(r9, r5);
- __ blt(&skip);
- __ mr(r9, r8);
- __ bind(&skip);
- }
+ __ LoadP(r7, MemOperand(r6, ArgumentsAdaptorFrameConstants::kLengthOffset));
+ __ SmiToPtrArrayOffset(r5, r7);
+ __ AddP(r5, r5, r6);
+ __ AddP(r5, r5, Operand(StandardFrameConstants::kCallerSPOffset));
+
+ // r7 = argument count (tagged)
+ // r8 = parameter count (tagged)
+ // Compute the mapped parameter count = min(r4, r7) in r8.
+ __ CmpP(r4, r7);
+ Label skip;
+ __ LoadRR(r8, r4);
+ __ blt(&skip);
+ __ LoadRR(r8, r7);
+ __ bind(&skip);
__ bind(&try_allocate);
@@ -5037,112 +4955,95 @@ void FastNewSloppyArgumentsStub::Generate(MacroAssembler* masm) {
const int kParameterMapHeaderSize =
FixedArray::kHeaderSize + 2 * kPointerSize;
// If there are no mapped parameters, we do not need the parameter_map.
- __ CmpSmiLiteral(r9, Smi::FromInt(0), r0);
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ SmiToPtrArrayOffset(r11, r9);
- __ addi(r11, r11, Operand(kParameterMapHeaderSize));
- __ isel(eq, r11, r0, r11);
- } else {
- Label skip2, skip3;
- __ bne(&skip2);
- __ li(r11, Operand::Zero());
- __ b(&skip3);
- __ bind(&skip2);
- __ SmiToPtrArrayOffset(r11, r9);
- __ addi(r11, r11, Operand(kParameterMapHeaderSize));
- __ bind(&skip3);
- }
+ __ CmpSmiLiteral(r8, Smi::FromInt(0), r0);
+ Label skip2, skip3;
+ __ bne(&skip2);
+ __ LoadImmP(r1, Operand::Zero());
+ __ b(&skip3);
+ __ bind(&skip2);
+ __ SmiToPtrArrayOffset(r1, r8);
+ __ AddP(r1, r1, Operand(kParameterMapHeaderSize));
+ __ bind(&skip3);
// 2. Backing store.
- __ SmiToPtrArrayOffset(r7, r8);
- __ add(r11, r11, r7);
- __ addi(r11, r11, Operand(FixedArray::kHeaderSize));
+ __ SmiToPtrArrayOffset(r6, r7);
+ __ AddP(r1, r1, r6);
+ __ AddP(r1, r1, Operand(FixedArray::kHeaderSize));
// 3. Arguments object.
- __ addi(r11, r11, Operand(JSSloppyArgumentsObject::kSize));
+ __ AddP(r1, r1, Operand(JSSloppyArgumentsObject::kSize));
// Do the allocation of all three objects in one go.
- __ Allocate(r11, r3, r11, r7, &runtime, TAG_OBJECT);
+ __ Allocate(r1, r2, r1, r6, &runtime, TAG_OBJECT);
- // r3 = address of new object(s) (tagged)
- // r5 = argument count (smi-tagged)
- // Get the arguments boilerplate from the current native context into r4.
+ // r2 = address of new object(s) (tagged)
+ // r4 = argument count (smi-tagged)
+ // Get the arguments boilerplate from the current native context into r3.
const int kNormalOffset =
Context::SlotOffset(Context::SLOPPY_ARGUMENTS_MAP_INDEX);
const int kAliasedOffset =
Context::SlotOffset(Context::FAST_ALIASED_ARGUMENTS_MAP_INDEX);
- __ LoadP(r7, NativeContextMemOperand());
- __ cmpi(r9, Operand::Zero());
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ LoadP(r11, MemOperand(r7, kNormalOffset));
- __ LoadP(r7, MemOperand(r7, kAliasedOffset));
- __ isel(eq, r7, r11, r7);
- } else {
- Label skip4, skip5;
- __ bne(&skip4);
- __ LoadP(r7, MemOperand(r7, kNormalOffset));
- __ b(&skip5);
- __ bind(&skip4);
- __ LoadP(r7, MemOperand(r7, kAliasedOffset));
- __ bind(&skip5);
- }
-
- // r3 = address of new object (tagged)
- // r5 = argument count (smi-tagged)
- // r7 = address of arguments map (tagged)
- // r9 = mapped parameter count (tagged)
- __ StoreP(r7, FieldMemOperand(r3, JSObject::kMapOffset), r0);
- __ LoadRoot(r11, Heap::kEmptyFixedArrayRootIndex);
- __ StoreP(r11, FieldMemOperand(r3, JSObject::kPropertiesOffset), r0);
- __ StoreP(r11, FieldMemOperand(r3, JSObject::kElementsOffset), r0);
+ __ LoadP(r6, NativeContextMemOperand());
+ __ CmpP(r8, Operand::Zero());
+ Label skip4, skip5;
+ __ bne(&skip4);
+ __ LoadP(r6, MemOperand(r6, kNormalOffset));
+ __ b(&skip5);
+ __ bind(&skip4);
+ __ LoadP(r6, MemOperand(r6, kAliasedOffset));
+ __ bind(&skip5);
+
+ // r2 = address of new object (tagged)
+ // r4 = argument count (smi-tagged)
+ // r6 = address of arguments map (tagged)
+ // r8 = mapped parameter count (tagged)
+ __ StoreP(r6, FieldMemOperand(r2, JSObject::kMapOffset), r0);
+ __ LoadRoot(r1, Heap::kEmptyFixedArrayRootIndex);
+ __ StoreP(r1, FieldMemOperand(r2, JSObject::kPropertiesOffset), r0);
+ __ StoreP(r1, FieldMemOperand(r2, JSObject::kElementsOffset), r0);
// Set up the callee in-object property.
- __ AssertNotSmi(r4);
- __ StoreP(r4, FieldMemOperand(r3, JSSloppyArgumentsObject::kCalleeOffset),
+ __ AssertNotSmi(r3);
+ __ StoreP(r3, FieldMemOperand(r2, JSSloppyArgumentsObject::kCalleeOffset),
r0);
// Use the length (smi tagged) and set that as an in-object property too.
- __ AssertSmi(r8);
- __ StoreP(r8, FieldMemOperand(r3, JSSloppyArgumentsObject::kLengthOffset),
+ __ AssertSmi(r7);
+ __ StoreP(r7, FieldMemOperand(r2, JSSloppyArgumentsObject::kLengthOffset),
r0);
// Set up the elements pointer in the allocated arguments object.
- // If we allocated a parameter map, r7 will point there, otherwise
+ // If we allocated a parameter map, r6 will point there, otherwise
// it will point to the backing store.
- __ addi(r7, r3, Operand(JSSloppyArgumentsObject::kSize));
- __ StoreP(r7, FieldMemOperand(r3, JSObject::kElementsOffset), r0);
+ __ AddP(r6, r2, Operand(JSSloppyArgumentsObject::kSize));
+ __ StoreP(r6, FieldMemOperand(r2, JSObject::kElementsOffset), r0);
- // r3 = address of new object (tagged)
- // r5 = argument count (tagged)
- // r7 = address of parameter map or backing store (tagged)
- // r9 = mapped parameter count (tagged)
+ // r2 = address of new object (tagged)
+ // r4 = argument count (tagged)
+ // r6 = address of parameter map or backing store (tagged)
+ // r8 = mapped parameter count (tagged)
// Initialize parameter map. If there are no mapped arguments, we're done.
Label skip_parameter_map;
- __ CmpSmiLiteral(r9, Smi::FromInt(0), r0);
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ isel(eq, r4, r7, r4);
- __ beq(&skip_parameter_map);
- } else {
- Label skip6;
- __ bne(&skip6);
- // Move backing store address to r4, because it is
- // expected there when filling in the unmapped arguments.
- __ mr(r4, r7);
- __ b(&skip_parameter_map);
- __ bind(&skip6);
- }
-
- __ LoadRoot(r8, Heap::kSloppyArgumentsElementsMapRootIndex);
- __ StoreP(r8, FieldMemOperand(r7, FixedArray::kMapOffset), r0);
- __ AddSmiLiteral(r8, r9, Smi::FromInt(2), r0);
- __ StoreP(r8, FieldMemOperand(r7, FixedArray::kLengthOffset), r0);
- __ StoreP(cp, FieldMemOperand(r7, FixedArray::kHeaderSize + 0 * kPointerSize),
+ __ CmpSmiLiteral(r8, Smi::FromInt(0), r0);
+ Label skip6;
+ __ bne(&skip6);
+ // Move backing store address to r3, because it is
+ // expected there when filling in the unmapped arguments.
+ __ LoadRR(r3, r6);
+ __ b(&skip_parameter_map);
+ __ bind(&skip6);
+
+ __ LoadRoot(r7, Heap::kSloppyArgumentsElementsMapRootIndex);
+ __ StoreP(r7, FieldMemOperand(r6, FixedArray::kMapOffset), r0);
+ __ AddSmiLiteral(r7, r8, Smi::FromInt(2), r0);
+ __ StoreP(r7, FieldMemOperand(r6, FixedArray::kLengthOffset), r0);
+ __ StoreP(cp, FieldMemOperand(r6, FixedArray::kHeaderSize + 0 * kPointerSize),
r0);
- __ SmiToPtrArrayOffset(r8, r9);
- __ add(r8, r8, r7);
- __ addi(r8, r8, Operand(kParameterMapHeaderSize));
- __ StoreP(r8, FieldMemOperand(r7, FixedArray::kHeaderSize + 1 * kPointerSize),
+ __ SmiToPtrArrayOffset(r7, r8);
+ __ AddP(r7, r7, r6);
+ __ AddP(r7, r7, Operand(kParameterMapHeaderSize));
+ __ StoreP(r7, FieldMemOperand(r6, FixedArray::kHeaderSize + 1 * kPointerSize),
r0);
// Copy the parameter slots and the holes in the arguments.
@@ -5154,188 +5055,195 @@ void FastNewSloppyArgumentsStub::Generate(MacroAssembler* masm) {
// MIN_CONTEXT_SLOTS+parameter_count-mapped_parameter_count
// We loop from right to left.
Label parameters_loop;
- __ mr(r8, r9);
- __ AddSmiLiteral(r11, r5, Smi::FromInt(Context::MIN_CONTEXT_SLOTS), r0);
- __ sub(r11, r11, r9);
+ __ LoadRR(r7, r8);
+ __ AddSmiLiteral(r1, r4, Smi::FromInt(Context::MIN_CONTEXT_SLOTS), r0);
+ __ SubP(r1, r1, r8);
__ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
- __ SmiToPtrArrayOffset(r4, r8);
- __ add(r4, r4, r7);
- __ addi(r4, r4, Operand(kParameterMapHeaderSize));
-
- // r4 = address of backing store (tagged)
- // r7 = address of parameter map (tagged)
- // r8 = temporary scratch (a.o., for address calculation)
- // r10 = temporary scratch (a.o., for address calculation)
+ __ SmiToPtrArrayOffset(r3, r7);
+ __ AddP(r3, r3, r6);
+ __ AddP(r3, r3, Operand(kParameterMapHeaderSize));
+
+ // r3 = address of backing store (tagged)
+ // r6 = address of parameter map (tagged)
+ // r7 = temporary scratch (a.o., for address calculation)
+ // r9 = temporary scratch (a.o., for address calculation)
// ip = the hole value
- __ SmiUntag(r8);
- __ mtctr(r8);
- __ ShiftLeftImm(r8, r8, Operand(kPointerSizeLog2));
- __ add(r10, r4, r8);
- __ add(r8, r7, r8);
- __ addi(r10, r10, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
- __ addi(r8, r8, Operand(kParameterMapHeaderSize - kHeapObjectTag));
+ __ SmiUntag(r7);
+ __ push(r4);
+ __ LoadRR(r4, r7);
+ __ ShiftLeftP(r7, r7, Operand(kPointerSizeLog2));
+ __ AddP(r9, r3, r7);
+ __ AddP(r7, r6, r7);
+ __ AddP(r9, r9, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
+ __ AddP(r7, r7, Operand(kParameterMapHeaderSize - kHeapObjectTag));
__ bind(&parameters_loop);
- __ StorePU(r11, MemOperand(r8, -kPointerSize));
- __ StorePU(ip, MemOperand(r10, -kPointerSize));
- __ AddSmiLiteral(r11, r11, Smi::FromInt(1), r0);
- __ bdnz(&parameters_loop);
+ __ StoreP(r1, MemOperand(r7, -kPointerSize));
+ __ lay(r7, MemOperand(r7, -kPointerSize));
+ __ StoreP(ip, MemOperand(r9, -kPointerSize));
+ __ lay(r9, MemOperand(r9, -kPointerSize));
+ __ AddSmiLiteral(r1, r1, Smi::FromInt(1), r0);
+ __ BranchOnCount(r4, &parameters_loop);
+ __ pop(r4);
- // Restore r8 = argument count (tagged).
- __ LoadP(r8, FieldMemOperand(r3, JSSloppyArgumentsObject::kLengthOffset));
+ // Restore r7 = argument count (tagged).
+ __ LoadP(r7, FieldMemOperand(r2, JSSloppyArgumentsObject::kLengthOffset));
__ bind(&skip_parameter_map);
- // r3 = address of new object (tagged)
- // r4 = address of backing store (tagged)
- // r8 = argument count (tagged)
- // r9 = mapped parameter count (tagged)
- // r11 = scratch
+ // r2 = address of new object (tagged)
+ // r3 = address of backing store (tagged)
+ // r7 = argument count (tagged)
+ // r8 = mapped parameter count (tagged)
+ // r1 = scratch
// Copy arguments header and remaining slots (if there are any).
- __ LoadRoot(r11, Heap::kFixedArrayMapRootIndex);
- __ StoreP(r11, FieldMemOperand(r4, FixedArray::kMapOffset), r0);
- __ StoreP(r8, FieldMemOperand(r4, FixedArray::kLengthOffset), r0);
- __ sub(r11, r8, r9, LeaveOE, SetRC);
- __ Ret(eq, cr0);
+ __ LoadRoot(r1, Heap::kFixedArrayMapRootIndex);
+ __ StoreP(r1, FieldMemOperand(r3, FixedArray::kMapOffset), r0);
+ __ StoreP(r7, FieldMemOperand(r3, FixedArray::kLengthOffset), r0);
+ __ SubP(r1, r7, r8);
+ __ Ret(eq);
Label arguments_loop;
- __ SmiUntag(r11);
- __ mtctr(r11);
+ __ SmiUntag(r1);
+ __ LoadRR(r4, r1);
- __ SmiToPtrArrayOffset(r0, r9);
- __ sub(r6, r6, r0);
- __ add(r11, r4, r0);
- __ addi(r11, r11,
+ __ SmiToPtrArrayOffset(r0, r8);
+ __ SubP(r5, r5, r0);
+ __ AddP(r1, r3, r0);
+ __ AddP(r1, r1,
Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
__ bind(&arguments_loop);
- __ LoadPU(r7, MemOperand(r6, -kPointerSize));
- __ StorePU(r7, MemOperand(r11, kPointerSize));
- __ bdnz(&arguments_loop);
+ __ LoadP(r6, MemOperand(r5, -kPointerSize));
+ __ lay(r5, MemOperand(r5, -kPointerSize));
+ __ StoreP(r6, MemOperand(r1, kPointerSize));
+ __ la(r1, MemOperand(r1, kPointerSize));
+ __ BranchOnCount(r4, &arguments_loop);
// Return.
__ Ret();
// Do the runtime call to allocate the arguments object.
- // r8 = argument count (tagged)
+ // r7 = argument count (tagged)
__ bind(&runtime);
- __ Push(r4, r6, r8);
+ __ Push(r3, r5, r7);
__ TailCallRuntime(Runtime::kNewSloppyArguments);
}
void FastNewStrictArgumentsStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
- // -- r4 : function
+ // -- r3 : function
// -- cp : context
// -- fp : frame pointer
// -- lr : return address
// -----------------------------------
- __ AssertFunction(r4);
+ __ AssertFunction(r3);
// For Ignition we need to skip all possible handler/stub frames until
// we reach the JavaScript frame for the function (similar to what the
- // runtime fallback implementation does). So make r5 point to that
+ // runtime fallback implementation does). So make r4 point to that
// JavaScript frame.
{
Label loop, loop_entry;
- __ mr(r5, fp);
+ __ LoadRR(r4, fp);
__ b(&loop_entry);
__ bind(&loop);
- __ LoadP(r5, MemOperand(r5, StandardFrameConstants::kCallerFPOffset));
+ __ LoadP(r4, MemOperand(r4, StandardFrameConstants::kCallerFPOffset));
__ bind(&loop_entry);
- __ LoadP(ip, MemOperand(r5, StandardFrameConstants::kMarkerOffset));
- __ cmp(ip, r4);
+ __ LoadP(ip, MemOperand(r4, StandardFrameConstants::kMarkerOffset));
+ __ CmpP(ip, r3);
__ bne(&loop);
}
// Check if we have an arguments adaptor frame below the function frame.
Label arguments_adaptor, arguments_done;
- __ LoadP(r6, MemOperand(r5, StandardFrameConstants::kCallerFPOffset));
- __ LoadP(ip, MemOperand(r6, StandardFrameConstants::kContextOffset));
+ __ LoadP(r5, MemOperand(r4, StandardFrameConstants::kCallerFPOffset));
+ __ LoadP(ip, MemOperand(r5, StandardFrameConstants::kContextOffset));
__ CmpSmiLiteral(ip, Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR), r0);
__ beq(&arguments_adaptor);
{
- __ LoadP(r4, FieldMemOperand(r4, JSFunction::kSharedFunctionInfoOffset));
- __ LoadWordArith(
- r3,
- FieldMemOperand(r4, SharedFunctionInfo::kFormalParameterCountOffset));
-#if V8_TARGET_ARCH_PPC64
- __ SmiTag(r3);
+ __ LoadP(r3, FieldMemOperand(r3, JSFunction::kSharedFunctionInfoOffset));
+ __ LoadW(r2, FieldMemOperand(
+ r3, SharedFunctionInfo::kFormalParameterCountOffset));
+#if V8_TARGET_ARCH_S390X
+ __ SmiTag(r2);
#endif
- __ SmiToPtrArrayOffset(r9, r3);
- __ add(r5, r5, r9);
+ __ SmiToPtrArrayOffset(r8, r2);
+ __ AddP(r4, r4, r8);
}
__ b(&arguments_done);
__ bind(&arguments_adaptor);
{
- __ LoadP(r3, MemOperand(r6, ArgumentsAdaptorFrameConstants::kLengthOffset));
- __ SmiToPtrArrayOffset(r9, r3);
- __ add(r5, r6, r9);
+ __ LoadP(r2, MemOperand(r5, ArgumentsAdaptorFrameConstants::kLengthOffset));
+ __ SmiToPtrArrayOffset(r8, r2);
+ __ AddP(r4, r5, r8);
}
__ bind(&arguments_done);
- __ addi(r5, r5, Operand(StandardFrameConstants::kCallerSPOffset));
+ __ AddP(r4, r4, Operand(StandardFrameConstants::kCallerSPOffset));
// ----------- S t a t e -------------
// -- cp : context
- // -- r3 : number of rest parameters (tagged)
- // -- r5 : pointer just past first rest parameters
- // -- r9 : size of rest parameters
+ // -- r2 : number of rest parameters (tagged)
+ // -- r4 : pointer just past first rest parameters
+ // -- r8 : size of rest parameters
// -- lr : return address
// -----------------------------------
// Allocate space for the strict arguments object plus the backing store.
Label allocate, done_allocate;
- __ mov(r4, Operand(JSStrictArgumentsObject::kSize + FixedArray::kHeaderSize));
- __ add(r4, r4, r9);
- __ Allocate(r4, r6, r7, r8, &allocate, TAG_OBJECT);
+ __ mov(r3, Operand(JSStrictArgumentsObject::kSize + FixedArray::kHeaderSize));
+ __ AddP(r3, r3, r8);
+ __ Allocate(r3, r5, r6, r7, &allocate, TAG_OBJECT);
__ bind(&done_allocate);
- // Setup the elements array in r6.
- __ LoadRoot(r4, Heap::kFixedArrayMapRootIndex);
- __ StoreP(r4, FieldMemOperand(r6, FixedArray::kMapOffset), r0);
- __ StoreP(r3, FieldMemOperand(r6, FixedArray::kLengthOffset), r0);
- __ addi(r7, r6,
+ // Setup the elements array in r5.
+ __ LoadRoot(r3, Heap::kFixedArrayMapRootIndex);
+ __ StoreP(r3, FieldMemOperand(r5, FixedArray::kMapOffset), r0);
+ __ StoreP(r2, FieldMemOperand(r5, FixedArray::kLengthOffset), r0);
+ __ AddP(r6, r5,
Operand(FixedArray::kHeaderSize - kHeapObjectTag - kPointerSize));
{
Label loop, done_loop;
- __ SmiUntag(r0, r3, SetRC);
- __ beq(&done_loop, cr0);
- __ mtctr(r0);
+ __ SmiUntag(r1, r2);
+ __ LoadAndTestP(r1, r1);
+ __ beq(&done_loop);
__ bind(&loop);
- __ LoadPU(ip, MemOperand(r5, -kPointerSize));
- __ StorePU(ip, MemOperand(r7, kPointerSize));
- __ bdnz(&loop);
+ __ lay(r4, MemOperand(r4, -kPointerSize));
+ __ LoadP(ip, MemOperand(r4));
+ __ la(r6, MemOperand(r6, kPointerSize));
+ __ StoreP(ip, MemOperand(r6));
+ __ BranchOnCount(r1, &loop);
__ bind(&done_loop);
- __ addi(r7, r7, Operand(kPointerSize));
+ __ AddP(r6, r6, Operand(kPointerSize));
}
- // Setup the rest parameter array in r7.
- __ LoadNativeContextSlot(Context::STRICT_ARGUMENTS_MAP_INDEX, r4);
- __ StoreP(r4, MemOperand(r7, JSStrictArgumentsObject::kMapOffset));
- __ LoadRoot(r4, Heap::kEmptyFixedArrayRootIndex);
- __ StoreP(r4, MemOperand(r7, JSStrictArgumentsObject::kPropertiesOffset));
- __ StoreP(r6, MemOperand(r7, JSStrictArgumentsObject::kElementsOffset));
- __ StoreP(r3, MemOperand(r7, JSStrictArgumentsObject::kLengthOffset));
+ // Setup the rest parameter array in r6.
+ __ LoadNativeContextSlot(Context::STRICT_ARGUMENTS_MAP_INDEX, r3);
+ __ StoreP(r3, MemOperand(r6, JSStrictArgumentsObject::kMapOffset));
+ __ LoadRoot(r3, Heap::kEmptyFixedArrayRootIndex);
+ __ StoreP(r3, MemOperand(r6, JSStrictArgumentsObject::kPropertiesOffset));
+ __ StoreP(r5, MemOperand(r6, JSStrictArgumentsObject::kElementsOffset));
+ __ StoreP(r2, MemOperand(r6, JSStrictArgumentsObject::kLengthOffset));
STATIC_ASSERT(JSStrictArgumentsObject::kSize == 4 * kPointerSize);
- __ addi(r3, r7, Operand(kHeapObjectTag));
+ __ AddP(r2, r6, Operand(kHeapObjectTag));
__ Ret();
// Fall back to %AllocateInNewSpace.
__ bind(&allocate);
{
FrameAndConstantPoolScope scope(masm, StackFrame::INTERNAL);
- __ SmiTag(r4);
- __ Push(r3, r5, r4);
+ __ SmiTag(r3);
+ __ Push(r2, r4, r3);
__ CallRuntime(Runtime::kAllocateInNewSpace);
- __ mr(r6, r3);
- __ Pop(r3, r5);
+ __ LoadRR(r5, r2);
+ __ Pop(r2, r4);
}
__ b(&done_allocate);
}
void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
Register context = cp;
- Register result = r3;
- Register slot = r5;
+ Register result = r2;
+ Register slot = r4;
// Go up the context chain to the script context.
for (int i = 0; i < depth(); ++i) {
@@ -5344,14 +5252,17 @@ void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
}
// Load the PropertyCell value at the specified slot.
- __ ShiftLeftImm(r0, slot, Operand(kPointerSizeLog2));
- __ add(result, context, r0);
+ __ ShiftLeftP(r0, slot, Operand(kPointerSizeLog2));
+ __ AddP(result, context, r0);
__ LoadP(result, ContextMemOperand(result));
__ LoadP(result, FieldMemOperand(result, PropertyCell::kValueOffset));
// If the result is not the_hole, return. Otherwise, handle in the runtime.
__ CompareRoot(result, Heap::kTheHoleValueRootIndex);
- __ Ret(ne);
+ Label runtime;
+ __ beq(&runtime);
+ __ Ret();
+ __ bind(&runtime);
// Fallback to runtime.
__ SmiTag(slot);
@@ -5359,16 +5270,15 @@ void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
__ TailCallRuntime(Runtime::kLoadGlobalViaContext);
}
-
void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
- Register value = r3;
- Register slot = r5;
+ Register value = r2;
+ Register slot = r4;
- Register cell = r4;
- Register cell_details = r6;
- Register cell_value = r7;
- Register cell_value_map = r8;
- Register scratch = r9;
+ Register cell = r3;
+ Register cell_details = r5;
+ Register cell_value = r6;
+ Register cell_value_map = r7;
+ Register scratch = r8;
Register context = cp;
Register context_temp = cell;
@@ -5387,21 +5297,21 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
}
// Load the PropertyCell at the specified slot.
- __ ShiftLeftImm(r0, slot, Operand(kPointerSizeLog2));
- __ add(cell, context, r0);
+ __ ShiftLeftP(r0, slot, Operand(kPointerSizeLog2));
+ __ AddP(cell, context, r0);
__ LoadP(cell, ContextMemOperand(cell));
// Load PropertyDetails for the cell (actually only the cell_type and kind).
__ LoadP(cell_details, FieldMemOperand(cell, PropertyCell::kDetailsOffset));
__ SmiUntag(cell_details);
- __ andi(cell_details, cell_details,
+ __ AndP(cell_details, cell_details,
Operand(PropertyDetails::PropertyCellTypeField::kMask |
PropertyDetails::KindField::kMask |
PropertyDetails::kAttributesReadOnlyMask));
// Check if PropertyCell holds mutable data.
Label not_mutable_data;
- __ cmpi(cell_details, Operand(PropertyDetails::PropertyCellTypeField::encode(
+ __ CmpP(cell_details, Operand(PropertyDetails::PropertyCellTypeField::encode(
PropertyCellType::kMutable) |
PropertyDetails::KindField::encode(kData)));
__ bne(&not_mutable_data);
@@ -5411,8 +5321,8 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
__ StoreP(value, FieldMemOperand(cell, PropertyCell::kValueOffset), r0);
// RecordWriteField clobbers the value register, so we copy it before the
// call.
- __ mr(r6, value);
- __ RecordWriteField(cell, PropertyCell::kValueOffset, r6, scratch,
+ __ LoadRR(r5, value);
+ __ RecordWriteField(cell, PropertyCell::kValueOffset, r5, scratch,
kLRHasNotBeenSaved, kDontSaveFPRegs, EMIT_REMEMBERED_SET,
OMIT_SMI_CHECK);
__ Ret();
@@ -5422,28 +5332,28 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
// ConstantType and Undefined cells).
Label not_same_value;
__ LoadP(cell_value, FieldMemOperand(cell, PropertyCell::kValueOffset));
- __ cmp(cell_value, value);
+ __ CmpP(cell_value, value);
__ bne(&not_same_value);
// Make sure the PropertyCell is not marked READ_ONLY.
- __ andi(r0, cell_details, Operand(PropertyDetails::kAttributesReadOnlyMask));
- __ bne(&slow_case, cr0);
+ __ AndP(r0, cell_details, Operand(PropertyDetails::kAttributesReadOnlyMask));
+ __ bne(&slow_case);
if (FLAG_debug_code) {
Label done;
// This can only be true for Constant, ConstantType and Undefined cells,
// because we never store the_hole via this stub.
- __ cmpi(cell_details,
+ __ CmpP(cell_details,
Operand(PropertyDetails::PropertyCellTypeField::encode(
PropertyCellType::kConstant) |
PropertyDetails::KindField::encode(kData)));
__ beq(&done);
- __ cmpi(cell_details,
+ __ CmpP(cell_details,
Operand(PropertyDetails::PropertyCellTypeField::encode(
PropertyCellType::kConstantType) |
PropertyDetails::KindField::encode(kData)));
__ beq(&done);
- __ cmpi(cell_details,
+ __ CmpP(cell_details,
Operand(PropertyDetails::PropertyCellTypeField::encode(
PropertyCellType::kUndefined) |
PropertyDetails::KindField::encode(kData)));
@@ -5455,7 +5365,7 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
// Check if PropertyCell contains data with constant type (and is not
// READ_ONLY).
- __ cmpi(cell_details, Operand(PropertyDetails::PropertyCellTypeField::encode(
+ __ CmpP(cell_details, Operand(PropertyDetails::PropertyCellTypeField::encode(
PropertyCellType::kConstantType) |
PropertyDetails::KindField::encode(kData)));
__ bne(&slow_case);
@@ -5475,7 +5385,7 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
__ LoadP(cell_value_map, FieldMemOperand(cell_value, HeapObject::kMapOffset));
__ LoadP(scratch, FieldMemOperand(value, HeapObject::kMapOffset));
- __ cmp(cell_value_map, scratch);
+ __ CmpP(cell_value_map, scratch);
__ beq(&fast_heapobject_case);
// Fallback to runtime.
@@ -5487,12 +5397,10 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
: Runtime::kStoreGlobalViaContext_Sloppy);
}
-
static int AddressOffset(ExternalReference ref0, ExternalReference ref1) {
return ref0.address() - ref1.address();
}
-
// Calls an API function. Allocates HandleScope, extracts returned value
// from handle and propagates exceptions. Restores context. stack_space
// - space to be unwound on exit (includes the call JS arguments space and
@@ -5514,44 +5422,39 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
ExternalReference::handle_scope_level_address(isolate), next_address);
// Additional parameter is the address of the actual callback.
- DCHECK(function_address.is(r4) || function_address.is(r5));
- Register scratch = r6;
+ DCHECK(function_address.is(r3) || function_address.is(r4));
+ Register scratch = r5;
__ mov(scratch, Operand(ExternalReference::is_profiling_address(isolate)));
- __ lbz(scratch, MemOperand(scratch, 0));
- __ cmpi(scratch, Operand::Zero());
-
- if (CpuFeatures::IsSupported(ISELECT)) {
- __ mov(scratch, Operand(thunk_ref));
- __ isel(eq, scratch, function_address, scratch);
- } else {
- Label profiler_disabled;
- Label end_profiler_check;
- __ beq(&profiler_disabled);
- __ mov(scratch, Operand(thunk_ref));
- __ b(&end_profiler_check);
- __ bind(&profiler_disabled);
- __ mr(scratch, function_address);
- __ bind(&end_profiler_check);
- }
+ __ LoadlB(scratch, MemOperand(scratch, 0));
+ __ CmpP(scratch, Operand::Zero());
+
+ Label profiler_disabled;
+ Label end_profiler_check;
+ __ beq(&profiler_disabled, Label::kNear);
+ __ mov(scratch, Operand(thunk_ref));
+ __ b(&end_profiler_check, Label::kNear);
+ __ bind(&profiler_disabled);
+ __ LoadRR(scratch, function_address);
+ __ bind(&end_profiler_check);
// Allocate HandleScope in callee-save registers.
- // r17 - next_address
- // r14 - next_address->kNextOffset
- // r15 - next_address->kLimitOffset
- // r16 - next_address->kLevelOffset
- __ mov(r17, Operand(next_address));
- __ LoadP(r14, MemOperand(r17, kNextOffset));
- __ LoadP(r15, MemOperand(r17, kLimitOffset));
- __ lwz(r16, MemOperand(r17, kLevelOffset));
- __ addi(r16, r16, Operand(1));
- __ stw(r16, MemOperand(r17, kLevelOffset));
+ // r9 - next_address
+ // r6 - next_address->kNextOffset
+ // r7 - next_address->kLimitOffset
+ // r8 - next_address->kLevelOffset
+ __ mov(r9, Operand(next_address));
+ __ LoadP(r6, MemOperand(r9, kNextOffset));
+ __ LoadP(r7, MemOperand(r9, kLimitOffset));
+ __ LoadlW(r8, MemOperand(r9, kLevelOffset));
+ __ AddP(r8, Operand(1));
+ __ StoreW(r8, MemOperand(r9, kLevelOffset));
if (FLAG_log_timer_events) {
FrameScope frame(masm, StackFrame::MANUAL);
__ PushSafepointRegisters();
- __ PrepareCallCFunction(1, r3);
- __ mov(r3, Operand(ExternalReference::isolate_address(isolate)));
+ __ PrepareCallCFunction(1, r2);
+ __ mov(r2, Operand(ExternalReference::isolate_address(isolate)));
__ CallCFunction(ExternalReference::log_enter_external_function(isolate),
1);
__ PopSafepointRegisters();
@@ -5566,8 +5469,8 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
if (FLAG_log_timer_events) {
FrameScope frame(masm, StackFrame::MANUAL);
__ PushSafepointRegisters();
- __ PrepareCallCFunction(1, r3);
- __ mov(r3, Operand(ExternalReference::isolate_address(isolate)));
+ __ PrepareCallCFunction(1, r2);
+ __ mov(r2, Operand(ExternalReference::isolate_address(isolate)));
__ CallCFunction(ExternalReference::log_leave_external_function(isolate),
1);
__ PopSafepointRegisters();
@@ -5579,21 +5482,20 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
Label return_value_loaded;
// load value from ReturnValue
- __ LoadP(r3, return_value_operand);
+ __ LoadP(r2, return_value_operand);
__ bind(&return_value_loaded);
// No more valid handles (the result handle was the last one). Restore
// previous handle scope.
- __ StoreP(r14, MemOperand(r17, kNextOffset));
+ __ StoreP(r6, MemOperand(r9, kNextOffset));
if (__ emit_debug_code()) {
- __ lwz(r4, MemOperand(r17, kLevelOffset));
- __ cmp(r4, r16);
+ __ LoadlW(r3, MemOperand(r9, kLevelOffset));
+ __ CmpP(r3, r8);
__ Check(eq, kUnexpectedLevelAfterReturnFromApiCall);
}
- __ subi(r16, r16, Operand(1));
- __ stw(r16, MemOperand(r17, kLevelOffset));
- __ LoadP(r0, MemOperand(r17, kLimitOffset));
- __ cmp(r15, r0);
- __ bne(&delete_allocated_handles);
+ __ SubP(r8, Operand(1));
+ __ StoreW(r8, MemOperand(r9, kLevelOffset));
+ __ CmpP(r7, MemOperand(r9, kLimitOffset));
+ __ bne(&delete_allocated_handles, Label::kNear);
// Leave the API exit frame.
__ bind(&leave_exit_frame);
@@ -5603,20 +5505,19 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
}
// LeaveExitFrame expects unwind space to be in a register.
if (stack_space_operand != NULL) {
- __ lwz(r14, *stack_space_operand);
+ __ l(r6, *stack_space_operand);
} else {
- __ mov(r14, Operand(stack_space));
+ __ mov(r6, Operand(stack_space));
}
- __ LeaveExitFrame(false, r14, !restore_context, stack_space_operand != NULL);
+ __ LeaveExitFrame(false, r6, !restore_context, stack_space_operand != NULL);
// Check if the function scheduled an exception.
- __ LoadRoot(r14, Heap::kTheHoleValueRootIndex);
- __ mov(r15, Operand(ExternalReference::scheduled_exception_address(isolate)));
- __ LoadP(r15, MemOperand(r15));
- __ cmp(r14, r15);
- __ bne(&promote_scheduled_exception);
+ __ mov(r7, Operand(ExternalReference::scheduled_exception_address(isolate)));
+ __ LoadP(r7, MemOperand(r7));
+ __ CompareRoot(r7, Heap::kTheHoleValueRootIndex);
+ __ bne(&promote_scheduled_exception, Label::kNear);
- __ blr();
+ __ b(r14);
// Re-throw by promoting a scheduled exception.
__ bind(&promote_scheduled_exception);
@@ -5624,14 +5525,14 @@ static void CallApiFunctionAndReturn(MacroAssembler* masm,
// HandleScope limit has changed. Delete allocated extensions.
__ bind(&delete_allocated_handles);
- __ StoreP(r15, MemOperand(r17, kLimitOffset));
- __ mr(r14, r3);
- __ PrepareCallCFunction(1, r15);
- __ mov(r3, Operand(ExternalReference::isolate_address(isolate)));
+ __ StoreP(r7, MemOperand(r9, kLimitOffset));
+ __ LoadRR(r6, r2);
+ __ PrepareCallCFunction(1, r7);
+ __ mov(r2, Operand(ExternalReference::isolate_address(isolate)));
__ CallCFunction(ExternalReference::delete_handle_scope_extensions(isolate),
1);
- __ mr(r3, r14);
- __ b(&leave_exit_frame);
+ __ LoadRR(r2, r6);
+ __ b(&leave_exit_frame, Label::kNear);
}
static void CallApiFunctionStubHelper(MacroAssembler* masm,
@@ -5639,11 +5540,11 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
bool return_first_arg,
bool call_data_undefined, bool is_lazy) {
// ----------- S t a t e -------------
- // -- r3 : callee
- // -- r7 : call_data
- // -- r5 : holder
- // -- r4 : api_function_address
- // -- r6 : number of arguments if argc is a register
+ // -- r2 : callee
+ // -- r6 : call_data
+ // -- r4 : holder
+ // -- r3 : api_function_address
+ // -- r5 : number of arguments if argc is a register
// -- cp : context
// --
// -- sp[0] : last argument
@@ -5652,10 +5553,10 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
// -- sp[argc * 4] : receiver
// -----------------------------------
- Register callee = r3;
- Register call_data = r7;
- Register holder = r5;
- Register api_function_address = r4;
+ Register callee = r2;
+ Register call_data = r6;
+ Register holder = r4;
+ Register api_function_address = r3;
Register context = cp;
typedef FunctionCallbackArguments FCA;
@@ -5669,7 +5570,7 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
STATIC_ASSERT(FCA::kHolderIndex == 0);
STATIC_ASSERT(FCA::kArgsLength == 7);
- DCHECK(argc.is_immediate() || r3.is(argc.reg()));
+ DCHECK(argc.is_immediate() || r2.is(argc.reg()));
// context save
__ push(context);
@@ -5699,11 +5600,11 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
__ push(holder);
// Prepare arguments.
- __ mr(scratch, sp);
+ __ LoadRR(scratch, sp);
// Allocate the v8::Arguments structure in the arguments' space since
// it's not controlled by GC.
- // PPC LINUX ABI:
+ // S390 LINUX ABI:
//
// Create 5 extra slots on stack:
// [0] space for DirectCEntryStub's LR save
@@ -5715,33 +5616,33 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
FrameScope frame_scope(masm, StackFrame::MANUAL);
__ EnterExitFrame(false, kApiStackSpace);
- DCHECK(!api_function_address.is(r3) && !scratch.is(r3));
- // r3 = FunctionCallbackInfo&
+ DCHECK(!api_function_address.is(r2) && !scratch.is(r2));
+ // r2 = FunctionCallbackInfo&
// Arguments is after the return address.
- __ addi(r3, sp, Operand(kFunctionCallbackInfoOffset));
+ __ AddP(r2, sp, Operand(kFunctionCallbackInfoOffset));
// FunctionCallbackInfo::implicit_args_
- __ StoreP(scratch, MemOperand(r3, 0 * kPointerSize));
+ __ StoreP(scratch, MemOperand(r2, 0 * kPointerSize));
if (argc.is_immediate()) {
// FunctionCallbackInfo::values_
- __ addi(ip, scratch,
+ __ AddP(ip, scratch,
Operand((FCA::kArgsLength - 1 + argc.immediate()) * kPointerSize));
- __ StoreP(ip, MemOperand(r3, 1 * kPointerSize));
+ __ StoreP(ip, MemOperand(r2, 1 * kPointerSize));
// FunctionCallbackInfo::length_ = argc
- __ li(ip, Operand(argc.immediate()));
- __ stw(ip, MemOperand(r3, 2 * kPointerSize));
+ __ LoadImmP(ip, Operand(argc.immediate()));
+ __ StoreW(ip, MemOperand(r2, 2 * kPointerSize));
// FunctionCallbackInfo::is_construct_call_ = 0
- __ li(ip, Operand::Zero());
- __ stw(ip, MemOperand(r3, 2 * kPointerSize + kIntSize));
+ __ LoadImmP(ip, Operand::Zero());
+ __ StoreW(ip, MemOperand(r2, 2 * kPointerSize + kIntSize));
} else {
- __ ShiftLeftImm(ip, argc.reg(), Operand(kPointerSizeLog2));
- __ addi(ip, ip, Operand((FCA::kArgsLength - 1) * kPointerSize));
+ __ ShiftLeftP(ip, argc.reg(), Operand(kPointerSizeLog2));
+ __ AddP(ip, ip, Operand((FCA::kArgsLength - 1) * kPointerSize));
// FunctionCallbackInfo::values_
- __ add(r0, scratch, ip);
- __ StoreP(r0, MemOperand(r3, 1 * kPointerSize));
+ __ AddP(r0, scratch, ip);
+ __ StoreP(r0, MemOperand(r2, 1 * kPointerSize));
// FunctionCallbackInfo::length_ = argc
- __ stw(argc.reg(), MemOperand(r3, 2 * kPointerSize));
+ __ StoreW(argc.reg(), MemOperand(r2, 2 * kPointerSize));
// FunctionCallbackInfo::is_construct_call_
- __ stw(ip, MemOperand(r3, 2 * kPointerSize + kIntSize));
+ __ StoreW(ip, MemOperand(r2, 2 * kPointerSize + kIntSize));
}
ExternalReference thunk_ref =
@@ -5771,14 +5672,12 @@ static void CallApiFunctionStubHelper(MacroAssembler* masm,
&context_restore_operand);
}
-
void CallApiFunctionStub::Generate(MacroAssembler* masm) {
bool call_data_undefined = this->call_data_undefined();
CallApiFunctionStubHelper(masm, ParameterCount(r6), false,
call_data_undefined, false);
}
-
void CallApiAccessorStub::Generate(MacroAssembler* masm) {
bool is_store = this->is_store();
int argc = this->argc();
@@ -5788,40 +5687,39 @@ void CallApiAccessorStub::Generate(MacroAssembler* masm) {
call_data_undefined, is_lazy);
}
-
void CallApiGetterStub::Generate(MacroAssembler* masm) {
// ----------- S t a t e -------------
// -- sp[0] : name
// -- sp[4 .. (4 + kArgsLength*4)] : v8::PropertyCallbackInfo::args_
// -- ...
- // -- r5 : api_function_address
+ // -- r4 : api_function_address
// -----------------------------------
Register api_function_address = ApiGetterDescriptor::function_address();
int arg0Slot = 0;
int accessorInfoSlot = 0;
int apiStackSpace = 0;
- DCHECK(api_function_address.is(r5));
+ DCHECK(api_function_address.is(r4));
// v8::PropertyCallbackInfo::args_ array and name handle.
const int kStackUnwindSpace = PropertyCallbackArguments::kArgsLength + 1;
// Load address of v8::PropertyAccessorInfo::args_ array and name handle.
- __ mr(r3, sp); // r3 = Handle<Name>
- __ addi(r4, r3, Operand(1 * kPointerSize)); // r4 = v8::PCI::args_
-
-// If ABI passes Handles (pointer-sized struct) in a register:
-//
-// Create 2 extra slots on stack:
-// [0] space for DirectCEntryStub's LR save
-// [1] AccessorInfo&
-//
-// Otherwise:
-//
-// Create 3 extra slots on stack:
-// [0] space for DirectCEntryStub's LR save
-// [1] copy of Handle (first arg)
-// [2] AccessorInfo&
+ __ LoadRR(r2, sp); // r2 = Handle<Name>
+ __ AddP(r3, r2, Operand(1 * kPointerSize)); // r3 = v8::PCI::args_
+
+ // If ABI passes Handles (pointer-sized struct) in a register:
+ //
+ // Create 2 extra slots on stack:
+ // [0] space for DirectCEntryStub's LR save
+ // [1] AccessorInfo&
+ //
+ // Otherwise:
+ //
+ // Create 3 extra slots on stack:
+ // [0] space for DirectCEntryStub's LR save
+ // [1] copy of Handle (first arg)
+ // [2] AccessorInfo&
if (ABI_PASSES_HANDLES_IN_REGS) {
accessorInfoSlot = kStackFrameExtraParamSlot + 1;
apiStackSpace = 2;
@@ -5836,15 +5734,15 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
if (!ABI_PASSES_HANDLES_IN_REGS) {
// pass 1st arg by reference
- __ StoreP(r3, MemOperand(sp, arg0Slot * kPointerSize));
- __ addi(r3, sp, Operand(arg0Slot * kPointerSize));
+ __ StoreP(r2, MemOperand(sp, arg0Slot * kPointerSize));
+ __ AddP(r2, sp, Operand(arg0Slot * kPointerSize));
}
// Create v8::PropertyCallbackInfo object on the stack and initialize
// it's args_ field.
- __ StoreP(r4, MemOperand(sp, accessorInfoSlot * kPointerSize));
- __ addi(r4, sp, Operand(accessorInfoSlot * kPointerSize));
- // r4 = v8::PropertyCallbackInfo&
+ __ StoreP(r3, MemOperand(sp, accessorInfoSlot * kPointerSize));
+ __ AddP(r3, sp, Operand(accessorInfoSlot * kPointerSize));
+ // r3 = v8::PropertyCallbackInfo&
ExternalReference thunk_ref =
ExternalReference::invoke_accessor_getter_callback(isolate());
@@ -5856,9 +5754,9 @@ void CallApiGetterStub::Generate(MacroAssembler* masm) {
kStackUnwindSpace, NULL, return_value_operand, NULL);
}
-
#undef __
+
} // namespace internal
} // namespace v8
-#endif // V8_TARGET_ARCH_PPC
+#endif // V8_TARGET_ARCH_S390
« src/s390/assembler-s390.h ('K') | « src/s390/code-stubs-s390.h ('k') | src/s390/codegen-s390.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698