Skip to content

Commit c7b27cc

Browse files
geoffreygarengeoffreygaren
committed
2011-04-11 Geoffrey Garen <ggaren@apple.com>
 Rubber-stamped by Sam Weinig. Moved remaining heap implementation files to the heap folder. * Android.mk: * CMakeLists.txt: * GNUmakefile.list.am: * JavaScriptCore.gypi: * JavaScriptCore.pro: * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: * JavaScriptCore.xcodeproj/project.pbxproj: * heap/ConservativeRoots.cpp: Copied from runtime/ConservativeSet.cpp. * heap/ConservativeRoots.h: Copied from runtime/ConservativeSet.h. * heap/Handle.h: * heap/Heap.cpp: * heap/MachineStackMarker.cpp: Copied from runtime/MachineStackMarker.cpp. * heap/MachineStackMarker.h: Copied from runtime/MachineStackMarker.h. * heap/MarkStack.cpp: Copied from runtime/MarkStack.cpp. * heap/MarkStack.h: Copied from runtime/MarkStack.h. * heap/MarkStackPosix.cpp: Copied from runtime/MarkStackPosix.cpp. * heap/MarkStackSymbian.cpp: Copied from runtime/MarkStackSymbian.cpp. * heap/MarkStackWin.cpp: Copied from runtime/MarkStackWin.cpp. * heap/MarkedBlock.cpp: Copied from runtime/MarkedBlock.cpp. * heap/MarkedBlock.h: Copied from runtime/MarkedBlock.h. * heap/MarkedSpace.cpp: Copied from runtime/MarkedSpace.cpp. * heap/MarkedSpace.h: Copied from runtime/MarkedSpace.h. * interpreter/RegisterFile.cpp: * runtime/ConservativeSet.cpp: Removed. * runtime/ConservativeSet.h: Removed. * runtime/MachineStackMarker.cpp: Removed. * runtime/MachineStackMarker.h: Removed. * runtime/MarkStack.cpp: Removed. * runtime/MarkStack.h: Removed. * runtime/MarkStackPosix.cpp: Removed. * runtime/MarkStackSymbian.cpp: Removed. * runtime/MarkStackWin.cpp: Removed. * runtime/MarkedBlock.cpp: Removed. * runtime/MarkedBlock.h: Removed. * runtime/MarkedSpace.cpp: Removed. * runtime/MarkedSpace.h: Removed. Canonical link: https://commits.webkit.org/73270@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83506 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5ca747d commit c7b27cc

24 files changed

Lines changed: 177 additions & 135 deletions

‎Source/JavaScriptCore/Android.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ LOCAL_SRC_FILES := \
4141
debugger/DebuggerActivation.cpp \
4242
debugger/DebuggerCallFrame.cpp \
4343
\
44+
heap/ConservativeRoots.cpp \
4445
heap/Heap.cpp \
46+
heap/MachineStackMarker.cpp \
47+
heap/MarkStack.cpp \
48+
heap/MarkStackPosix.cpp \
49+
heap/MarkedBlock.cpp \
50+
heap/MarkedSpace.cpp \
4551
\
4652
interpreter/CallFrame.cpp \
4753
interpreter/Interpreter.cpp \
@@ -76,8 +82,6 @@ LOCAL_SRC_FILES := \
7682
runtime/BooleanObject.cpp \
7783
runtime/BooleanPrototype.cpp \
7884
runtime/CallData.cpp \
79-
runtime/MarkedBlock.cpp \
80-
runtime/MarkedSpace.cpp \
8185
runtime/CommonIdentifiers.cpp \
8286
runtime/Completion.cpp \
8387
runtime/ConstructData.cpp \
@@ -119,10 +123,6 @@ LOCAL_SRC_FILES := \
119123
runtime/JSWrapperObject.cpp \
120124
runtime/LiteralParser.cpp \
121125
runtime/Lookup.cpp \
122-
runtime/MachineStackMarker.cpp \
123-
runtime/ConservativeSet.cpp \
124-
runtime/MarkStack.cpp \
125-
runtime/MarkStackPosix.cpp \
126126
runtime/MathObject.cpp \
127127
runtime/NativeErrorConstructor.cpp \
128128
runtime/NativeErrorPrototype.cpp \

‎Source/JavaScriptCore/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ SET(JavaScriptCore_SOURCES
4444
heap/Heap.cpp
4545
heap/HandleHeap.cpp
4646
heap/HandleStack.cpp
47+
heap/MachineStackMarker.cpp
48+
heap/MarkedBlock.cpp
49+
heap/MarkedSpace.cpp
50+
heap/ConservativeSet.cpp
51+
heap/MarkStack.cpp
4752

4853
debugger/Debugger.cpp
4954
debugger/DebuggerActivation.cpp
@@ -86,8 +91,6 @@ SET(JavaScriptCore_SOURCES
8691
runtime/BooleanObject.cpp
8792
runtime/BooleanPrototype.cpp
8893
runtime/CallData.cpp
89-
runtime/MarkedBlock.cpp
90-
runtime/MarkedSpace.cpp
9194
runtime/CommonIdentifiers.cpp
9295
runtime/Completion.cpp
9396
runtime/ConstructData.cpp
@@ -131,9 +134,6 @@ SET(JavaScriptCore_SOURCES
131134
runtime/JSZombie.cpp
132135
runtime/LiteralParser.cpp
133136
runtime/Lookup.cpp
134-
runtime/MachineStackMarker.cpp
135-
runtime/ConservativeSet.cpp
136-
runtime/MarkStack.cpp
137137
runtime/MathObject.cpp
138138
runtime/NativeErrorConstructor.cpp
139139
runtime/NativeErrorPrototype.cpp

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,46 @@
1+
2011-04-11 Geoffrey Garen <ggaren@apple.com>
2+
3+
Rubber-stamped by Sam Weinig.
4+
5+
Moved remaining heap implementation files to the heap folder.
6+
7+
* Android.mk:
8+
* CMakeLists.txt:
9+
* GNUmakefile.list.am:
10+
* JavaScriptCore.gypi:
11+
* JavaScriptCore.pro:
12+
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
13+
* JavaScriptCore.xcodeproj/project.pbxproj:
14+
* heap/ConservativeRoots.cpp: Copied from runtime/ConservativeSet.cpp.
15+
* heap/ConservativeRoots.h: Copied from runtime/ConservativeSet.h.
16+
* heap/Handle.h:
17+
* heap/Heap.cpp:
18+
* heap/MachineStackMarker.cpp: Copied from runtime/MachineStackMarker.cpp.
19+
* heap/MachineStackMarker.h: Copied from runtime/MachineStackMarker.h.
20+
* heap/MarkStack.cpp: Copied from runtime/MarkStack.cpp.
21+
* heap/MarkStack.h: Copied from runtime/MarkStack.h.
22+
* heap/MarkStackPosix.cpp: Copied from runtime/MarkStackPosix.cpp.
23+
* heap/MarkStackSymbian.cpp: Copied from runtime/MarkStackSymbian.cpp.
24+
* heap/MarkStackWin.cpp: Copied from runtime/MarkStackWin.cpp.
25+
* heap/MarkedBlock.cpp: Copied from runtime/MarkedBlock.cpp.
26+
* heap/MarkedBlock.h: Copied from runtime/MarkedBlock.h.
27+
* heap/MarkedSpace.cpp: Copied from runtime/MarkedSpace.cpp.
28+
* heap/MarkedSpace.h: Copied from runtime/MarkedSpace.h.
29+
* interpreter/RegisterFile.cpp:
30+
* runtime/ConservativeSet.cpp: Removed.
31+
* runtime/ConservativeSet.h: Removed.
32+
* runtime/MachineStackMarker.cpp: Removed.
33+
* runtime/MachineStackMarker.h: Removed.
34+
* runtime/MarkStack.cpp: Removed.
35+
* runtime/MarkStack.h: Removed.
36+
* runtime/MarkStackPosix.cpp: Removed.
37+
* runtime/MarkStackSymbian.cpp: Removed.
38+
* runtime/MarkStackWin.cpp: Removed.
39+
* runtime/MarkedBlock.cpp: Removed.
40+
* runtime/MarkedBlock.h: Removed.
41+
* runtime/MarkedSpace.cpp: Removed.
42+
* runtime/MarkedSpace.h: Removed.
43+
144
2011-04-11 Gavin Barraclough <barraclough@apple.com>
245

346
Windows build fix.

‎Source/JavaScriptCore/GNUmakefile.list.am‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ javascriptcore_sources += \
8787
Source/JavaScriptCore/bytecompiler/LabelScope.h \
8888
Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp \
8989
Source/JavaScriptCore/bytecompiler/RegisterID.h \
90-
Source/JavaScriptCore/heap/Strong.h \
90+
Source/JavaScriptCore/heap/ConservativeRoots.cpp \
91+
Source/JavaScriptCore/heap/ConservativeRoots.h \
9192
Source/JavaScriptCore/heap/Handle.h \
9293
Source/JavaScriptCore/heap/HandleHeap.cpp \
9394
Source/JavaScriptCore/heap/HandleHeap.h \
@@ -97,6 +98,15 @@ javascriptcore_sources += \
9798
Source/JavaScriptCore/heap/Heap.h \
9899
Source/JavaScriptCore/heap/Local.h \
99100
Source/JavaScriptCore/heap/LocalScope.h \
101+
Source/JavaScriptCore/heap/MachineStackMarker.cpp \
102+
Source/JavaScriptCore/heap/MachineStackMarker.h \
103+
Source/JavaScriptCore/heap/MarkStack.cpp \
104+
Source/JavaScriptCore/heap/MarkStack.h \
105+
Source/JavaScriptCore/heap/MarkedBlock.cpp \
106+
Source/JavaScriptCore/heap/MarkedBlock.h \
107+
Source/JavaScriptCore/heap/MarkedSpace.cpp \
108+
Source/JavaScriptCore/heap/MarkedSpace.h \
109+
Source/JavaScriptCore/heap/Strong.h \
100110
Source/JavaScriptCore/heap/Weak.h \
101111
Source/JavaScriptCore/config.h \
102112
Source/JavaScriptCore/debugger/DebuggerActivation.cpp \
@@ -221,10 +231,6 @@ javascriptcore_sources += \
221231
Source/JavaScriptCore/runtime/CallData.cpp \
222232
Source/JavaScriptCore/runtime/CallData.h \
223233
Source/JavaScriptCore/runtime/ClassInfo.h \
224-
Source/JavaScriptCore/runtime/MarkedBlock.cpp \
225-
Source/JavaScriptCore/runtime/MarkedBlock.h \
226-
Source/JavaScriptCore/runtime/MarkedSpace.cpp \
227-
Source/JavaScriptCore/runtime/MarkedSpace.h \
228234
Source/JavaScriptCore/runtime/CommonIdentifiers.cpp \
229235
Source/JavaScriptCore/runtime/CommonIdentifiers.h \
230236
Source/JavaScriptCore/runtime/Completion.cpp \
@@ -315,12 +321,6 @@ javascriptcore_sources += \
315321
Source/JavaScriptCore/runtime/LiteralParser.h \
316322
Source/JavaScriptCore/runtime/Lookup.cpp \
317323
Source/JavaScriptCore/runtime/Lookup.h \
318-
Source/JavaScriptCore/runtime/MachineStackMarker.cpp \
319-
Source/JavaScriptCore/runtime/MachineStackMarker.h \
320-
Source/JavaScriptCore/runtime/ConservativeSet.cpp \
321-
Source/JavaScriptCore/runtime/ConservativeSet.h \
322-
Source/JavaScriptCore/runtime/MarkStack.cpp \
323-
Source/JavaScriptCore/runtime/MarkStack.h \
324324
Source/JavaScriptCore/runtime/MathObject.cpp \
325325
Source/JavaScriptCore/runtime/MathObject.h \
326326
Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp \
@@ -559,12 +559,12 @@ javascriptcore_sources += \
559559

560560
if TARGET_WIN32
561561
javascriptcore_sources += \
562-
Source/JavaScriptCore/runtime/MarkStackWin.cpp \
562+
Source/JavaScriptCore/heap/MarkStackWin.cpp \
563563
Source/JavaScriptCore/wtf/OSAllocatorWin.cpp
564564
else
565565
javascriptcore_sources += \
566566
Source/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \
567-
Source/JavaScriptCore/runtime/MarkStackPosix.cpp \
567+
Source/JavaScriptCore/heap/MarkStackPosix.cpp \
568568
Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp
569569
endif
570570

‎Source/JavaScriptCore/JavaScriptCore.gypi‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
'API/OpaqueJSString.h',
2828
'assembler/MacroAssemblerCodeRef.h',
2929
'bytecode/Opcode.h',
30-
'heap/Strong.h',
30+
'heap/ConservativeRoots.h',
3131
'heap/Handle.h',
3232
'heap/HandleHeap.h',
3333
'heap/HandleStack.h',
3434
'heap/Heap.h',
3535
'heap/Local.h',
3636
'heap/LocalScope.h',
37+
'heap/Strong.h',
3738
'heap/Weak.h',
3839
'config.h',
3940
'debugger/Debugger.h',
@@ -93,10 +94,6 @@
9394
'runtime/JSVariableObject.h',
9495
'runtime/JSWrapperObject.h',
9596
'runtime/Lookup.h',
96-
'runtime/MachineStackMarker.h',
97-
'runtime/MarkStack.h',
98-
'runtime/MarkedBlock.h',
99-
'runtime/MarkedSpace.h',
10097
'runtime/MathObject.h',
10198
'runtime/MemoryStatistics.h',
10299
'runtime/NumberObject.h',
@@ -310,9 +307,21 @@
310307
'bytecompiler/LabelScope.h',
311308
'bytecompiler/NodesCodegen.cpp',
312309
'bytecompiler/RegisterID.h',
310+
'heap/ConservativeRoots.cpp',
313311
'heap/HandleHeap.cpp',
314312
'heap/HandleStack.cpp',
315313
'heap/Heap.cpp',
314+
'heap/MachineStackMarker.cpp',
315+
'heap/MachineStackMarker.h',
316+
'heap/MarkStack.cpp',
317+
'heap/MarkStack.h',
318+
'heap/MarkStackPosix.cpp',
319+
'heap/MarkStackSymbian.cpp',
320+
'heap/MarkStackWin.cpp',
321+
'heap/MarkedBlock.cpp',
322+
'heap/MarkedBlock.h',
323+
'heap/MarkedSpace.cpp',
324+
'heap/MarkedSpace.h',
316325
'debugger/Debugger.cpp',
317326
'debugger/DebuggerActivation.cpp',
318327
'debugger/DebuggerCallFrame.cpp',
@@ -457,8 +466,6 @@
457466
'runtime/CallData.cpp',
458467
'runtime/CommonIdentifiers.cpp',
459468
'runtime/Completion.cpp',
460-
'runtime/ConservativeSet.cpp',
461-
'runtime/ConservativeSet.h',
462469
'runtime/ConstructData.cpp',
463470
'runtime/DateConstructor.cpp',
464471
'runtime/DateConstructor.h',
@@ -519,13 +526,6 @@
519526
'runtime/LiteralParser.cpp',
520527
'runtime/LiteralParser.h',
521528
'runtime/Lookup.cpp',
522-
'runtime/MachineStackMarker.cpp',
523-
'runtime/MarkStack.cpp',
524-
'runtime/MarkStackPosix.cpp',
525-
'runtime/MarkStackSymbian.cpp',
526-
'runtime/MarkStackWin.cpp',
527-
'runtime/MarkedBlock.cpp',
528-
'runtime/MarkedSpace.cpp',
529529
'runtime/MathObject.cpp',
530530
'runtime/MemoryStatistics.cpp',
531531
'runtime/NativeErrorConstructor.cpp',

‎Source/JavaScriptCore/JavaScriptCore.pro‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,17 @@ SOURCES += \
6969
bytecode/StructureStubInfo.cpp \
7070
bytecompiler/BytecodeGenerator.cpp \
7171
bytecompiler/NodesCodegen.cpp \
72-
heap/Heap.cpp \
72+
heap/ConservativeRoots.cpp \
7373
heap/HandleHeap.cpp \
7474
heap/HandleStack.cpp \
75+
heap/Heap.cpp \
76+
heap/MachineStackMarker.cpp \
77+
heap/MarkStack.cpp \
78+
heap/MarkStackPosix.cpp \
79+
heap/MarkStackSymbian.cpp \
80+
heap/MarkStackWin.cpp \
81+
heap/MarkedBlock.cpp \
82+
heap/MarkedSpace.cpp \
7583
debugger/DebuggerActivation.cpp \
7684
debugger/DebuggerCallFrame.cpp \
7785
debugger/Debugger.cpp \
@@ -116,8 +124,6 @@ SOURCES += \
116124
runtime/BooleanObject.cpp \
117125
runtime/BooleanPrototype.cpp \
118126
runtime/CallData.cpp \
119-
runtime/MarkedBlock.cpp \
120-
runtime/MarkedSpace.cpp \
121127
runtime/CommonIdentifiers.cpp \
122128
runtime/Completion.cpp \
123129
runtime/ConstructData.cpp \
@@ -160,12 +166,6 @@ SOURCES += \
160166
runtime/JSWrapperObject.cpp \
161167
runtime/LiteralParser.cpp \
162168
runtime/Lookup.cpp \
163-
runtime/MachineStackMarker.cpp \
164-
runtime/MarkStackPosix.cpp \
165-
runtime/MarkStackSymbian.cpp \
166-
runtime/MarkStackWin.cpp \
167-
runtime/ConservativeSet.cpp \
168-
runtime/MarkStack.cpp \
169169
runtime/MathObject.cpp \
170170
runtime/NativeErrorConstructor.cpp \
171171
runtime/NativeErrorPrototype.cpp \

‎Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -601,14 +601,6 @@
601601
RelativePath="..\..\runtime\Completion.h"
602602
>
603603
</File>
604-
<File
605-
RelativePath="..\..\runtime\ConservativeSet.cpp"
606-
>
607-
</File>
608-
<File
609-
RelativePath="..\..\runtime\ConservativeSet.h"
610-
>
611-
</File>
612604
<File
613605
RelativePath="..\..\runtime\ConstructData.cpp"
614606
>
@@ -953,42 +945,6 @@
953945
RelativePath="..\..\runtime\Lookup.h"
954946
>
955947
</File>
956-
<File
957-
RelativePath="..\..\runtime\MachineStackMarker.cpp"
958-
>
959-
</File>
960-
<File
961-
RelativePath="..\..\runtime\MachineStackMarker.h"
962-
>
963-
</File>
964-
<File
965-
RelativePath="..\..\runtime\MarkedBlock.cpp"
966-
>
967-
</File>
968-
<File
969-
RelativePath="..\..\runtime\MarkedBlock.h"
970-
>
971-
</File>
972-
<File
973-
RelativePath="..\..\runtime\MarkedSpace.cpp"
974-
>
975-
</File>
976-
<File
977-
RelativePath="..\..\runtime\MarkedSpace.h"
978-
>
979-
</File>
980-
<File
981-
RelativePath="..\..\runtime\MarkStack.cpp"
982-
>
983-
</File>
984-
<File
985-
RelativePath="..\..\runtime\MarkStack.h"
986-
>
987-
</File>
988-
<File
989-
RelativePath="..\..\runtime\MarkStackWin.cpp"
990-
>
991-
</File>
992948
<File
993949
RelativePath="..\..\runtime\MathObject.cpp"
994950
>
@@ -1917,6 +1873,50 @@
19171873
<Filter
19181874
Name="heap"
19191875
>
1876+
<File
1877+
RelativePath="..\..\heap\ConservativeRoots.cpp"
1878+
>
1879+
</File>
1880+
<File
1881+
RelativePath="..\..\heap\ConservativeRoots.h"
1882+
>
1883+
</File>
1884+
<File
1885+
RelativePath="..\..\heap\MachineStackMarker.cpp"
1886+
>
1887+
</File>
1888+
<File
1889+
RelativePath="..\..\heap\MachineStackMarker.h"
1890+
>
1891+
</File>
1892+
<File
1893+
RelativePath="..\..\heap\MarkedBlock.cpp"
1894+
>
1895+
</File>
1896+
<File
1897+
RelativePath="..\..\heap\MarkedBlock.h"
1898+
>
1899+
</File>
1900+
<File
1901+
RelativePath="..\..\heap\MarkedSpace.cpp"
1902+
>
1903+
</File>
1904+
<File
1905+
RelativePath="..\..\heap\MarkedSpace.h"
1906+
>
1907+
</File>
1908+
<File
1909+
RelativePath="..\..\heap\MarkStack.cpp"
1910+
>
1911+
</File>
1912+
<File
1913+
RelativePath="..\..\heap\MarkStack.h"
1914+
>
1915+
</File>
1916+
<File
1917+
RelativePath="..\..\heap\MarkStackWin.cpp"
1918+
>
1919+
</File>
19201920
<File
19211921
RelativePath="..\..\heap\Heap.cpp"
19221922
>

0 commit comments

Comments
 (0)