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

Side by Side Diff: src/x64/macro-assembler-x64.cc

Issue 7977005: Put back the asserts in RememberedSetHelper, but correct this time. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/x64/macro-assembler-x64.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 190
191 void MacroAssembler::CompareRoot(const Operand& with, 191 void MacroAssembler::CompareRoot(const Operand& with,
192 Heap::RootListIndex index) { 192 Heap::RootListIndex index) {
193 ASSERT(root_array_available_); 193 ASSERT(root_array_available_);
194 ASSERT(!with.AddressUsesRegister(kScratchRegister)); 194 ASSERT(!with.AddressUsesRegister(kScratchRegister));
195 LoadRoot(kScratchRegister, index); 195 LoadRoot(kScratchRegister, index);
196 cmpq(with, kScratchRegister); 196 cmpq(with, kScratchRegister);
197 } 197 }
198 198
199 199
200 void MacroAssembler::RememberedSetHelper(Register addr, 200 void MacroAssembler::RememberedSetHelper(Register object, // For debug tests.
201 Register addr,
201 Register scratch, 202 Register scratch,
202 SaveFPRegsMode save_fp, 203 SaveFPRegsMode save_fp,
203 RememberedSetFinalAction and_then) { 204 RememberedSetFinalAction and_then) {
205 if (FLAG_debug_code) {
206 Label ok;
207 JumpIfNotInNewSpace(object, scratch, &ok, Label::kNear);
208 int3();
209 bind(&ok);
210 }
204 // Load store buffer top. 211 // Load store buffer top.
205 LoadRoot(scratch, Heap::kStoreBufferTopRootIndex); 212 LoadRoot(scratch, Heap::kStoreBufferTopRootIndex);
206 // Store pointer to buffer. 213 // Store pointer to buffer.
207 movq(Operand(scratch, 0), addr); 214 movq(Operand(scratch, 0), addr);
208 // Increment buffer top. 215 // Increment buffer top.
209 addq(scratch, Immediate(kPointerSize)); 216 addq(scratch, Immediate(kPointerSize));
210 // Write back new top of buffer. 217 // Write back new top of buffer.
211 StoreRoot(scratch, Heap::kStoreBufferTopRootIndex); 218 StoreRoot(scratch, Heap::kStoreBufferTopRootIndex);
212 // Call stub on end of buffer. 219 // Call stub on end of buffer.
213 Label done; 220 Label done;
(...skipping 3975 matching lines...) Expand 10 before | Expand all | Expand 10 after
4189 4196
4190 and_(bitmap_scratch, Immediate(~Page::kPageAlignmentMask)); 4197 and_(bitmap_scratch, Immediate(~Page::kPageAlignmentMask));
4191 addl(Operand(bitmap_scratch, MemoryChunk::kLiveBytesOffset), length); 4198 addl(Operand(bitmap_scratch, MemoryChunk::kLiveBytesOffset), length);
4192 4199
4193 bind(&done); 4200 bind(&done);
4194 } 4201 }
4195 4202
4196 } } // namespace v8::internal 4203 } } // namespace v8::internal
4197 4204
4198 #endif // V8_TARGET_ARCH_X64 4205 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/macro-assembler-x64.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698