[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[loki at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a83e82d2ced11991b61f29363047da8184ff4a75
Author: loki at webkit.org <loki at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 13:37:55 2010 +0000

    The scratch register should be saved in YARR with ARM JIT
    https://bugs.webkit.org/show_bug.cgi?id=43910
    
    Reviewed by Simon Hausmann.
    
    Reported by Jocelyn Turcotte.
    
    * yarr/RegexJIT.cpp:
    (JSC::Yarr::RegexGenerator::generateEnter):
    (JSC::Yarr::RegexGenerator::generateReturn):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 80578f8..a2fafec 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-12  Gabor Loki  <loki at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        The scratch register should be saved in YARR with ARM JIT
+        https://bugs.webkit.org/show_bug.cgi?id=43910
+
+        Reported by Jocelyn Turcotte.
+
+        * yarr/RegexJIT.cpp:
+        (JSC::Yarr::RegexGenerator::generateEnter):
+        (JSC::Yarr::RegexGenerator::generateReturn):
+
 2010-08-11  Gavin Barraclough  <barraclough at apple.com>
 
         Windows build fix.
diff --git a/JavaScriptCore/yarr/RegexJIT.cpp b/JavaScriptCore/yarr/RegexJIT.cpp
index e158f8f..4c21547 100644
--- a/JavaScriptCore/yarr/RegexJIT.cpp
+++ b/JavaScriptCore/yarr/RegexJIT.cpp
@@ -1416,6 +1416,9 @@ class RegexGenerator : private MacroAssembler {
         push(ARMRegisters::r4);
         push(ARMRegisters::r5);
         push(ARMRegisters::r6);
+#if CPU(ARM_TRADITIONAL)
+        push(ARMRegisters::r8); // scratch register
+#endif
         move(ARMRegisters::r3, output);
 #elif CPU(MIPS)
         // Do nothing.
@@ -1433,6 +1436,9 @@ class RegexGenerator : private MacroAssembler {
         pop(X86Registers::ebx);
         pop(X86Registers::ebp);
 #elif CPU(ARM)
+#if CPU(ARM_TRADITIONAL)
+        pop(ARMRegisters::r8); // scratch register
+#endif
         pop(ARMRegisters::r6);
         pop(ARMRegisters::r5);
         pop(ARMRegisters::r4);

-- 
WebKit Debian packaging