[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 b3af2235d4df2bcea799ddeae879ffb057428c48
Author: loki at webkit.org <loki at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 10:02:47 2010 +0000

    2010-08-18  Gabor Loki  <loki at webkit.org>
    
            Reviewed by Gavin Barraclough.
    
            The JITStackFrame is wrong using Thumb-2 JIT with JSVALUE32_64
            https://bugs.webkit.org/show_bug.cgi?id=43897
    
            A 64 bits wide member in a structure is aligned to 8 bytes on ARM by
            default, but this is not taken into account in the offset defines of
            JITStackFrame.
    
            * jit/JITStubs.cpp:
            * jit/JITStubs.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1cf0f8c..1c7f689 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-18  Gabor Loki  <loki at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        The JITStackFrame is wrong using Thumb-2 JIT with JSVALUE32_64
+        https://bugs.webkit.org/show_bug.cgi?id=43897
+
+        A 64 bits wide member in a structure is aligned to 8 bytes on ARM by
+        default, but this is not taken into account in the offset defines of
+        JITStackFrame.
+
+        * jit/JITStubs.cpp:
+        * jit/JITStubs.h:
+
 2010-08-18  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig.
diff --git a/JavaScriptCore/jit/JITStubs.cpp b/JavaScriptCore/jit/JITStubs.cpp
index e9ba25d..f1808d5 100644
--- a/JavaScriptCore/jit/JITStubs.cpp
+++ b/JavaScriptCore/jit/JITStubs.cpp
@@ -230,15 +230,15 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n"
 
 #elif COMPILER(GCC) && CPU(ARM_THUMB2)
 
-#define THUNK_RETURN_ADDRESS_OFFSET      0x3C
-#define PRESERVED_RETURN_ADDRESS_OFFSET  0x40
-#define PRESERVED_R4_OFFSET              0x44
-#define PRESERVED_R5_OFFSET              0x48
-#define PRESERVED_R6_OFFSET              0x4C
-#define REGISTER_FILE_OFFSET             0x50
-#define CALLFRAME_OFFSET                 0x54
-#define EXCEPTION_OFFSET                 0x58
-#define ENABLE_PROFILER_REFERENCE_OFFSET 0x60
+#define THUNK_RETURN_ADDRESS_OFFSET      0x40
+#define PRESERVED_RETURN_ADDRESS_OFFSET  0x44
+#define PRESERVED_R4_OFFSET              0x48
+#define PRESERVED_R5_OFFSET              0x4C
+#define PRESERVED_R6_OFFSET              0x50
+#define REGISTER_FILE_OFFSET             0x54
+#define CALLFRAME_OFFSET                 0x58
+#define EXCEPTION_OFFSET                 0x5C
+#define ENABLE_PROFILER_REFERENCE_OFFSET 0x64
 
 #elif (COMPILER(GCC) || COMPILER(RVCT)) && CPU(ARM_TRADITIONAL)
 
diff --git a/JavaScriptCore/jit/JITStubs.h b/JavaScriptCore/jit/JITStubs.h
index 94e319f..43f3d19 100644
--- a/JavaScriptCore/jit/JITStubs.h
+++ b/JavaScriptCore/jit/JITStubs.h
@@ -144,7 +144,7 @@ namespace JSC {
 #endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC))
 #elif CPU(ARM_THUMB2)
     struct JITStackFrame {
-        void* reserved; // Unused
+        JITStubArg reserved; // Unused
         JITStubArg args[6];
 #if USE(JSVALUE32_64)
         void* padding[2]; // Maintain 16-byte stack alignment.

-- 
WebKit Debian packaging