Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index f64644a0d4286f2214e22a5fba70c1f3d8138e83..c54e3d8dc6413f847b42ff036a50d28d4c69d9b4 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -3811,9 +3811,9 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
Label in_dictionary, maybe_in_dictionary, not_in_dictionary; |
- Register scratch = result_; |
+ Register scratch = result(); |
- __ SmiToInteger32(scratch, FieldOperand(dictionary_, kCapacityOffset)); |
+ __ SmiToInteger32(scratch, FieldOperand(dictionary(), kCapacityOffset)); |
__ decl(scratch); |
__ Push(scratch); |
@@ -3834,12 +3834,10 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
// Scale the index by multiplying by the entry size. |
DCHECK(NameDictionary::kEntrySize == 3); |
- __ leap(index_, Operand(scratch, scratch, times_2, 0)); // index *= 3. |
+ __ leap(index(), Operand(scratch, scratch, times_2, 0)); // index *= 3. |
// Having undefined at this place means the name is not contained. |
- __ movp(scratch, Operand(dictionary_, |
- index_, |
- times_pointer_size, |
+ __ movp(scratch, Operand(dictionary(), index(), times_pointer_size, |
kElementsStartOffset - kHeapObjectTag)); |
__ Cmp(scratch, isolate()->factory()->undefined_value()); |
@@ -3849,7 +3847,7 @@ void NameDictionaryLookupStub::Generate(MacroAssembler* masm) { |
__ cmpp(scratch, args.GetArgumentOperand(0)); |
__ 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. |
@@ -3865,7 +3863,7 @@ 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) { |
+ if (mode() == POSITIVE_LOOKUP) { |
__ movp(scratch, Immediate(0)); |
__ Drop(1); |
__ ret(2 * kPointerSize); |
@@ -3908,11 +3906,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); |
@@ -3934,7 +3929,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; |
__ movp(regs_.scratch0(), Operand(regs_.address(), 0)); |
@@ -3954,10 +3949,7 @@ void RecordWriteStub::GenerateIncremental(MacroAssembler* masm, Mode mode) { |
masm, kUpdateRememberedSetOnNoNeedToInformIncrementalMarker, 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); |
@@ -3972,7 +3964,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()); |
Register address = |
arg_reg_1.is(regs_.address()) ? kScratchRegister : regs_.address(); |
DCHECK(!address.is(regs_.object())); |
@@ -3990,7 +3982,7 @@ void RecordWriteStub::InformIncrementalMarker(MacroAssembler* masm) { |
__ CallCFunction( |
ExternalReference::incremental_marking_record_write_function(isolate()), |
argument_count); |
- regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode_); |
+ regs_.RestoreCallerSaveRegisters(masm, save_fp_regs_mode()); |
} |
@@ -4023,10 +4015,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); |
@@ -4068,10 +4057,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); |