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

Unified Diff: src/ia32/macro-assembler-ia32-inl.h

Issue 7029030: Use page header information to test for InNewSpace. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/gc
Patch Set: Addressed review comments. Created 9 years, 7 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/macro-assembler-ia32.h ('k') | src/objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 634a3e1e2ee7ae3ceac912b0ce92fa3d03cb2411..e9cba90ded0d0919d79d584aa770bb95c5803926 100644
--- a/src/ia32/macro-assembler-ia32-inl.h
+++ b/src/ia32/macro-assembler-ia32-inl.h
@@ -33,7 +33,6 @@
namespace v8 {
namespace internal {
-
template<typename LabelType>
void MacroAssembler::CheckPageFlag(
Register object,
@@ -41,9 +40,19 @@ void MacroAssembler::CheckPageFlag(
MemoryChunk::MemoryChunkFlags flag,
Condition cc,
LabelType* condition_met) {
- Move(scratch, object);
- and_(scratch, ~Page::kPageAlignmentMask);
- test(Operand(scratch, MemoryChunk::kFlagsOffset), Immediate(1 << flag));
+ ASSERT(cc == zero || cc == not_zero);
+ if (scratch.is(object)) {
+ and_(scratch, Immediate(~Page::kPageAlignmentMask));
+ } else {
+ mov(scratch, Immediate(~Page::kPageAlignmentMask));
+ and_(scratch, Operand(object));
+ }
+ if (flag < kBitsPerByte) {
+ test_b(Operand(scratch, MemoryChunk::kFlagsOffset),
+ static_cast<uint8_t>(1u << flag));
+ } else {
+ test(Operand(scratch, MemoryChunk::kFlagsOffset), Immediate(1 << flag));
+ }
j(cc, condition_met);
}
« no previous file with comments | « src/ia32/macro-assembler-ia32.h ('k') | src/objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698