Merge AllocationSpace into MarkedSpace
authormhahnenberg@apple.com <mhahnenberg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jan 2012 02:30:38 +0000 (02:30 +0000)
committermhahnenberg@apple.com <mhahnenberg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Jan 2012 02:30:38 +0000 (02:30 +0000)
commite38e27780b302d62f2f88e5426f48d2f884201bc
tree345a0ccb14ff7cbc543ce81c65fd8e316bcd81f9
parent7749c3e2346a2594ffd7e5e53ef925f088e1f061
Merge AllocationSpace into MarkedSpace
https://bugs.webkit.org/show_bug.cgi?id=77116

Reviewed by Geoffrey Garen.

Merging AllocationSpace and MarkedSpace in preparation for future refactoring/enhancement to
MarkedSpace allocation.

* CMakeLists.txt:
* GNUmakefile.list.am:
* JavaScriptCore.exp:
* JavaScriptCore.gypi:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Target.pri:
* heap/AllocationSpace.cpp: Removed.
* heap/AllocationSpace.h: Removed.
* heap/BumpSpace.h:
(BumpSpace):
* heap/Heap.h:
(JSC::Heap::objectSpace):
(Heap):
():
* heap/HeapBlock.h:
():
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::tryAllocateHelper):
(JSC):
(JSC::MarkedSpace::tryAllocate):
(JSC::MarkedSpace::allocateSlowCase):
(JSC::MarkedSpace::allocateBlock):
(JSC::MarkedSpace::freeBlocks):
(TakeIfUnmarked):
(JSC::TakeIfUnmarked::TakeIfUnmarked):
(JSC::TakeIfUnmarked::operator()):
(JSC::TakeIfUnmarked::returnValue):
(JSC::MarkedSpace::shrink):
(GatherDirtyCells):
(JSC::GatherDirtyCells::returnValue):
(JSC::GatherDirtyCells::GatherDirtyCells):
(JSC::GatherDirtyCells::operator()):
(JSC::MarkedSpace::gatherDirtyCells):
* heap/MarkedSpace.h:
(MarkedSpace):
(JSC::MarkedSpace::blocks):
(JSC::MarkedSpace::forEachCell):
(JSC):
(JSC::MarkedSpace::allocate):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@106078 268f45cc-cd09-0410-ab3c-d52691b4dbfc
16 files changed:
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/GNUmakefile.list.am
Source/JavaScriptCore/JavaScriptCore.exp
Source/JavaScriptCore/JavaScriptCore.gypi
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/Target.pri
Source/JavaScriptCore/heap/AllocationSpace.cpp [deleted file]
Source/JavaScriptCore/heap/AllocationSpace.h [deleted file]
Source/JavaScriptCore/heap/BumpSpace.h
Source/JavaScriptCore/heap/Heap.h
Source/JavaScriptCore/heap/HeapBlock.h
Source/JavaScriptCore/heap/MarkedSpace.cpp
Source/JavaScriptCore/heap/MarkedSpace.h