Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(837)

Unified Diff: src/ia32/code-stubs-ia32.cc

Issue 7122003: Make x64 to use the RecordWrite stub. This is a step towards getting (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ia32/code-stubs-ia32.h ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ia32/code-stubs-ia32.cc
===================================================================
--- src/ia32/code-stubs-ia32.cc (revision 8207)
+++ src/ia32/code-stubs-ia32.cc (working copy)
@@ -6236,10 +6236,16 @@
// written is in the address register.
void RecordWriteStub::Generate(MacroAssembler* masm) {
Label skip_non_incremental_part;
+
+ // The first instruction is generated as a label so as to get the offset
+ // fixed up correctly by the bind(Label*) call. We patch it back and forth
+ // between a 2-byte compare instruction (a nop in this position) and the real
+ // branch when we start and stop incremental heap marking.
__ jmp(&skip_non_incremental_part, Label::kNear);
- if (!HEAP->incremental_marking()->IsMarking()) {
- ASSERT(masm->get_opcode(-2) == kSkipNonIncrementalPartInstruction);
- masm->set_opcode(-2, kTwoByteNopInstruction);
+ if (!masm->isolate()->heap()->incremental_marking()->IsMarking()) {
+ ASSERT(masm->byte_at(masm->pc_offset() - 2) ==
+ kSkipNonIncrementalPartInstruction);
+ masm->set_byte_at(masm->pc_offset() - 2, kTwoByteNopInstruction);
}
if (remembered_set_action_ == EMIT_REMEMBERED_SET) {
« no previous file with comments | « src/ia32/code-stubs-ia32.h ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698