Changeset 159321 in webkit
- Timestamp:
- Nov 14, 2013 4:12:51 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r159298 r159321 1 2013-11-14 Oliver Hunt <oliver@apple.com> 2 3 Make CLoop easier to build, and make it work 4 https://bugs.webkit.org/show_bug.cgi?id=124359 5 6 Reviewed by Geoffrey Garen. 7 8 Add --cloop to build-jsc, build-webkit and friends. 9 10 Also make CLoop build and work again - This meant adding a 11 couple of missing ENABLE(DFG_JIT) blocks, and fixing a few 12 other references. 13 14 * Configurations/FeatureDefines.xcconfig: 15 * bytecode/BytecodeLivenessAnalysis.cpp: 16 (JSC::computeUsesForBytecodeOffset): 17 (JSC::computeDefsForBytecodeOffset): 18 * bytecode/DFGExitProfile.cpp: 19 * dfg/DFGCapabilities.cpp: 20 * dfg/DFGCompilationKey.cpp: 21 * dfg/DFGCompilationMode.cpp: 22 * jit/JITExceptions.cpp: 23 (JSC::genericUnwind): 24 1 25 2013-11-14 Michael Saboff <msaboff@apple.com> 2 26 -
trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
r159179 r159321 187 187 188 188 ENABLE_FTL_JIT = ; 189 ENABLE_LLINT_C_LOOP = ; 189 190 190 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $( FEATURE_DEFINES_$(PLATFORM_NAME));191 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME)); -
trunk/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysis.cpp
r159141 r159321 334 334 return; 335 335 } 336 #define LLINT_HELPER_OPCODES(opcode, length) case opcode: 337 FOR_EACH_LLINT_OPCODE_EXTENSION(LLINT_HELPER_OPCODES) 338 return; 339 #undef LLINT_HELPER_OPCODES 336 340 } 337 341 } … … 392 396 case op_del_by_id: 393 397 case op_del_by_val: 398 #define LLINT_HELPER_OPCODES(opcode, length) case opcode: 399 FOR_EACH_LLINT_OPCODE_EXTENSION(LLINT_HELPER_OPCODES); 400 #undef LLINT_HELPER_OPCODES 394 401 return; 395 402 // These all have a single destination for the first argument. -
trunk/Source/JavaScriptCore/bytecode/DFGExitProfile.cpp
r153213 r159321 26 26 #include "config.h" 27 27 #include "DFGExitProfile.h" 28 29 #if ENABLE(DFG_JIT) 28 30 29 31 #include <wtf/PassOwnPtr.h> … … 96 98 97 99 } } // namespace JSC::DFG 100 101 #endif -
trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp
r157656 r159321 26 26 #include "config.h" 27 27 #include "DFGCapabilities.h" 28 29 #if ENABLE(DFG_JIT) 28 30 29 31 #include "CodeBlock.h" … … 243 245 } } // namespace JSC::DFG 244 246 247 #endif -
trunk/Source/JavaScriptCore/dfg/DFGCompilationKey.cpp
r154854 r159321 29 29 #include "CodeBlock.h" 30 30 31 #if ENABLE(DFG_JIT) 32 31 33 namespace JSC { namespace DFG { 32 34 … … 43 45 44 46 47 #endif -
trunk/Source/JavaScriptCore/dfg/DFGCompilationMode.cpp
r154854 r159321 27 27 #include "DFGCompilationMode.h" 28 28 29 #if ENABLE(DFG_JIT) 30 29 31 namespace WTF { 30 32 … … 52 54 } // namespace WTF 53 55 54 56 #endif -
trunk/Source/JavaScriptCore/jit/JITExceptions.cpp
r159276 r159321 33 33 #include "JITStubs.h" 34 34 #include "JSCJSValue.h" 35 #include "LLIntData.h" 36 #include "LLIntOpcode.h" 35 37 #include "LLIntThunks.h" 38 #include "Opcode.h" 39 #include "Operations.h" 36 40 #include "VM.h" 37 #include "Operations.h"38 41 39 42 #if ENABLE(JIT) || ENABLE(LLINT) … … 51 54 catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target]; 52 55 catchRoutine = ExecutableBase::catchRoutineFor(handler, catchPCForInterpreter); 53 } else 56 } else { 57 #if ENABLE(LLINT_C_LOOP) 58 catchRoutine = LLInt::getCodePtr(ctiOpThrowNotCaught); 59 #else 54 60 catchRoutine = FunctionPtr(LLInt::getCodePtr(returnFromJavaScript)).value(); 61 #endif 62 } 55 63 56 64 vm->callFrameForThrow = callFrame; -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
r158586 r159321 310 310 // 3. 64 bit result values will be in t0. 311 311 312 CLoopRegister t0, t1, t2, t3 ;312 CLoopRegister t0, t1, t2, t3, a1; 313 313 #if USE(JSVALUE64) 314 314 CLoopRegister rBasePC, tagTypeNumber, tagMask; -
trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
r159276 r159321 123 123 const newCallFrame = t4 124 124 elsif ARM64 125 const extraStackSpace = 0 126 const previousCFR = t4 127 const entry = a0 128 const newCallFrame = a1 129 elsif C_LOOP 125 130 const extraStackSpace = 0 126 131 const previousCFR = t4 -
trunk/Source/JavaScriptCore/offlineasm/cloop.rb
r157937 r159321 69 69 def clDump 70 70 case name 71 when "a0" 72 "a0" 73 when "a1" 74 "a1" 75 when "a2" 76 "a2" 77 when "a3" 78 "a3" 79 when "a4" 80 "a4" 81 when "a5" 82 "a5" 83 when "a6" 84 "a6" 85 when "a6" 86 "a6" 71 87 when "t0" 72 88 "t0" … … 1077 1093 cloopEmitOpAndBranch(operands, "|", :int32, "!= 0") 1078 1094 1095 when "pushCalleeSaves" 1096 when "popCalleeSaves" 1097 1098 1079 1099 # A convenience and compact call to crash because we don't want to use 1080 1100 # the generic llint crash mechanism which relies on the availability -
trunk/Source/WTF/ChangeLog
r159279 r159321 1 2013-11-14 Oliver Hunt <oliver@apple.com> 2 3 Make CLoop easier to build, and make it work 4 https://bugs.webkit.org/show_bug.cgi?id=124359 5 6 Reviewed by Geoffrey Garen. 7 8 Make building with the CLoop forcibly enabled manually 9 disable the JITs 10 11 * wtf/Platform.h: 12 1 13 2013-11-14 Andreas Kling <akling@apple.com> 2 14 -
trunk/Source/WTF/wtf/Platform.h
r158848 r159321 684 684 #endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */ 685 685 686 /* Disable the JITs if we're forcing the cloop to be enabled */ 687 #if defined(ENABLE_LLINT_C_LOOP) && ENABLE_LLINT_C_LOOP 688 #define ENABLE_JIT 0 689 #define ENABLE_DFG_JIT 0 690 #define ENABLE_FTL_JIT 0 691 #endif 692 686 693 /* Disable the JIT on versions of GCC prior to 4.1 */ 687 694 #if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4, 1, 0) -
trunk/Source/WebCore/ChangeLog
r159314 r159321 1 2013-11-14 Oliver Hunt <oliver@apple.com> 2 3 Make CLoop easier to build, and make it work 4 https://bugs.webkit.org/show_bug.cgi?id=124359 5 6 Reviewed by Geoffrey Garen. 7 8 Add cloop configuration info to WebCore FeatureDefines 9 so that it's consistent with JSC 10 11 * Configurations/FeatureDefines.xcconfig: 12 1 13 2013-11-14 Aloisio Almeida Jr <aloisio.almeida@openbossa.org> 2 14 -
trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig
r159179 r159321 187 187 188 188 ENABLE_FTL_JIT = ; 189 ENABLE_LLINT_C_LOOP = ; 189 190 190 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $( FEATURE_DEFINES_$(PLATFORM_NAME));191 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME)); -
trunk/Tools/ChangeLog
r159316 r159321 1 2013-11-14 Oliver Hunt <oliver@apple.com> 2 3 Make CLoop easier to build, and make it work 4 https://bugs.webkit.org/show_bug.cgi?id=124359 5 6 Reviewed by Geoffrey Garen. 7 8 Add --cloop support to forcibly enable to CLoop build 9 10 * Scripts/build-jsc: 11 * Scripts/build-webkit: 12 1 13 2013-11-14 Lucas Forschler <lforschler@apple.com> 2 14 -
trunk/Tools/Scripts/build-jsc
r157607 r159321 39 39 my $showHelp = 0; 40 40 my $ftlJIT = 0; 41 my $forceCLoop = 0; 41 42 42 43 my $programName = basename($0); … … 46 47 --[no-]coverage Toggle code coverage support (default: $coverageSupport) 47 48 --[no-]ftl-jit Toggle FTL JIT support (default: $ftlJIT) 49 --cloop Use C Loop interpreter (default: $forceCLoop) 48 50 EOF 49 51 … … 51 53 'coverage!' => \$coverageSupport, 52 54 'help' => \$showHelp, 53 'ftl-jit!' => \$ftlJIT 55 'ftl-jit!' => \$ftlJIT, 56 'cloop!' => \$forceCLoop 54 57 ); 55 58 … … 74 77 $ENV{ENABLE_FTL_JIT} = 1; 75 78 push @options, "ENABLE_FTL_JIT=ENABLE_FTL_JIT"; 79 } 80 if ($forceCLoop) { 81 $ENV{ENABLE_LLINT_C_LOOP} = 1; 82 push @options, "ENABLE_LLINT_C_LOOP=ENABLE_LLINT_C_LOOP"; 76 83 } 77 84 (system("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", productDir()) == 0) or die; -
trunk/Tools/Scripts/build-webkit
r157882 r159321 177 177 my @options = (); 178 178 my $hasFTLJIT = 0; 179 my $forceCLoop = 0; 179 180 180 181 if (isAppleMacWebKit()) { … … 190 191 my $option = option($_->{define}, ${$_->{value}}, $_->{default}); 191 192 $hasFTLJIT = 1 if ($_->{define} eq "ENABLE_FTL_JIT") and (${$_->{value}}); 193 $forceCLoop = 1 if ($_->{define} eq "ENABLE_LLINT_C_LOOP") and (${$_->{value}}); 192 194 push @options, $option unless $option eq ""; 193 195 } 194 196 $ENV{ENABLE_FTL_JIT} = 1 if $hasFTLJIT; 197 $ENV{ENABLE_LLINT_C_LOOP} = 1 if $forceCLoop; 195 198 196 199 # ANGLE must come before WebCore -
trunk/Tools/Scripts/webkitperl/FeatureList.pm
r158659 r159321 157 157 $xsltSupport, 158 158 $ftlJITSupport, 159 $forceCLoop, 159 160 ); 160 161 … … 489 490 { option => "ftl-jit", desc => "Toggle FTLJIT support", 490 491 define => "ENABLE_FTL_JIT", default => 0, value => \$ftlJITSupport }, 492 493 { option => "cloop", desc => "Force use of the llint c loop", 494 define => "ENABLE_LLINT_C_LOOP", default => 0, value => \$forceCLoop }, 491 495 ); 492 496
Note: See TracChangeset
for help on using the changeset viewer.