[webkit-changes] [160477] branches/jsCStack/Source/JavaScriptCore

2013-12-11 Thread msaboff 
Title: [160477] branches/jsCStack/Source/_javascript_Core








Revision 160477
Author msab...@apple.com
Date 2013-12-11 22:38:56 -0800 (Wed, 11 Dec 2013)


Log Message
CStack Branch: Set stack pointer in OSR exit handler
https://bugs.webkit.org/show_bug.cgi?id=125617

Not yet reviewed.

Set the stack pointer off of the callFrameRegister just like at the top of the function.

* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::adjustAndJumpToTarget):

Modified Paths

branches/jsCStack/Source/_javascript_Core/ChangeLog
branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp




Diff

Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160476 => 160477)

--- branches/jsCStack/Source/_javascript_Core/ChangeLog	2013-12-12 04:01:26 UTC (rev 160476)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog	2013-12-12 06:38:56 UTC (rev 160477)
@@ -1,3 +1,15 @@
+2013-12-11  Michael Saboff  
+
+CStack Branch: Set stack pointer in OSR exit handler
+https://bugs.webkit.org/show_bug.cgi?id=125617
+
+Not yet reviewed.
+
+Set the stack pointer off of the callFrameRegister just like at the top of the function.
+
+* dfg/DFGOSRExitCompilerCommon.cpp:
+(JSC::DFG::adjustAndJumpToTarget):
+
 2013-12-11  Mark Lam  
 
 Introducing MaxFrameExtentForSlowPathCall.h.


Modified: branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (160476 => 160477)

--- branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp	2013-12-12 04:01:26 UTC (rev 160476)
+++ branches/jsCStack/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp	2013-12-12 06:38:56 UTC (rev 160477)
@@ -30,6 +30,7 @@
 
 #include "Arguments.h"
 #include "DFGOperations.h"
+#include "JIT.h"
 #include "JSCJSValueInlines.h"
 #include "Operations.h"
 
@@ -173,7 +174,9 @@
 ASSERT(mapping->m_bytecodeIndex == exit.m_codeOrigin.bytecodeIndex);
 
 void* jumpTarget = baselineCodeBlock->jitCode()->executableAddressAtOffset(mapping->m_machineCodeOffset);
-
+
+jit.addPtr(AssemblyHelpers::TrustedImm32(-JIT::frameRegisterCountFor(baselineCodeBlock) * sizeof(Register)), GPRInfo::callFrameRegister, AssemblyHelpers::stackPointerRegister);
+
 jit.move(AssemblyHelpers::TrustedImmPtr(jumpTarget), GPRInfo::regT2);
 jit.jump(GPRInfo::regT2);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160475] branches/safari-537.74-branch/Tools

2013-12-11 Thread matthew_hanson 
Title: [160475] branches/safari-537.74-branch/Tools








Revision 160475
Author matthew_han...@apple.com
Date 2013-12-11 19:20:10 -0800 (Wed, 11 Dec 2013)


Log Message
Merged r156290.  

Modified Paths

branches/safari-537.74-branch/Tools/ChangeLog
branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm




Diff

Modified: branches/safari-537.74-branch/Tools/ChangeLog (160474 => 160475)

--- branches/safari-537.74-branch/Tools/ChangeLog	2013-12-12 03:08:17 UTC (rev 160474)
+++ branches/safari-537.74-branch/Tools/ChangeLog	2013-12-12 03:20:10 UTC (rev 160475)
@@ -1,5 +1,21 @@
 2013-12-11  Matthew Hanson  
 
+Merged r156290.
+
+2013-09-23  Alex Christensen  
+
+Added --64-bit option for Windows build.
+https://bugs.webkit.org/show_bug.cgi?id=121799
+
+Reviewed by Brent Fulgham.
+
+* Scripts/webkitdirs.pm:
+(determinePassedConfiguration): Add "|x64" for 64-bit configuration.
+(isWin64): Added.
+(determineIsWin64): Added.
+
+2013-12-11  Matthew Hanson  
+
 Rollout r160469.  Not rolling out from trunk because r160469 was
 applied on the branch from a patch file.
 


Modified: branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm (160474 => 160475)

--- branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm	2013-12-12 03:08:17 UTC (rev 160474)
+++ branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm	2013-12-12 03:20:10 UTC (rev 160475)
@@ -94,6 +94,7 @@
 my $isGtk;
 my $isWinCE;
 my $isWinCairo;
+my $isWin64;
 my $isEfl;
 my $isBlackBerry;
 my $isInspectorFrontend;
@@ -621,18 +622,21 @@
 splice(@ARGV, $i, 1);
 $passedConfiguration = "Debug";
 $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+$passedConfiguration .= "|x64" if isWin64();
 return;
 }
 if ($opt =~ /^--release$/i) {
 splice(@ARGV, $i, 1);
 $passedConfiguration = "Release";
 $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+$passedConfiguration .= "|x64" if isWin64();
 return;
 }
 if ($opt =~ /^--profil(e|ing)$/i) {
 splice(@ARGV, $i, 1);
 $passedConfiguration = "Profiling";
 $passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+$passedConfiguration .= "|x64" if isWin64();
 return;
 }
 }
@@ -1206,6 +1210,18 @@
 $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
 }
 
+sub isWin64()
+{
+determineIsWin64();
+return $isWin64;
+}
+
+sub determineIsWin64()
+{
+return if defined($isWin64);
+$isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit");
+}
+
 sub isCygwin()
 {
 return ($^O eq "cygwin") || 0;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160474] branches/safari-537.74-branch

2013-12-11 Thread matthew_hanson 
Title: [160474] branches/safari-537.74-branch








Revision 160474
Author matthew_han...@apple.com
Date 2013-12-11 19:08:17 -0800 (Wed, 11 Dec 2013)


Log Message
Merged r154513.  

Modified Paths

branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog
branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make
branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make
branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh
branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make
branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh
branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh
branches/safari-537.74-branch/Source/WTF/ChangeLog
branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/WTFGenerated.make
branches/safari-537.74-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh
branches/safari-537.74-branch/Source/WebCore/ChangeLog
branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make
branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make
branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairoCommon.props
branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/copyWebCoreResourceFiles.cmd
branches/safari-537.74-branch/Source/WebKit/ChangeLog
branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd
branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd
branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPostBuild.cmd
branches/safari-537.74-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd
branches/safari-537.74-branch/WebKitLibraries/ChangeLog
branches/safari-537.74-branch/WebKitLibraries/win/tools/vsprops/common.props




Diff

Modified: branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog (160473 => 160474)

--- branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog	2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog	2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,5 +1,25 @@
 2013-12-11  Matthew Hanson  
 
+Merge r154513
+
+2013-08-23  Alex Christensen  
+
+Re-separating Win32 and Win64 builds.
+https://bugs.webkit.org/show_bug.cgi?id=120178
+
+Reviewed by Brent Fulgham.
+
+* _javascript_Core.vcxproj/_javascript_CoreGenerated.make:
+* _javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make:
+* _javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.make:
+Pass PlatformArchitecture as a command line parameter to bash scripts.
+* _javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
+* _javascript_Core.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
+* _javascript_Core.vcxproj/build-generated-files.sh:
+Use PlatformArchitecture from command line to determine which object directory to use (obj32 or obj64).
+
+2013-12-11  Matthew Hanson  
+
 Merge 156934.
 
 2013-10-04  Brent Fulgham  


Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make (160473 => 160474)

--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make	2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreGenerated.make	2013-12-12 03:08:17 UTC (rev 160474)
@@ -1,6 +1,6 @@
 all:
 touch "%ConfigurationBuildDir%\buildfailed"
-bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" 
+bash build-generated-files.sh "%ConfigurationBuildDir%" "$(WEBKIT_LIBRARIES)" "%PlatformArchitecture%"
 copy-files.cmd
 
 -del "%ConfigurationBuildDir%\include\private\_javascript_Core\stdbool.h" "%ConfigurationBuildDir%\include\private\_javascript_Core\stdint.h"


Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make (160473 => 160474)

--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.make	2013-12-12 02:47:12 UTC (rev 160473)
+++ branches/safari-537.74-branch/Source/_javascript_Core/

[webkit-changes] [160473] trunk/Source

2013-12-11 Thread lforschler 
Title: [160473] trunk/Source








Revision 160473
Author lforsch...@apple.com
Date 2013-12-11 18:47:12 -0800 (Wed, 11 Dec 2013)


Log Message
Versioning.

Modified Paths

trunk/Source/_javascript_Core/Configurations/Version.xcconfig
trunk/Source/WebCore/Configurations/Version.xcconfig
trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
trunk/Source/WebKit/mac/Configurations/Version.xcconfig
trunk/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (160472 => 160473)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2013-12-12 02:44:41 UTC (rev 160472)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2013-12-12 02:47:12 UTC (rev 160473)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 538;
-MINOR_VERSION = 9;
+MINOR_VERSION = 10;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (160472 => 160473)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2013-12-12 02:44:41 UTC (rev 160472)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2013-12-12 02:47:12 UTC (rev 160473)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 538;
-MINOR_VERSION = 9;
+MINOR_VERSION = 10;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (160472 => 160473)

--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2013-12-12 02:44:41 UTC (rev 160472)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2013-12-12 02:47:12 UTC (rev 160473)
@@ -1,5 +1,5 @@
 MAJOR_VERSION = 538;
-MINOR_VERSION = 9;
+MINOR_VERSION = 10;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebKit/mac/Configurations/Version.xcconfig (160472 => 160473)

--- trunk/Source/WebKit/mac/Configurations/Version.xcconfig	2013-12-12 02:44:41 UTC (rev 160472)
+++ trunk/Source/WebKit/mac/Configurations/Version.xcconfig	2013-12-12 02:47:12 UTC (rev 160473)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 538;
-MINOR_VERSION = 9;
+MINOR_VERSION = 10;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 


Modified: trunk/Source/WebKit2/Configurations/Version.xcconfig (160472 => 160473)

--- trunk/Source/WebKit2/Configurations/Version.xcconfig	2013-12-12 02:44:41 UTC (rev 160472)
+++ trunk/Source/WebKit2/Configurations/Version.xcconfig	2013-12-12 02:47:12 UTC (rev 160473)
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 538;
-MINOR_VERSION = 9;
+MINOR_VERSION = 10;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160472] tags/Safari-538.9/

2013-12-11 Thread lforschler 
Title: [160472] tags/Safari-538.9/








Revision 160472
Author lforsch...@apple.com
Date 2013-12-11 18:44:41 -0800 (Wed, 11 Dec 2013)


Log Message
New Tag.

Added Paths

tags/Safari-538.9/




Diff

Property changes: tags/Safari-538.9



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [160471] branches/safari-537.74-branch

2013-12-11 Thread matthew_hanson 
Title: [160471] branches/safari-537.74-branch








Revision 160471
Author matthew_han...@apple.com
Date 2013-12-11 18:35:43 -0800 (Wed, 11 Dec 2013)


Log Message
Rolled out r160469.

Modified Paths

branches/safari-537.74-branch/LayoutTests/ChangeLog
branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/bounds-for-range-expected.txt
branches/safari-537.74-branch/Source/WebCore/ChangeLog
branches/safari-537.74-branch/Source/WebCore/accessibility/AccessibilityObject.cpp
branches/safari-537.74-branch/Source/WebCore/accessibility/AccessibilityObject.h
branches/safari-537.74-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
branches/safari-537.74-branch/Tools/ChangeLog
branches/safari-537.74-branch/Tools/DumpRenderTree/AccessibilityUIElement.cpp
branches/safari-537.74-branch/Tools/DumpRenderTree/AccessibilityUIElement.h
branches/safari-537.74-branch/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
branches/safari-537.74-branch/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp
branches/safari-537.74-branch/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
branches/safari-537.74-branch/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl
branches/safari-537.74-branch/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
branches/safari-537.74-branch/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm


Removed Paths

branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds-expected.txt
branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds.html




Diff

Modified: branches/safari-537.74-branch/LayoutTests/ChangeLog (160470 => 160471)

--- branches/safari-537.74-branch/LayoutTests/ChangeLog	2013-12-12 02:23:19 UTC (rev 160470)
+++ branches/safari-537.74-branch/LayoutTests/ChangeLog	2013-12-12 02:35:43 UTC (rev 160471)
@@ -1,5 +1,10 @@
 2013-12-11  Matthew Hanson  
 
+Rollout r160469.  Not rolling out from trunk because r160469 was
+applied on the branch from a patch file.
+
+2013-12-11  Matthew Hanson  
+
 Merge r157821
 
 2013-10-22  Samuel White   


Modified: branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/bounds-for-range-expected.txt (160470 => 160471)

--- branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/bounds-for-range-expected.txt	2013-12-12 02:23:19 UTC (rev 160470)
+++ branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/bounds-for-range-expected.txt	2013-12-12 02:35:43 UTC (rev 160471)
@@ -53,8 +53,6 @@
 AXBoundsForRange
 AXStringForRange
 AXUIElementsForSearchPredicate
-AXEndTextMarkerForBounds
-AXStartTextMarkerForBounds
 
 --
 {{-1.00, -1.00}, {59.00, 18.00}}


Deleted: branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds-expected.txt (160470 => 160471)

--- branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds-expected.txt	2013-12-12 02:23:19 UTC (rev 160470)
+++ branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds-expected.txt	2013-12-12 02:35:43 UTC (rev 160471)
@@ -1,11 +0,0 @@
-Text text text text text text text text text text.
-This tests that endTextMarkerForBounds and startTextMarkerForBounds work correctly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS rangeFromBounds is rangeFromElement
-PASS successfullyParsed is true
-
-TEST COMPLETE
-


Deleted: branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds.html (160470 => 160471)

--- branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds.html	2013-12-12 02:23:19 UTC (rev 160470)
+++ branches/safari-537.74-branch/LayoutTests/platform/mac/accessibility/text-marker-for-bounds.html	2013-12-12 02:35:43 UTC (rev 160471)
@@ -1,33 +0,0 @@
-
-
-
-Text Marker for Bounds
-
-
-
-
Text text text text text text text text text text.

-
-

-

-
-