[webkit-changes] [148655] trunk/Source/JavaScriptCore

[mark . lam]

Title: [148655] trunk/Source/_javascript_Core

Revision

148655

Author

mark....@apple.com

Date

2013-04-17 20:17:44 -0700 (Wed, 17 Apr 2013)

Log Message

Avoid using a branch range that is too far for some CPU architectures.
https://bugs.webkit.org/show_bug.cgi?id=114782.

Reviewed by David Kilzer.

* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm
• trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm
• trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (148654 => 148655)

--- trunk/Source/_javascript_Core/ChangeLog	2013-04-18 01:11:32 UTC (rev 148654)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-04-18 03:17:44 UTC (rev 148655)
@@ -1,3 +1,14 @@
+2013-04-17  Mark Lam  <mark....@apple.com>
+
+        Avoid using a branch range that is too far for some CPU architectures.
+        https://bugs.webkit.org/show_bug.cgi?id=114782.
+
+        Reviewed by David Kilzer.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+
 2013-04-17  Julien Brianceau  <jbrianc...@nds.com>
 
         Fix SH4 build (broken since r148639).

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (148654 => 148655)

--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2013-04-18 01:11:32 UTC (rev 148654)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm	2013-04-18 03:17:44 UTC (rev 148655)
@@ -1064,8 +1064,10 @@
     checkSwitchToJITForLoop()
     dispatch(1)
 .handleWatchdogTimer:
-    callWatchdogTimerHandler()
+    callWatchdogTimerHandler(.throwHandler)
     jmp .afterWatchdogTimerCheck
+.throwHandler:
+    jmp _llint_throw_from_slow_path_trampoline
 
 _llint_op_switch_string:
     traceExecution()

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (148654 => 148655)

--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm	2013-04-18 01:11:32 UTC (rev 148654)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm	2013-04-18 03:17:44 UTC (rev 148655)
@@ -185,11 +185,11 @@
     action(t0)
 end
 
-macro callWatchdogTimerHandler()
+macro callWatchdogTimerHandler(throwHandler)
     storei PC, ArgumentCount + TagOffset[cfr]
     cCall2(_llint_slow_path_handle_watchdog_timer, cfr, PC)
     move t1, cfr
-    btpnz t0, _llint_throw_from_slow_path_trampoline
+    btpnz t0, throwHandler
     loadi ArgumentCount + TagOffset[cfr], PC
 end
 

Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm (148654 => 148655)

--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm	2013-04-18 01:11:32 UTC (rev 148654)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter64.asm	2013-04-18 03:17:44 UTC (rev 148655)
@@ -126,12 +126,12 @@
     action(t0)
 end
 
-macro callWatchdogTimerHandler()
+macro callWatchdogTimerHandler(throwHandler)
     storei PC, ArgumentCount + TagOffset[cfr]
     prepareStateForCCall()
     cCall2(_llint_slow_path_handle_watchdog_timer, cfr, PC)
     move t1, cfr
-    btpnz t0, _llint_throw_from_slow_path_trampoline
+    btpnz t0, throwHandler
     move t3, PB
     loadi ArgumentCount + TagOffset[cfr], PC
 end

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