Changeset 38196 in webkit for trunk/JavaScriptCore
- Timestamp:
- Nov 6, 2008, 1:43:42 PM (17 years ago)
- Location:
- trunk/JavaScriptCore
- Files:
-
- 1 added
- 8 edited
- 3 moved
-
AllInOneFile.cpp (modified) (1 diff)
-
ChangeLog (modified) (1 diff)
-
GNUmakefile.am (modified) (4 diffs)
-
JavaScriptCore.pri (modified) (2 diffs)
-
JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj (modified) (6 diffs)
-
JavaScriptCore.xcodeproj/project.pbxproj (modified) (5 diffs)
-
JavaScriptCoreSources.bkl (modified) (2 diffs)
-
bytecompiler (added)
-
bytecompiler/CodeGenerator.cpp (moved) (moved from trunk/JavaScriptCore/VM/CodeGenerator.cpp )
-
bytecompiler/CodeGenerator.h (moved) (moved from trunk/JavaScriptCore/VM/CodeGenerator.h )
-
bytecompiler/LabelScope.h (moved) (moved from trunk/JavaScriptCore/kjs/LabelScope.h )
-
jscore.bkl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/AllInOneFile.cpp
r38137 r38196 103 103 #include "wtf/FastMalloc.cpp" 104 104 #include "wtf/TCSystemAlloc.cpp" 105 #include " VM/CodeGenerator.cpp"105 #include "bytecompiler/CodeGenerator.cpp" 106 106 #include "VM/RegisterFile.cpp" -
trunk/JavaScriptCore/ChangeLog
r38192 r38196 1 2008-11-06 Cameron Zwarich <[email protected]> 2 3 Rubber-stamped by Sam Weinig. 4 5 Create a new bytecompiler subdirectory of JavaScriptCore and move some 6 relevant files to it. 7 8 * AllInOneFile.cpp: 9 * GNUmakefile.am: 10 * JavaScriptCore.pri: 11 * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: 12 * JavaScriptCore.xcodeproj/project.pbxproj: 13 * JavaScriptCoreSources.bkl: 14 * VM/CodeGenerator.cpp: Removed. 15 * VM/CodeGenerator.h: Removed. 16 * bytecompiler: Added. 17 * bytecompiler/CodeGenerator.cpp: Copied from VM/CodeGenerator.cpp. 18 * bytecompiler/CodeGenerator.h: Copied from VM/CodeGenerator.h. 19 * bytecompiler/LabelScope.h: Copied from kjs/LabelScope.h. 20 * jscore.bkl: 21 * kjs/LabelScope.h: Removed. 22 1 23 2008-11-06 Adam Roben <[email protected]> 2 24 -
trunk/JavaScriptCore/GNUmakefile.am
r38162 r38196 3 3 -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ 4 4 -I$(srcdir)/JavaScriptCore/VM \ 5 -I$(srcdir)/JavaScriptCore/bytecompiler \ 5 6 -I$(srcdir)/JavaScriptCore/debugger \ 6 7 -I$(srcdir)/JavaScriptCore/pcre \ … … 72 73 JavaScriptCore/VM/CodeBlock.cpp \ 73 74 JavaScriptCore/VM/CodeBlock.h \ 74 JavaScriptCore/ VM/CodeGenerator.h \75 JavaScriptCore/bytecompiler/CodeGenerator.h \ 75 76 JavaScriptCore/VM/ExceptionHelpers.cpp \ 76 77 JavaScriptCore/VM/ExceptionHelpers.h \ … … 307 308 308 309 javascriptcore_sources += \ 309 JavaScriptCore/ VM/CodeGenerator.cpp \310 JavaScriptCore/bytecompiler/CodeGenerator.cpp \ 310 311 JavaScriptCore/VM/RegisterFile.cpp \ 311 312 JavaScriptCore/runtime/ArgList.cpp \ … … 318 319 JavaScriptCore/runtime/JSLock.h \ 319 320 JavaScriptCore/runtime/JSStaticScopeObject.cpp \ 320 JavaScriptCore/ kjs/LabelScope.h \321 JavaScriptCore/bytecompiler/LabelScope.h \ 321 322 JavaScriptCore/kjs/Parser.cpp \ 322 323 JavaScriptCore/runtime/PropertyNameArray.cpp \ -
trunk/JavaScriptCore/JavaScriptCore.pri
r38155 r38196 3 3 4 4 INCLUDEPATH += tmp 5 INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/ debugger $$PWD/runtime $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler $$PWD/API $$PWD/.. \5 INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bytecompiler $$PWD/debugger $$PWD/runtime $$PWD/wtf $$PWD/wtf/unicode $$PWD/VM $$PWD/profiler $$PWD/API $$PWD/.. \ 6 6 $$PWD/ForwardingHeaders 7 7 DEFINES += BUILDING_QT__ … … 56 56 runtime/JSNotAnObject.cpp \ 57 57 VM/CodeBlock.cpp \ 58 VM/CodeGenerator.cpp \58 bytecompiler/CodeGenerator.cpp \ 59 59 VM/ExceptionHelpers.cpp \ 60 60 runtime/JSPropertyNameIterator.cpp \ -
trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
r38192 r38196 43 43 <Tool 44 44 Name="VCCLCompilerTool" 45 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../ runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""45 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility"" 46 46 PreprocessorDefinitions="__STD_C" 47 47 ForcedIncludeFiles="" … … 105 105 <Tool 106 106 Name="VCCLCompilerTool" 107 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../ runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""107 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility"" 108 108 PreprocessorDefinitions="__STD_C" 109 109 ForcedIncludeFiles="" … … 166 166 <Tool 167 167 Name="VCCLCompilerTool" 168 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../ runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""168 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility"" 169 169 PreprocessorDefinitions="__STD_C" 170 170 ForcedIncludeFiles="" … … 228 228 <Tool 229 229 Name="VCCLCompilerTool" 230 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../ runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility""230 AdditionalIncludeDirectories=""$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\";../../;../../API/;../../pcre/;../../kjs/;../../bytecompiler/;../../runtime/;../../VM/;../../wtf/;../../profiler;../../masm/;../../debugger/;../../wrec/;"$(WebKitLibrariesDir)\include";"$(WebKitLibrariesDir)\include\icu";../../../icu/include;"$(WebKitOutputDir)\include\JavaScriptCore";"$(WebKitLibrariesDir)\include\pthreads";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders";"$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility"" 231 231 PreprocessorDefinitions="__STD_C" 232 232 ForcedIncludeFiles="" … … 650 650 </File> 651 651 <File 652 RelativePath="..\..\ kjs\LabelScope.h"652 RelativePath="..\..\bytecompiler\LabelScope.h" 653 653 > 654 654 </File> … … 1179 1179 > 1180 1180 <File 1181 RelativePath="..\..\ VM\CodeGenerator.cpp"1182 > 1183 </File> 1184 <File 1185 RelativePath="..\..\ VM\CodeGenerator.h"1181 RelativePath="..\..\bytecompiler\CodeGenerator.cpp" 1182 > 1183 </File> 1184 <File 1185 RelativePath="..\..\bytecompiler\CodeGenerator.h" 1186 1186 > 1187 1187 </File> -
trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
r38162 r38196 428 428 149B15E60D81F986009CB8C7 /* Machine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Machine.h; path = VM/Machine.h; sourceTree = "<group>"; }; 429 429 149B15E70D81F986009CB8C7 /* Machine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Machine.cpp; path = VM/Machine.cpp; sourceTree = "<group>"; }; 430 149B15E80D81F986009CB8C7 /* CodeGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeGenerator.h; path = VM/CodeGenerator.h; sourceTree = "<group>"; };431 149B15E90D81F986009CB8C7 /* CodeGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CodeGenerator.cpp; path = VM/CodeGenerator.cpp; sourceTree = "<group>"; };430 149B15E80D81F986009CB8C7 /* CodeGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeGenerator.h; sourceTree = "<group>"; }; 431 149B15E90D81F986009CB8C7 /* CodeGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CodeGenerator.cpp; sourceTree = "<group>"; }; 432 432 149B16B80D82583F009CB8C7 /* RegisterID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterID.h; path = VM/RegisterID.h; sourceTree = "<group>"; }; 433 433 149B1A9D0D86ED73009CB8C7 /* CodeBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CodeBlock.h; path = VM/CodeBlock.h; sourceTree = "<group>"; }; … … 588 588 95FDFA130E22998F0006FB00 /* HeavyProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HeavyProfile.cpp; path = profiler/HeavyProfile.cpp; sourceTree = "<group>"; }; 589 589 95FDFA150E2299980006FB00 /* HeavyProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HeavyProfile.h; path = profiler/HeavyProfile.h; sourceTree = "<group>"; }; 590 960097A50EBABB58007A7297 /* LabelScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LabelScope.h; path = kjs/LabelScope.h; sourceTree = "<group>"; };590 960097A50EBABB58007A7297 /* LabelScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelScope.h; sourceTree = "<group>"; }; 591 591 A72700770DAC605600E548D7 /* JSNotAnObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNotAnObject.h; sourceTree = "<group>"; }; 592 592 A72700780DAC605600E548D7 /* JSNotAnObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNotAnObject.cpp; sourceTree = "<group>"; }; … … 823 823 F68EBB8C0255D4C601FF60F7 /* config.h */, 824 824 1432EBD70A34CAD400717B9F /* API */, 825 7E39D81D0EC38EFA003AF11A /* bytecompiler */, 825 826 149B15DF0D81F887009CB8C7 /* compiler */, 826 827 1480DB9A0DDC2231003CFDF2 /* debugger */, … … 942 943 isa = PBXGroup; 943 944 children = ( 944 960097A50EBABB58007A7297 /* LabelScope.h */,945 149B15E90D81F986009CB8C7 /* CodeGenerator.cpp */,946 149B15E80D81F986009CB8C7 /* CodeGenerator.h */,947 945 149B20D70D8A0891009CB8C7 /* LabelID.h */, 948 946 F692A8650255597D01FF60F7 /* lexer.cpp */, … … 1112 1110 tabWidth = 4; 1113 1111 usesTabs = 0; 1112 }; 1113 7E39D81D0EC38EFA003AF11A /* bytecompiler */ = { 1114 isa = PBXGroup; 1115 children = ( 1116 149B15E90D81F986009CB8C7 /* CodeGenerator.cpp */, 1117 149B15E80D81F986009CB8C7 /* CodeGenerator.h */, 1118 960097A50EBABB58007A7297 /* LabelScope.h */, 1119 ); 1120 path = bytecompiler; 1121 sourceTree = "<group>"; 1114 1122 }; 1115 1123 7EF6E0BB0EB7A1EC0079AFAF /* runtime */ = { -
trunk/JavaScriptCore/JavaScriptCoreSources.bkl
r38146 r38196 60 60 pcre/pcre_ucp_searchfuncs.cpp 61 61 pcre/pcre_xclass.cpp 62 </set> 63 <set append="1" var="JSCORE_BYTECOMPILER_SOURCES"> 64 bytecompiler/CodeGenerator.cpp 62 65 </set> 63 66 <set append="1" var="JSCORE_PROFILER_SOURCES"> … … 144 147 <set append="1" var="JSCORE_VM_SOURCES"> 145 148 VM/CodeBlock.cpp 146 VM/CodeGenerator.cpp147 149 VM/ExceptionHelpers.cpp 148 150 VM/Machine.cpp -
trunk/JavaScriptCore/jscore.bkl
r38162 r38196 90 90 <include>$(SRCDIR)</include> 91 91 <include>$(WK_ROOT)/JavaScriptCore</include> 92 <include>$(WK_ROOT)/JavaScriptCore/bytecompiler</include> 92 93 <include>$(WK_ROOT)/JavaScriptCore/debugger</include> 93 94 <include>$(WK_ROOT)/JavaScriptCore/kjs</include>
Note:
See TracChangeset
for help on using the changeset viewer.
