Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index d96560fe16d989b813a1825656893337613681f1..b66fa616128329795915867f079c1ad0ed90e958 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -1148,7 +1148,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
const Register scratch2 = r4; |
Label call_runtime, done, int_exponent; |
- if (exponent_type_ == ON_STACK) { |
+ if (exponent_type() == ON_STACK) { |
Label base_is_smi, unpack_exponent; |
// The exponent and base are supplied as arguments on the stack. |
// This can only happen if the stub is called from non-optimized code. |
@@ -1178,7 +1178,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
__ b(ne, &call_runtime); |
__ vldr(double_exponent, |
FieldMemOperand(exponent, HeapNumber::kValueOffset)); |
- } else if (exponent_type_ == TAGGED) { |
+ } else if (exponent_type() == TAGGED) { |
// Base is already in double_base. |
__ UntagAndJumpIfSmi(scratch, exponent, &int_exponent); |
@@ -1186,7 +1186,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
FieldMemOperand(exponent, HeapNumber::kValueOffset)); |
} |
- if (exponent_type_ != INTEGER) { |
+ if (exponent_type() != INTEGER) { |
Label int_exponent_convert; |
// Detect integer exponents stored as double. |
__ vcvt_u32_f64(single_scratch, double_exponent); |
@@ -1196,7 +1196,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
__ VFPCompareAndSetFlags(double_scratch, double_exponent); |
__ b(eq, &int_exponent_convert); |
- if (exponent_type_ == ON_STACK) { |
+ if (exponent_type() == ON_STACK) { |
// Detect square root case. Crankshaft detects constant +/-0.5 at |
// compile time and uses DoMathPowHalf instead. We then skip this check |
// for non-constant cases of +/-0.5 as these hardly occur. |
@@ -1261,7 +1261,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
__ bind(&int_exponent); |
// Get two copies of exponent in the registers scratch and exponent. |
- if (exponent_type_ == INTEGER) { |
+ if (exponent_type() == INTEGER) { |
__ mov(scratch, exponent); |
} else { |
// Exponent has previously been stored into scratch as untagged integer. |
@@ -1297,7 +1297,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
// Returning or bailing out. |
Counters* counters = isolate()->counters(); |
- if (exponent_type_ == ON_STACK) { |
+ if (exponent_type() == ON_STACK) { |
// The arguments are still on the stack. |
__ bind(&call_runtime); |
__ TailCallRuntime(Runtime::kMathPowRT, 2, 1); |
@@ -2897,7 +2897,7 @@ static void CallFunctionNoFeedback(MacroAssembler* masm, |
void CallFunctionStub::Generate(MacroAssembler* masm) { |
- CallFunctionNoFeedback(masm, argc_, NeedsChecks(), CallAsMethod()); |
+ CallFunctionNoFeedback(masm, argc(), NeedsChecks(), CallAsMethod()); |
} |
@@ -4582,7 +4582,7 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) { |
int parameter_count_offset = |
StubFailureTrampolineFrame::kCallerStackParameterCountFrameOffset; |
__ ldr(r1, MemOperand(fp, parameter_count_offset)); |
- if (function_mode_ == JS_FUNCTION_STUB_MODE) { |
+ if (function_mode() == JS_FUNCTION_STUB_MODE) { |
__ add(r1, r1, Operand(1)); |
} |
masm->LeaveFrame(StackFrame::STUB_FAILURE_TRAMPOLINE); |
@@ -4812,7 +4812,7 @@ void InternalArrayConstructorStubBase::GenerateStubsAheadOfTime( |
void ArrayConstructorStub::GenerateDispatchToArrayStub( |
MacroAssembler* masm, |
AllocationSiteOverrideMode mode) { |
- if (argument_count_ == ANY) { |
+ if (argument_count() == ANY) { |
Label not_zero_case, not_one_case; |
__ tst(r0, r0); |
__ b(ne, ¬_zero_case); |
@@ -4825,11 +4825,11 @@ void ArrayConstructorStub::GenerateDispatchToArrayStub( |
__ bind(¬_one_case); |
CreateArrayDispatch<ArrayNArgumentsConstructorStub>(masm, mode); |
- } else if (argument_count_ == NONE) { |
+ } else if (argument_count() == NONE) { |
CreateArrayDispatch<ArrayNoArgumentConstructorStub>(masm, mode); |
- } else if (argument_count_ == ONE) { |
+ } else if (argument_count() == ONE) { |
CreateArrayDispatchOneArgument(masm, mode); |
- } else if (argument_count_ == MORE_THAN_ONE) { |
+ } else if (argument_count() == MORE_THAN_ONE) { |
CreateArrayDispatch<ArrayNArgumentsConstructorStub>(masm, mode); |
} else { |
UNREACHABLE(); |
@@ -4839,7 +4839,7 @@ void ArrayConstructorStub::GenerateDispatchToArrayStub( |
void ArrayConstructorStub::Generate(MacroAssembler* masm) { |
// ----------- S t a t e ------------- |
- // -- r0 : argc (only if argument_count_ == ANY) |
+ // -- r0 : argc (only if argument_count() == ANY) |
// -- r1 : constructor |
// -- r2 : AllocationSite or undefined |
// -- sp[0] : return address |
@@ -4973,9 +4973,9 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) { |
Register api_function_address = r1; |
Register context = cp; |
- int argc = ArgumentBits::decode(bit_field_); |
- bool is_store = IsStoreBits::decode(bit_field_); |
- bool call_data_undefined = CallDataUndefinedBits::decode(bit_field_); |
+ int argc = this->argc(); |
+ bool is_store = this->is_store(); |
+ bool call_data_undefined = this->call_data_undefined(); |
typedef FunctionCallbackArguments FCA; |