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

Side by Side Diff: src/mark-compact-inl.h

Issue 23708030: Get rid of most uses of 'Temporary macro' HEAP (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: nits Created 7 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/liveedit.cc ('k') | src/x64/assembler-x64.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ((flags & Heap::kAbortIncrementalMarkingMask) != 0); 51 ((flags & Heap::kAbortIncrementalMarkingMask) != 0);
52 } 52 }
53 53
54 54
55 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) { 55 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) {
56 ASSERT(Marking::MarkBitFrom(obj) == mark_bit); 56 ASSERT(Marking::MarkBitFrom(obj) == mark_bit);
57 if (!mark_bit.Get()) { 57 if (!mark_bit.Get()) {
58 mark_bit.Set(); 58 mark_bit.Set();
59 MemoryChunk::IncrementLiveBytesFromGC(obj->address(), obj->Size()); 59 MemoryChunk::IncrementLiveBytesFromGC(obj->address(), obj->Size());
60 ASSERT(IsMarked(obj)); 60 ASSERT(IsMarked(obj));
61 ASSERT(HEAP->Contains(obj)); 61 ASSERT(obj->GetIsolate()->heap()->Contains(obj));
62 marking_deque_.PushBlack(obj); 62 marking_deque_.PushBlack(obj);
63 } 63 }
64 } 64 }
65 65
66 66
67 void MarkCompactCollector::SetMark(HeapObject* obj, MarkBit mark_bit) { 67 void MarkCompactCollector::SetMark(HeapObject* obj, MarkBit mark_bit) {
68 ASSERT(!mark_bit.Get()); 68 ASSERT(!mark_bit.Get());
69 ASSERT(Marking::MarkBitFrom(obj) == mark_bit); 69 ASSERT(Marking::MarkBitFrom(obj) == mark_bit);
70 mark_bit.Set(); 70 mark_bit.Set();
71 MemoryChunk::IncrementLiveBytesFromGC(obj->address(), obj->Size()); 71 MemoryChunk::IncrementLiveBytesFromGC(obj->address(), obj->Size());
(...skipping 19 matching lines...) Expand all
91 SlotsBuffer::FAIL_ON_OVERFLOW)) { 91 SlotsBuffer::FAIL_ON_OVERFLOW)) {
92 EvictEvacuationCandidate(object_page); 92 EvictEvacuationCandidate(object_page);
93 } 93 }
94 } 94 }
95 } 95 }
96 96
97 97
98 } } // namespace v8::internal 98 } } // namespace v8::internal
99 99
100 #endif // V8_MARK_COMPACT_INL_H_ 100 #endif // V8_MARK_COMPACT_INL_H_
OLDNEW
« no previous file with comments | « src/liveedit.cc ('k') | src/x64/assembler-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698