[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 710 Removed SMULBB instructions (Closes: 611725) Thanks to Jérémy Lal

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 710
Revision Id: iuculano at debian.org-20110223092731-gd0e8jqhy2kap9qz
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Removed SMULBB instructions (Closes: 611725) Thanks to Jérémy Lal


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/patches/armv4.patch

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-02-23 09:10:49 +0000
+++ b/debian/changelog	2011-02-23 09:27:31 +0000
@@ -4,8 +4,9 @@
   * Refreshed pathces
   * Renamed binary packages, new names: chromium, chromium-l10n,
     chromium-inspector, chromium-dbg
+  * Removed SMULBB instructions (Closes: 611725) Thanks to Jérémy Lal
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 23 Feb 2011 10:05:18 +0100
+ -- Giuseppe Iuculano <iuculano at debian.org>  Wed, 23 Feb 2011 10:26:01 +0100
 
 chromium-browser (9.0.597.98~r74359-1) unstable; urgency=low
 

=== modified file 'debian/patches/armv4.patch'
--- a/debian/patches/armv4.patch	2011-02-19 11:21:18 +0000
+++ b/debian/patches/armv4.patch	2011-02-23 09:27:31 +0000
@@ -31,3 +31,25 @@
  #else
  #define DEBUG_BREAK() asm("int3")
  #endif
+--- a/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
++++ b/src/third_party/skia/src/opts/SkBlitRow_opts_arm.cpp
+@@ -685,8 +685,8 @@ static void S32A_Blend_BlitRow32_arm(SkP
+                   /* dst1_scale and dst2_scale*/
+                   "lsr    r9, r5, #24                \n\t" /* src >> 24 */
+                   "lsr    r10, r6, #24               \n\t" /* src >> 24 */
+-                  "smulbb r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
+-                  "smulbb r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
++                  "mul    r9, r9, %[alpha]           \n\t" /* r9 = SkMulS16 r9 with src_scale */
++                  "mul    r10, r10, %[alpha]         \n\t" /* r10 = SkMulS16 r10 with src_scale */
+                   "lsr    r9, r9, #8                 \n\t" /* r9 >> 8 */
+                   "lsr    r10, r10, #8               \n\t" /* r10 >> 8 */
+                   "rsb    r9, r9, #256               \n\t" /* dst1_scale = r9 = 255 - r9 + 1 */
+@@ -755,7 +755,7 @@ static void S32A_Blend_BlitRow32_arm(SkP
+ 
+                   "lsr    r6, r5, #24                \n\t" /* src >> 24 */
+                   "and    r8, r12, r5, lsr #8        \n\t" /* ag = r8 = r5 masked by r12 lsr by #8 */
+-                  "smulbb r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
++                  "mul    r6, r6, %[alpha]           \n\t" /* r6 = SkMulS16 with src_scale */
+                   "and    r9, r12, r5                \n\t" /* rb = r9 = r5 masked by r12 */
+                   "lsr    r6, r6, #8                 \n\t" /* r6 >> 8 */
+                   "mul    r8, r8, %[alpha]           \n\t" /* ag = r8 times scale */