Changeset 96372 in webkit for trunk/Source/JavaScriptCore/heap/CardSet.h

Timestamp:

Sep 29, 2011, 3:52:45 PM (14 years ago)

Author:

[email protected]

Message:

Add logic to collect dirty objects as roots
​https://bugs.webkit.org/show_bug.cgi?id=69100

Reviewed by Geoff Garen.

This gives us the ability to walk all the MarkedBlocks in an
AllocationSpace and collect the dirty objects, and then use
them as GC roots.

• dfg/DFGJITCodeGenerator.cpp:

(JSC::DFG::JITCodeGenerator::markCellCard):

• dfg/DFGJITCodeGenerator32_64.cpp:

(JSC::DFG::JITCodeGenerator::markCellCard):

• heap/AllocationSpace.cpp:

Tidy up the write barrier logic a bit

(JSC::MarkedBlock::gatherDirtyObjects):
(JSC::TakeIfDirty::returnValue):
(JSC::TakeIfDirty::TakeIfDirty):
(JSC::TakeIfDirty::operator()):
(JSC::AllocationSpace::gatherDirtyObjects):

• heap/AllocationSpace.h:
• heap/CardSet.h:

(JSC::::isCardMarked):
(JSC::::clearCard):

• heap/Heap.cpp:

(JSC::Heap::markRoots):

• heap/Heap.h:

(JSC::Heap::writeBarrier):

• heap/MarkStack.cpp:

(JSC::SlotVisitor::visitChildren):

• heap/MarkedBlock.h:

(JSC::MarkedBlock::setDirtyObject):
(JSC::MarkedBlock::addressOfCardFor):

• heap/SlotVisitor.h:
• jit/JITPropertyAccess.cpp:

(JSC::JIT::emitWriteBarrier):

Tidy the write barrier a bit

File:

• trunk/Source/JavaScriptCore/heap/CardSet.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/heap/CardSet.h

@@ -35 +35 @@
 template <size_t cardSize, size_t blockSize> class CardSet {
     WTF_MAKE_NONCOPYABLE(CardSet);
+
+public:
     static const size_t cardCount = (blockSize + cardSize - 1) / cardSize;
 
-public:
     CardSet()
     {
@@ -46 +47 @@
     void markCardForAtom(const void*);
     uint8_t& cardForAtom(const void*);
+    bool isCardMarked(size_t);
+    void clearCard(size_t);
 
 private:
@@ -70 +73 @@
 }
 
+template <size_t cardSize, size_t blockSize> bool CardSet<cardSize, blockSize>::isCardMarked(size_t i)
+{
+    ASSERT(i < cardCount);
+    return m_cards[i];
+}
+
+template <size_t cardSize, size_t blockSize> void CardSet<cardSize, blockSize>::clearCard(size_t i)
+{
+    ASSERT(i < cardCount);
+    m_cards[i] = 0;
+}
+
 }