source: webkit/trunk/Source/JavaScriptCore/Android.mk@ 76180

Last change on this file since 76180 was 75855, checked in by [email protected], 14 years ago

2011-01-13 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Split out a MarkedSpace strategy object from Heap.
​https://bugs.webkit.org/show_bug.cgi?id=52421

  • Misc/WebCoreStatistics.mm: (+[WebCoreStatistics memoryStatistics]): Updated for class move.

2011-01-13 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Split out a MarkedSpace strategy object from Heap.
​https://bugs.webkit.org/show_bug.cgi?id=52421


SunSpider reports no change.

  • runtime/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::destroy): (JSC::Heap::recordExtraCost): (JSC::Heap::allocate): (JSC::Heap::markConservatively): (JSC::Heap::markRoots): (JSC::Heap::objectCount): (JSC::Heap::statistics): (JSC::Heap::size): (JSC::Heap::isBusy): (JSC::Heap::collectAllGarbage): (JSC::Heap::primaryHeapBegin): (JSC::Heap::primaryHeapEnd):
  • runtime/Heap.h: (JSC::Heap::globalData): (JSC::Heap::markedSpace): (JSC::Heap::isCellMarked): (JSC::Heap::checkMarkCell): (JSC::Heap::markCell): Moved all code pertaining to managing chunks of collector memory out of this class. Heap now just delegates to MarkedSpace.
  • runtime/JSCell.h: (JSC::JSCell::Heap::heap): Updated for MarkedSpace delegation.
  • runtime/JSValue.h: Moved the ValueStringPair typedef to help with #includes.
  • runtime/MarkedSpace.cpp: Copied from runtime/Heap.cpp. (JSC::MarkedSpace::MarkedSpace): (JSC::MarkedSpace::destroy): (JSC::MarkedSpace::allocateBlock): (JSC::MarkedSpace::freeBlock): (JSC::MarkedSpace::allocate): (JSC::MarkedSpace::resizeBlocks): (JSC::MarkedSpace::growBlocks): (JSC::MarkedSpace::shrinkBlocks): (JSC::MarkedSpace::markConservatively): (JSC::MarkedSpace::clearMarkBits): (JSC::MarkedSpace::markedCells): (JSC::MarkedSpace::sweep): (JSC::MarkedSpace::objectCount): (JSC::MarkedSpace::addToStatistics): (JSC::MarkedSpace::statistics): (JSC::MarkedSpace::size): (JSC::MarkedSpace::reset): (JSC::MarkedSpace::primaryHeapBegin): (JSC::MarkedSpace::primaryHeapEnd):
  • runtime/MarkedSpace.h: Copied from runtime/Heap.h. (JSC::MarkedSpace::globalData): (JSC::MarkedSpace::didShrink): (JSC::MarkedSpace::cellBlock): (JSC::MarkedSpace::cellOffset): (JSC::MarkedSpace::isCellMarked): (JSC::MarkedSpace::checkMarkCell): (JSC::MarkedSpace::markCell): Moved all code pertaining to managing chunks of collector memory into this class.
  • runtime/MemoryStatistics.cpp: (JSC::heapStatistics):
  • runtime/MemoryStatistics.h: Updated for MarkedSpace delegation.

2011-01-13 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Split out a MarkedSpace strategy object from Heap.
​https://bugs.webkit.org/show_bug.cgi?id=52421

  • Shared/mac/WebMemorySampler.mac.mm: (WebKit::WebMemorySampler::sampleWebKit): Updated for class move.
File size: 6.9 KB
Line 
1##
2## Copyright 2009, The Android Open Source Project
3##
4## Redistribution and use in source and binary forms, with or without
5## modification, are permitted provided that the following conditions
6## are met:
7## * Redistributions of source code must retain the above copyright
8## notice, this list of conditions and the following disclaimer.
9## * Redistributions in binary form must reproduce the above copyright
10## notice, this list of conditions and the following disclaimer in the
11## documentation and/or other materials provided with the distribution.
12##
13## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
14## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
17## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24##
25
26LOCAL_SRC_FILES := \
27 API/JSValueRef.cpp \
28 API/JSCallbackObject.cpp \
29 API/OpaqueJSString.cpp \
30 \
31 bytecode/CodeBlock.cpp \
32 bytecode/JumpTable.cpp \
33 bytecode/Opcode.cpp \
34 bytecode/SamplingTool.cpp \
35 bytecode/StructureStubInfo.cpp \
36 \
37 bytecompiler/BytecodeGenerator.cpp \
38 bytecompiler/NodesCodegen.cpp \
39 \
40 debugger/Debugger.cpp \
41 debugger/DebuggerActivation.cpp \
42 debugger/DebuggerCallFrame.cpp \
43 \
44 interpreter/CallFrame.cpp \
45 interpreter/Interpreter.cpp \
46 interpreter/RegisterFile.cpp \
47 \
48 jit/ExecutableAllocator.cpp\
49 jit/ExecutableAllocatorFixedVMPool.cpp \
50 jit/ExecutableAllocatorPosix.cpp \
51 jit/JIT.cpp \
52 jit/JITArithmetic.cpp \
53 jit/JITCall.cpp \
54 jit/JITCall32_64.cpp \
55 jit/JITOpcodes.cpp \
56 jit/JITPropertyAccess.cpp \
57 jit/JITStubs.cpp \
58 \
59 parser/Lexer.cpp \
60 parser/Nodes.cpp \
61 parser/Parser.cpp \
62 parser/ParserArena.cpp \
63 \
64 pcre/pcre_compile.cpp \
65 pcre/pcre_exec.cpp \
66 pcre/pcre_tables.cpp \
67 pcre/pcre_ucp_searchfuncs.cpp \
68 pcre/pcre_xclass.cpp \
69 \
70 profiler/Profile.cpp \
71 profiler/ProfileGenerator.cpp \
72 profiler/ProfileNode.cpp \
73 profiler/Profiler.cpp \
74 \
75 runtime/ArgList.cpp \
76 runtime/Arguments.cpp \
77 runtime/ArrayConstructor.cpp \
78 runtime/ArrayPrototype.cpp \
79 runtime/BooleanConstructor.cpp \
80 runtime/BooleanObject.cpp \
81 runtime/BooleanPrototype.cpp \
82 runtime/CallData.cpp \
83 runtime/MarkedSpace.cpp \
84 runtime/Heap.cpp \
85 runtime/CommonIdentifiers.cpp \
86 runtime/Completion.cpp \
87 runtime/ConstructData.cpp \
88 runtime/DateConstructor.cpp \
89 runtime/DateConversion.cpp \
90 runtime/DateInstance.cpp \
91 runtime/DatePrototype.cpp \
92 runtime/Error.cpp \
93 runtime/ErrorConstructor.cpp \
94 runtime/ErrorInstance.cpp \
95 runtime/ErrorPrototype.cpp \
96 runtime/ExceptionHelpers.cpp \
97 runtime/Executable.cpp \
98 runtime/FunctionConstructor.cpp \
99 runtime/FunctionPrototype.cpp \
100 runtime/GCHandle.cpp \
101 runtime/GetterSetter.cpp \
102 runtime/GlobalEvalFunction.cpp \
103 runtime/Identifier.cpp \
104 runtime/InitializeThreading.cpp \
105 runtime/InternalFunction.cpp \
106 runtime/JSAPIValueWrapper.cpp \
107 runtime/JSActivation.cpp \
108 runtime/JSArray.cpp \
109 runtime/JSByteArray.cpp \
110 runtime/JSCell.cpp \
111 runtime/JSFunction.cpp \
112 runtime/JSGlobalData.cpp \
113 runtime/JSGlobalObject.cpp \
114 runtime/JSGlobalObjectFunctions.cpp \
115 runtime/JSImmediate.cpp \
116 runtime/JSLock.cpp \
117 runtime/JSNotAnObject.cpp \
118 runtime/JSNumberCell.cpp \
119 runtime/JSONObject.cpp \
120 runtime/JSObject.cpp \
121 runtime/JSPropertyNameIterator.cpp \
122 runtime/JSStaticScopeObject.cpp \
123 runtime/JSString.cpp \
124 runtime/JSValue.cpp \
125 runtime/JSVariableObject.cpp \
126 runtime/JSWrapperObject.cpp \
127 runtime/LiteralParser.cpp \
128 runtime/Lookup.cpp \
129 runtime/MachineStackMarker.cpp \
130 runtime/MarkStack.cpp \
131 runtime/MarkStackPosix.cpp \
132 runtime/MathObject.cpp \
133 runtime/NativeErrorConstructor.cpp \
134 runtime/NativeErrorPrototype.cpp \
135 runtime/NumberConstructor.cpp \
136 runtime/NumberObject.cpp \
137 runtime/NumberPrototype.cpp \
138 runtime/ObjectConstructor.cpp \
139 runtime/ObjectPrototype.cpp \
140 runtime/Operations.cpp \
141 runtime/PropertyDescriptor.cpp \
142 runtime/PropertyNameArray.cpp \
143 runtime/PropertySlot.cpp \
144 runtime/PrototypeFunction.cpp \
145 runtime/RegExp.cpp \
146 runtime/RegExpConstructor.cpp \
147 runtime/RegExpObject.cpp \
148 runtime/RegExpPrototype.cpp \
149 runtime/ScopeChain.cpp \
150 runtime/SmallStrings.cpp \
151 runtime/StringConstructor.cpp \
152 runtime/StringObject.cpp \
153 runtime/StringPrototype.cpp \
154 runtime/Structure.cpp \
155 runtime/StructureChain.cpp \
156 runtime/TimeoutChecker.cpp \
157 runtime/UString.cpp \
158 \
159 wtf/Assertions.cpp \
160 wtf/ByteArray.cpp \
161 wtf/CurrentTime.cpp \
162 wtf/DateMath.cpp \
163 wtf/DecimalNumber.cpp \
164 wtf/FastMalloc.cpp \
165 wtf/HashTable.cpp \
166 wtf/MainThread.cpp \
167 wtf/PageAllocationAligned.cpp\
168 wtf/PageBlock.cpp\
169 wtf/RandomNumber.cpp \
170 wtf/RefCountedLeakCounter.cpp \
171 wtf/StackBounds.cpp \
172 wtf/TCSystemAlloc.cpp \
173 wtf/ThreadIdentifierDataPthreads.cpp \
174 wtf/Threading.cpp \
175 wtf/ThreadingPthreads.cpp \
176 wtf/WTFThreadData.cpp \
177 \
178 wtf/TypeTraits.cpp \
179 wtf/dtoa.cpp \
180 \
181 wtf/android/MainThreadAndroid.cpp \
182 \
183 wtf/text/AtomicString.cpp \
184 wtf/text/CString.cpp \
185 wtf/text/StringBuilder.cpp \
186 wtf/text/StringImpl.cpp \
187 wtf/text/WTFString.cpp \
188 \
189 wtf/unicode/CollatorDefault.cpp \
190 wtf/unicode/UTF8.cpp \
191 \
192 wtf/unicode/icu/CollatorICU.cpp \
193 \
194 yarr/YarrPattern.cpp \
195 yarr/YarrInterpreter.cpp \
196 yarr/YarrJIT.cpp \
197 yarr/YarrSyntaxChecker.cpp
198
199# generated headers
200JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \
201 ArrayPrototype.lut.h \
202 DatePrototype.lut.h \
203 JSONObject.lut.h \
204 MathObject.lut.h \
205 NumberConstructor.lut.h \
206 RegExpConstructor.lut.h \
207 RegExpObject.lut.h \
208 StringPrototype.lut.h \
209 )
210$(JSC_OBJECTS): PRIVATE_PATH := $(LOCAL_PATH)
211$(JSC_OBJECTS): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/create_hash_table $< -i > $@
212$(JSC_OBJECTS): $(LOCAL_PATH)/create_hash_table
213$(JSC_OBJECTS): $(intermediates)/%.lut.h : $(LOCAL_PATH)/%.cpp
214 $(transform-generated-source)
215
216
217LEXER_HEADER := $(intermediates)/Lexer.lut.h
218$(LEXER_HEADER): PRIVATE_PATH := $(LOCAL_PATH)
219$(LEXER_HEADER): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/create_hash_table $< -i > $@
220$(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table
221$(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table
222 $(transform-generated-source)
223
224CHARTABLES := $(intermediates)/chartables.c
225$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH)
226$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@
227$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables
228$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h
229 $(transform-generated-source)
230
231LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES)
Note: See TracBrowser for help on using the repository browser.