Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index c99094b005e71b2f29241ad1970c6919223e4a5b..7c6543108c23057354e79414e816cfc66fca95c3 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -3874,9 +3874,9 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
Label in_dictionary, maybe_in_dictionary, not_in_dictionary; |
- Register scratch = result_; |
+ Register scratch = result(); |
- __ mov(scratch, FieldOperand(dictionary_, kCapacityOffset)); |
+ __ mov(scratch, FieldOperand(dictionary(), kCapacityOffset)); |
__ dec(scratch); |
__ SmiUntag(scratch); |
__ push(scratch); |
@@ -3896,13 +3896,11 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
// Scale the index by multiplying by the entry size. |
DCHECK(NameDictionary::kEntrySize == 3); |
- __ lea(index_, Operand(scratch, scratch, times_2, 0)); // index *= 3. |
+ __ lea(index(), Operand(scratch, scratch, times_2, 0)); // index *= 3. |
// Having undefined at this place means the name is not contained. |
DCHECK_EQ(kSmiTagSize, 1); |
- __ mov(scratch, Operand(dictionary_, |
- index_, |
- times_pointer_size, |
+ __ mov(scratch, Operand(dictionary(), index(), times_pointer_size, |
kElementsStartOffset - kHeapObjectTag)); |
__ cmp(scratch, isolate()->factory()->undefined_value()); |
__ j(equal, ¬_in_dictionary); |
@@ -3911,7 +3909,7 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
__ cmp(scratch, Operand(esp, 3 * kPointerSize)); |
__ j(equal, &in_dictionary); |
- if (i != kTotalProbes - 1 && mode_ == NEGATIVE_LOOKUP) { |
+ if (i != kTotalProbes - 1 && mode() == NEGATIVE_LOOKUP) { |
// If we hit a key that is not a unique name during negative |
// lookup we have to bailout as this key might be equal to the |
// key we are looking for. |
@@ -3927,19 +3925,19 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
// If we are doing negative lookup then probing failure should be |
// treated as a lookup success. For positive lookup probing failure |
// should be treated as lookup failure. |
- if (mode_ == POSITIVE_LOOKUP) { |
- __ mov(result_, Immediate(0)); |
+ if (mode() == POSITIVE_LOOKUP) { |
+ __ mov(result(), Immediate(0)); |
__ Drop(1); |
__ ret(2 * kPointerSize); |
} |
__ bind(&in_dictionary); |
- __ mov(result_, Immediate(1)); |
+ __ mov(result(), Immediate(1)); |
__ Drop(1); |
__ ret(2 * kPointerSize); |
__ bind(¬_in_dictionary); |
- __ mov(result_, Immediate(0)); |
+ __ mov(result(), Immediate(0)); |
__ Drop(1); |
__ ret(2 * kPointerSize); |
} |
@@ -3969,11 +3967,8 @@ void RecordWriteStub::Generate(MacroAssembler* masm) { |
__ jmp(&skip_to_incremental_noncompacting, Label::kNear); |
__ jmp(&skip_to_incremental_compacting, Label::kFar); |
- if (remembered_set_action_ == EMIT_REMEMBERED_SET) { |
- __ RememberedSetHelper(object_, |
- address_, |
- value_, |
- save_fp_regs_mode_, |
+ if (remembered_set_action() == EMIT_REMEMBERED_SET) { |
+ __ RememberedSetHelper(object(), address(), value(), save_fp_regs_mode(), |
MacroAssembler::kReturnAtEnd); |
} else { |
__ ret(0); |
@@ -3995,7 +3990,7 @@ void RecordWriteStub::Generate(MacroAssembler* masm) { |
void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) { |
regs_.Save(masm); |
- if (remembered_set_action_ == EMIT_REMEMBERED_SET) { |
+ if (remembered_set_action() == EMIT_REMEMBERED_SET) { |
Label dont_need_remembered_set; |
__ mov(regs_.scratch0(), Operand(regs_.address(), 0)); |
@@ -4017,10 +4012,7 @@ void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) { |
mode); |
InformIncrementalMarker(masm); |
regs_.Restore(masm); |
- __ RememberedSetHelper(object_, |
- address_, |
- value_, |
- save_fp_regs_mode_, |
+ __ RememberedSetHelper(object(), address(), value(), save_fp_regs_mode(), |
MacroAssembler::kReturnAtEnd); |
__ bind(&dont_need_remembered_set); |
@@ -4037,7 +4029,7 @@ void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) { |
void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm) { |
- regs_.SaveCallerSaveRegisters(masm, save_fp_regs_mode_); |
+ regs_.SaveCallerSaveRegisters(masm, save_fp_regs_mode()); |
int argument_count = 3; |
__ PrepareCallCFunction(argument_count, regs_.scratch0()); |
__ mov(Operand(esp, 0 * kPointerSize), regs_.object()); |
@@ -4050,7 +4042,7 @@ void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm) { |
ExternalReference::incremental_marking_record_write_function(isolate()), |
argument_count); |
- regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode_); |
+ regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode()); |
} |
@@ -4081,10 +4073,7 @@ void RecordWriteStub::CheckNeedsToInformIncrementalMarker( |
regs_.Restore(masm); |
if (on_no_need == kUpdateRememberedSetOnNoNeedToInformIncrementalMarker) { |
- __ RememberedSetHelper(object_, |
- address_, |
- value_, |
- save_fp_regs_mode_, |
+ __ RememberedSetHelper(object(), address(), value(), save_fp_regs_mode(), |
MacroAssembler::kReturnAtEnd); |
} else { |
__ ret(0); |
@@ -4129,10 +4118,7 @@ void RecordWriteStub::CheckNeedsToInformIncrementalMarker( |
regs_.Restore(masm); |
if (on_no_need == kUpdateRememberedSetOnNoNeedToInformIncrementalMarker) { |
- __ RememberedSetHelper(object_, |
- address_, |
- value_, |
- save_fp_regs_mode_, |
+ __ RememberedSetHelper(object(), address(), value(), save_fp_regs_mode(), |
MacroAssembler::kReturnAtEnd); |
} else { |
__ ret(0); |