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

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

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

Reviewed by Sam Weinig.

A little more Heap refactoring
​https://bugs.webkit.org/show_bug.cgi?id=53577


SunSpider reports no change.


Split out MarkedBlock into its own file / class.


Did the following renames:

isCellMarked => isMarked
checkMarkCell => testAndSetMarked
markCell => setMarked
cellOffset => cellNumber
collectorBlock => blockFor

  • Android.mk:
  • CMakeLists.txt:
  • GNUmakefile.am:
  • JavaScriptCore.gypi:
  • JavaScriptCore.pro:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • runtime/Heap.cpp: (JSC::WeakGCHandlePool::update):
  • runtime/Heap.h: (JSC::Heap::isMarked): (JSC::Heap::testAndSetMarked): (JSC::Heap::setMarked):
  • runtime/JSArray.h: (JSC::MarkStack::markChildren): (JSC::MarkStack::drain):
  • runtime/JSCell.h: (JSC::JSCell::MarkStack::internalAppend):
  • runtime/MarkedBlock.cpp: Added.
  • runtime/MarkedBlock.h: Added. (JSC::MarkedBlock::blockFor): (JSC::MarkedBlock::cellNumber): (JSC::MarkedBlock::isMarked): (JSC::MarkedBlock::testAndSetMarked): (JSC::MarkedBlock::setMarked): (JSC::MarkedBlock::isCellAligned): (JSC::MarkedBlock::isPossibleCell):
  • runtime/MarkedSpace.h: (JSC::MarkedSpace::isMarked): (JSC::MarkedSpace::testAndSetMarked): (JSC::MarkedSpace::setMarked):
  • runtime/SmallStrings.cpp: (JSC::isMarked):
  • runtime/WeakGCMap.h: (JSC::WeakGCMap::isValid): (JSC::::get): (JSC::::take): (JSC::::set):
File size: 7.0 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/MarkedBlock.cpp \
84 runtime/MarkedSpace.cpp \
85 runtime/Heap.cpp \
86 runtime/CommonIdentifiers.cpp \
87 runtime/Completion.cpp \
88 runtime/ConstructData.cpp \
89 runtime/DateConstructor.cpp \
90 runtime/DateConversion.cpp \
91 runtime/DateInstance.cpp \
92 runtime/DatePrototype.cpp \
93 runtime/Error.cpp \
94 runtime/ErrorConstructor.cpp \
95 runtime/ErrorInstance.cpp \
96 runtime/ErrorPrototype.cpp \
97 runtime/ExceptionHelpers.cpp \
98 runtime/Executable.cpp \
99 runtime/FunctionConstructor.cpp \
100 runtime/FunctionPrototype.cpp \
101 runtime/GCHandle.cpp \
102 runtime/GetterSetter.cpp \
103 runtime/GlobalEvalFunction.cpp \
104 runtime/Identifier.cpp \
105 runtime/InitializeThreading.cpp \
106 runtime/InternalFunction.cpp \
107 runtime/JSAPIValueWrapper.cpp \
108 runtime/JSActivation.cpp \
109 runtime/JSArray.cpp \
110 runtime/JSByteArray.cpp \
111 runtime/JSCell.cpp \
112 runtime/JSFunction.cpp \
113 runtime/JSGlobalData.cpp \
114 runtime/JSGlobalObject.cpp \
115 runtime/JSGlobalObjectFunctions.cpp \
116 runtime/JSImmediate.cpp \
117 runtime/JSLock.cpp \
118 runtime/JSNotAnObject.cpp \
119 runtime/JSNumberCell.cpp \
120 runtime/JSONObject.cpp \
121 runtime/JSObject.cpp \
122 runtime/JSPropertyNameIterator.cpp \
123 runtime/JSStaticScopeObject.cpp \
124 runtime/JSString.cpp \
125 runtime/JSValue.cpp \
126 runtime/JSVariableObject.cpp \
127 runtime/JSWrapperObject.cpp \
128 runtime/LiteralParser.cpp \
129 runtime/Lookup.cpp \
130 runtime/MachineStackMarker.cpp \
131 runtime/ConservativeSet.cpp \
132 runtime/MarkStack.cpp \
133 runtime/MarkStackPosix.cpp \
134 runtime/MathObject.cpp \
135 runtime/NativeErrorConstructor.cpp \
136 runtime/NativeErrorPrototype.cpp \
137 runtime/NumberConstructor.cpp \
138 runtime/NumberObject.cpp \
139 runtime/NumberPrototype.cpp \
140 runtime/ObjectConstructor.cpp \
141 runtime/ObjectPrototype.cpp \
142 runtime/Operations.cpp \
143 runtime/PropertyDescriptor.cpp \
144 runtime/PropertyNameArray.cpp \
145 runtime/PropertySlot.cpp \
146 runtime/PrototypeFunction.cpp \
147 runtime/RegExp.cpp \
148 runtime/RegExpConstructor.cpp \
149 runtime/RegExpObject.cpp \
150 runtime/RegExpPrototype.cpp \
151 runtime/ScopeChain.cpp \
152 runtime/SmallStrings.cpp \
153 runtime/StringConstructor.cpp \
154 runtime/StringObject.cpp \
155 runtime/StringPrototype.cpp \
156 runtime/StringRecursionChecker.cpp \
157 runtime/Structure.cpp \
158 runtime/StructureChain.cpp \
159 runtime/TimeoutChecker.cpp \
160 runtime/UString.cpp \
161 \
162 wtf/Assertions.cpp \
163 wtf/ByteArray.cpp \
164 wtf/CurrentTime.cpp \
165 wtf/DateMath.cpp \
166 wtf/DecimalNumber.cpp \
167 wtf/FastMalloc.cpp \
168 wtf/HashTable.cpp \
169 wtf/MainThread.cpp \
170 wtf/PageAllocationAligned.cpp\
171 wtf/PageBlock.cpp\
172 wtf/RandomNumber.cpp \
173 wtf/RefCountedLeakCounter.cpp \
174 wtf/StackBounds.cpp \
175 wtf/TCSystemAlloc.cpp \
176 wtf/ThreadIdentifierDataPthreads.cpp \
177 wtf/Threading.cpp \
178 wtf/ThreadingPthreads.cpp \
179 wtf/WTFThreadData.cpp \
180 \
181 wtf/TypeTraits.cpp \
182 wtf/dtoa.cpp \
183 \
184 wtf/android/MainThreadAndroid.cpp \
185 \
186 wtf/text/AtomicString.cpp \
187 wtf/text/CString.cpp \
188 wtf/text/StringBuilder.cpp \
189 wtf/text/StringImpl.cpp \
190 wtf/text/WTFString.cpp \
191 \
192 wtf/unicode/CollatorDefault.cpp \
193 wtf/unicode/UTF8.cpp \
194 \
195 wtf/unicode/icu/CollatorICU.cpp \
196 \
197 yarr/YarrPattern.cpp \
198 yarr/YarrInterpreter.cpp \
199 yarr/YarrJIT.cpp \
200 yarr/YarrSyntaxChecker.cpp
201
202# generated headers
203JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \
204 ArrayPrototype.lut.h \
205 DatePrototype.lut.h \
206 JSONObject.lut.h \
207 MathObject.lut.h \
208 NumberConstructor.lut.h \
209 RegExpConstructor.lut.h \
210 RegExpObject.lut.h \
211 StringPrototype.lut.h \
212 )
213$(JSC_OBJECTS): PRIVATE_PATH := $(LOCAL_PATH)
214$(JSC_OBJECTS): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/create_hash_table $< -i > $@
215$(JSC_OBJECTS): $(LOCAL_PATH)/create_hash_table
216$(JSC_OBJECTS): $(intermediates)/%.lut.h : $(LOCAL_PATH)/%.cpp
217 $(transform-generated-source)
218
219
220LEXER_HEADER := $(intermediates)/Lexer.lut.h
221$(LEXER_HEADER): PRIVATE_PATH := $(LOCAL_PATH)
222$(LEXER_HEADER): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/create_hash_table $< -i > $@
223$(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table
224$(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table
225 $(transform-generated-source)
226
227CHARTABLES := $(intermediates)/chartables.c
228$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH)
229$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@
230$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables
231$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h
232 $(transform-generated-source)
233
234LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES)
Note: See TracBrowser for help on using the repository browser.