From 879a31343e4c8f5cb1da43ecd4fe28a2f8bf12d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=91=D1=83=D1=85=D0=BE=D0=B2?= Date: Thu, 29 Jan 2015 14:27:19 +0200 Subject: [PATCH 1/2] step into functionality fixed in debugger agent --- JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp b/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp index 23132fc..68e572e 100644 --- a/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp +++ b/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp @@ -483,7 +483,8 @@ void InspectorDebuggerAgent::stepInto(ErrorString* errorString) m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup); scriptDebugServer().stepIntoStatement(); - m_listener->stepInto(); + if (m_listener) + m_listener->stepInto(); } void InspectorDebuggerAgent::stepOut(ErrorString* errorString) From dafa4df0b92da696c4181afef721e0df06b98821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=91=D1=83=D1=85=D0=BE=D0=B2?= Date: Thu, 29 Jan 2015 17:28:35 +0200 Subject: [PATCH 2/2] c loop disabled --- .gitignore | 54 +++++++++++++- .../Configurations/FeatureDefines.xcconfig | 2 +- .../JavaScriptCore.xcodeproj/project.pbxproj | 72 +++++++++++++++++-- .../contents.xcworkspacedata | 7 ++ 4 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 JavaScriptCore/JavaScriptCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/.gitignore b/.gitignore index 4f486ad..11d9d46 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,53 @@ -.DS_Store -DerivedData/ +*.pyc + +# Xcode +# build/ +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 xcuserdata -*.pyc \ No newline at end of file +*.xccheckout +*.moved-aside +DerivedData +*.hmap +*.ipa +*.xcuserstate + +# Mac +.DS_Store +#ignore thumbnails created by windows +Thumbs.db +#Ignore Podfile.lock +Podfile.lock +#Ignore files build by Visual Studio +*.user +*.aps +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.bak +*.cache +*.ilk +*.log +[Bb]in +libs/ +[Dd]ebug*/ +*.sbr +obj/ +[Rr]elease*/ +_ReSharper*/ +ipch/ +*.ipch +*.sdf +# Mac OS X and Xcode stuff +*.swp +*~.nib +/.metadata/ \ No newline at end of file diff --git a/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/JavaScriptCore/Configurations/FeatureDefines.xcconfig index d092da1..e974826 100644 --- a/JavaScriptCore/Configurations/FeatureDefines.xcconfig +++ b/JavaScriptCore/Configurations/FeatureDefines.xcconfig @@ -244,7 +244,7 @@ ENABLE_XSLT = ENABLE_XSLT; ENABLE_FTL_JIT = $(ENABLE_FTL_JIT_$(PLATFORM_NAME)); ENABLE_FTL_JIT_macosx = ENABLE_FTL_JIT; -ENABLE_FTL_JIT_iphoneos = ENABLE_FTL_JIT; +ENABLE_FTL_JIT_iphoneos = ; ENABLE_FTL_JIT_iphonesimulator = ; ENABLE_LLINT_C_LOOP = ; diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj index 7ce4782..c6a69c5 100644 --- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj +++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj @@ -10717,7 +10717,7 @@ "ENABLE_REMOTE_INSPECTOR=0", "ENABLE_INSPECTOR=1", "ENABLE_YARR_JIT=0", - "ENABLE_LLINT_C_LOOP=1", + "ENABLE_LLINT_C_LOOP=0", "WTF_USE_CF=1", "UCONFIG_NO_COLLATION=1", ); @@ -10741,7 +10741,7 @@ "ENABLE_REMOTE_INSPECTOR=0", "ENABLE_INSPECTOR=1", "ENABLE_YARR_JIT=0", - "ENABLE_LLINT_C_LOOP=1", + "ENABLE_LLINT_C_LOOP=0", "WTF_USE_CF=1", "UCONFIG_NO_COLLATION=1", ); @@ -10765,7 +10765,7 @@ "ENABLE_REMOTE_INSPECTOR=0", "ENABLE_INSPECTOR=1", "ENABLE_YARR_JIT=0", - "ENABLE_LLINT_C_LOOP=1", + "ENABLE_LLINT_C_LOOP=0", "WTF_USE_CF=1", "UCONFIG_NO_COLLATION=1", ); @@ -10942,6 +10942,22 @@ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */; buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(DEBUG_DEFINES)", + "HAVE_DTRACE=$(HAVE_DTRACE)", + "WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST", + HAVE_HEADER_DETECTION_H, + JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080, + "$(FEATURE_DEFINES)", + "$(GCC_PREPROCESSOR_DEFINITIONS)", + "JSC_OBJC_API_ENABLED=0", + "ENABLE_REMOTE_INSPECTOR=0", + "ENABLE_INSPECTOR=1", + "ENABLE_YARR_JIT=0", + "ENABLE_LLINT_C_LOOP=0", + "WTF_USE_CF=1", + "UCONFIG_NO_COLLATION=1", + ); INFOPLIST_FILE = "JavaScriptCore copy-Info.plist"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = JavaScriptCore; @@ -10953,6 +10969,22 @@ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */; buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(DEBUG_DEFINES)", + "HAVE_DTRACE=$(HAVE_DTRACE)", + "WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST", + HAVE_HEADER_DETECTION_H, + JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080, + "$(FEATURE_DEFINES)", + "$(GCC_PREPROCESSOR_DEFINITIONS)", + "JSC_OBJC_API_ENABLED=0", + "ENABLE_REMOTE_INSPECTOR=0", + "ENABLE_INSPECTOR=1", + "ENABLE_YARR_JIT=0", + "ENABLE_LLINT_C_LOOP=0", + "WTF_USE_CF=1", + "UCONFIG_NO_COLLATION=1", + ); INFOPLIST_FILE = "JavaScriptCore copy-Info.plist"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = JavaScriptCore; @@ -10964,6 +10996,22 @@ baseConfigurationReference = 1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */; buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(DEBUG_DEFINES)", + "HAVE_DTRACE=$(HAVE_DTRACE)", + "WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST", + HAVE_HEADER_DETECTION_H, + JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080, + "$(FEATURE_DEFINES)", + "$(GCC_PREPROCESSOR_DEFINITIONS)", + "JSC_OBJC_API_ENABLED=0", + "ENABLE_REMOTE_INSPECTOR=0", + "ENABLE_INSPECTOR=1", + "ENABLE_YARR_JIT=0", + "ENABLE_LLINT_C_LOOP=0", + "WTF_USE_CF=1", + "UCONFIG_NO_COLLATION=1", + ); INFOPLIST_FILE = "JavaScriptCore copy-Info.plist"; INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)"; PRODUCT_NAME = JavaScriptCore; @@ -10976,6 +11024,22 @@ buildSettings = { BUILD_VARIANTS = normal; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(DEBUG_DEFINES)", + "HAVE_DTRACE=$(HAVE_DTRACE)", + "WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST", + HAVE_HEADER_DETECTION_H, + JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080, + "$(FEATURE_DEFINES)", + "$(GCC_PREPROCESSOR_DEFINITIONS)", + "JSC_OBJC_API_ENABLED=0", + "ENABLE_REMOTE_INSPECTOR=0", + "ENABLE_INSPECTOR=1", + "ENABLE_YARR_JIT=0", + "ENABLE_LLINT_C_LOOP=0", + "WTF_USE_CF=1", + "UCONFIG_NO_COLLATION=1", + ); INFOPLIST_FILE = "JavaScriptCore copy-Info.plist"; PRODUCT_NAME = JavaScriptCore; }; @@ -11065,7 +11129,7 @@ "ENABLE_REMOTE_INSPECTOR=0", "ENABLE_INSPECTOR=1", "ENABLE_YARR_JIT=0", - "ENABLE_LLINT_C_LOOP=1", + "ENABLE_LLINT_C_LOOP=0", "WTF_USE_CF=1", "UCONFIG_NO_COLLATION=1", ); diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/JavaScriptCore/JavaScriptCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..342f1f9 --- /dev/null +++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + +