Chromium Code Reviews| Index: src/ia32/macro-assembler-ia32-inl.h |
| diff --git a/src/ia32/macro-assembler-ia32-inl.h b/src/ia32/macro-assembler-ia32-inl.h |
| index 8e0e59f86415ba3f17e84bda137fcbbf75a87233..5dc5fd26cfbc6501734c86f8091267eae41587ec 100644 |
| --- a/src/ia32/macro-assembler-ia32-inl.h |
| +++ b/src/ia32/macro-assembler-ia32-inl.h |
| @@ -33,17 +33,22 @@ |
| namespace v8 { |
| namespace internal { |
| + |
| template<typename LabelType> |
| -void MacroAssembler::HasScanOnScavenge(Register object, |
| - Register scratch, |
| - LabelType* scan_on_scavenge) { |
| +void MacroAssembler::CheckPageFlag( |
| + Register object, |
| + Register scratch, |
| + MemoryChunk::MemoryChunkFlags flag, |
| + Condition cc, |
| + LabelType* not_set) { |
|
Erik Corry
2011/05/11 18:53:57
not_set seems like the wrong name, since it means
Vyacheslav Egorov (Chromium)
2011/05/13 11:06:52
Done.
|
| Move(scratch, object); |
| and_(scratch, ~Page::kPageAlignmentMask); |
| - cmpb(Operand(scratch, MemoryChunk::kScanOnScavengeOffset), 0); |
| - j(not_equal, scan_on_scavenge); |
| + test(Operand(scratch, MemoryChunk::kFlagsOffset), Immediate(1 << flag)); |
| + j(cc, not_set); |
| } |
| + |
| template<typename LabelType> |
| void MacroAssembler::InOldSpaceIsBlack(Register object, |
| Register scratch0, |