| Index: src/ia32/code-stubs-ia32.cc
|
| diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
|
| index 1714e4a3e03fe6dd31144dc1983b2cbf15c32163..042ac500f6ecb191ab3fd2832104e9630d51ed56 100644
|
| --- a/src/ia32/code-stubs-ia32.cc
|
| +++ b/src/ia32/code-stubs-ia32.cc
|
| @@ -642,7 +642,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| __ mov(scratch, Immediate(1));
|
| __ Cvtsi2sd(double_result, scratch);
|
|
|
| - 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.
|
| @@ -673,7 +673,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| __ j(not_equal, &call_runtime);
|
| __ movsd(double_exponent,
|
| FieldOperand(exponent, HeapNumber::kValueOffset));
|
| - } else if (exponent_type_ == TAGGED) {
|
| + } else if (exponent_type() == TAGGED) {
|
| __ JumpIfNotSmi(exponent, &exponent_not_smi, Label::kNear);
|
| __ SmiUntag(exponent);
|
| __ jmp(&int_exponent);
|
| @@ -683,7 +683,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| FieldOperand(exponent, HeapNumber::kValueOffset));
|
| }
|
|
|
| - if (exponent_type_ != INTEGER) {
|
| + if (exponent_type() != INTEGER) {
|
| Label fast_power, try_arithmetic_simplification;
|
| __ DoubleToI(exponent, double_exponent, double_scratch,
|
| TREAT_MINUS_ZERO_AS_ZERO, &try_arithmetic_simplification);
|
| @@ -695,7 +695,7 @@ void MathPowStub::Generate(MacroAssembler* masm) {
|
| __ cmp(exponent, Immediate(0x1));
|
| __ j(overflow, &call_runtime);
|
|
|
| - 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.
|
| @@ -857,7 +857,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);
|
| @@ -2282,7 +2282,7 @@ static void CallFunctionNoFeedback(MacroAssembler* masm,
|
|
|
|
|
| void CallFunctionStub::Generate(MacroAssembler* masm) {
|
| - CallFunctionNoFeedback(masm, argc_, NeedsChecks(), CallAsMethod());
|
| + CallFunctionNoFeedback(masm, argc(), NeedsChecks(), CallAsMethod());
|
| }
|
|
|
|
|
| @@ -4493,9 +4493,8 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
|
| __ mov(ebx, MemOperand(ebp, parameter_count_offset));
|
| masm->LeaveFrame(StackFrame::STUB_FAILURE_TRAMPOLINE);
|
| __ pop(ecx);
|
| - int additional_offset = function_mode_ == JS_FUNCTION_STUB_MODE
|
| - ? kPointerSize
|
| - : 0;
|
| + int additional_offset =
|
| + function_mode() == JS_FUNCTION_STUB_MODE ? kPointerSize : 0;
|
| __ lea(esp, MemOperand(esp, ebx, times_pointer_size, additional_offset));
|
| __ jmp(ecx); // Return to IC Miss stub, continuation still on stack.
|
| }
|
| @@ -4695,7 +4694,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;
|
| __ test(eax, eax);
|
| __ j(not_zero, ¬_zero_case);
|
| @@ -4708,11 +4707,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();
|
| @@ -4722,7 +4721,7 @@ void ArrayConstructorStub::GenerateDispatchToArrayStub(
|
|
|
| void ArrayConstructorStub::Generate(MacroAssembler* masm) {
|
| // ----------- S t a t e -------------
|
| - // -- eax : argc (only if argument_count_ == ANY)
|
| + // -- eax : argc (only if argument_count() == ANY)
|
| // -- ebx : AllocationSite or undefined
|
| // -- edi : constructor
|
| // -- esp[0] : return address
|
| @@ -4870,9 +4869,9 @@ void CallApiFunctionStub::Generate(MacroAssembler* masm) {
|
| Register return_address = edi;
|
| Register context = esi;
|
|
|
| - 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;
|
|
|
|
|