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

[zherczeg at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 32f8aeadc9be0b1163656bb211b68a789abfc10b
Author: zherczeg at webkit.org <zherczeg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 07:22:38 2010 +0000

    Wrong instruction form for BKPT
    https://bugs.webkit.org/show_bug.cgi?id=48427
    
    Reviewed by Andreas Kling.
    
    One '0' is missing from BKPT instruction.
    Thanks for Jacob Bramley for reporting this error.
    
    * assembler/ARMAssembler.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index bb633e1..620f6d8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-28  Zoltan Herczeg  <zherczeg at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Wrong instruction form for BKPT
+        https://bugs.webkit.org/show_bug.cgi?id=48427
+
+        One '0' is missing from BKPT instruction.
+        Thanks for Jacob Bramley for reporting this error.
+
+        * assembler/ARMAssembler.h:
+
 2010-10-28  Xan Lopez  <xlopez at igalia.com>
 
         Try to fix Snow Leopard build.
diff --git a/JavaScriptCore/assembler/ARMAssembler.h b/JavaScriptCore/assembler/ARMAssembler.h
index dfa726a..900f655 100644
--- a/JavaScriptCore/assembler/ARMAssembler.h
+++ b/JavaScriptCore/assembler/ARMAssembler.h
@@ -165,7 +165,7 @@ namespace JSC {
             VMRS_APSR = 0x0ef1fa10,
 #if WTF_ARM_ARCH_AT_LEAST(5)
             CLZ = 0x016f0f10,
-            BKPT = 0xe120070,
+            BKPT = 0xe1200070,
             BLX = 0x012fff30,
 #endif
 #if WTF_ARM_ARCH_AT_LEAST(7)
@@ -206,7 +206,7 @@ namespace JSC {
         enum {
             padForAlign8  = 0x00,
             padForAlign16 = 0x0000,
-            padForAlign32 = 0xee120070,
+            padForAlign32 = 0xe12fff7f // 'bkpt 0xffff' instruction.
         };
 
         static const ARMWord INVALID_IMM = 0xf0000000;

-- 
WebKit Debian packaging