| Index: src/ia32/code-stubs-ia32.cc
|
| ===================================================================
|
| --- src/ia32/code-stubs-ia32.cc (revision 9343)
|
| +++ src/ia32/code-stubs-ia32.cc (working copy)
|
| @@ -6662,8 +6662,11 @@
|
| __ jmp(&skip_to_incremental_compacting, Label::kFar);
|
|
|
| if (remembered_set_action_ == EMIT_REMEMBERED_SET) {
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
| } else {
|
| __ ret(0);
|
| }
|
| @@ -6688,7 +6691,7 @@
|
| Label dont_need_remembered_set;
|
|
|
| __ mov(regs_.scratch0(), Operand(regs_.address(), 0));
|
| - __ JumpIfNotInNewSpace(regs_.scratch0(),
|
| + __ JumpIfNotInNewSpace(regs_.scratch0(), // Value.
|
| regs_.scratch0(),
|
| &dont_need_remembered_set);
|
|
|
| @@ -6706,8 +6709,11 @@
|
| mode);
|
| InformIncrementalMarker(masm, mode);
|
| regs_.Restore(masm);
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
|
|
| __ bind(&dont_need_remembered_set);
|
| }
|
| @@ -6770,8 +6776,11 @@
|
|
|
| regs_.Restore(masm);
|
| if (on_no_need == kUpdateRememberedSetOnNoNeedToInformIncrementalMarker) {
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
| } else {
|
| __ ret(0);
|
| }
|
| @@ -6815,8 +6824,11 @@
|
|
|
| regs_.Restore(masm);
|
| if (on_no_need == kUpdateRememberedSetOnNoNeedToInformIncrementalMarker) {
|
| - __ RememberedSetHelper(
|
| - address_, value_, save_fp_regs_mode_, MacroAssembler::kReturnAtEnd);
|
| + __ RememberedSetHelper(object_,
|
| + address_,
|
| + value_,
|
| + save_fp_regs_mode_,
|
| + MacroAssembler::kReturnAtEnd);
|
| } else {
|
| __ ret(0);
|
| }
|
|
|