pixman: Branch 'master' - 2 commits

[Jeff Muizelaar]

 pixman/pixman-arm-neon.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit a282b640becfa1bb4979382f6a49cb59a7f992e2
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri May 22 12:13:57 2009 -0700

    NEON: Remove some unneeded casts
    
    There are some unnecessary (void*) casts. Eliminate some of them. Doesn't
    change the generated code.

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 97615c3..7be4843 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -245,14 +245,14 @@ fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
             }
             if (w&1)
             {
-                sval = vld1_lane_u8((void*)src,sval,1);
-                dval = vld1_lane_u8((void*)dst,dval,1);
+                sval = vld1_lane_u8(src,sval,1);
+                dval = vld1_lane_u8(dst,dval,1);
             }
 
             dval = vqadd_u8(dval,sval);
 
             if (w&1)
-                vst1_lane_u8((void*)dst,dval,1);
+                vst1_lane_u8(dst,dval,1);
             if (w&2)
                 vst1_lane_u16((void*)dst2,vreinterpret_u16_u8(dval),1);
             if (w&4)
@@ -1360,14 +1360,14 @@ fbCompositeSrcAdd_8888x8x8neon (pixman_op_t op,
             }
             if (w&1)
             {
-                mval = vld1_lane_u8((void *)mask, mval, 1);
-                dval = vld1_lane_u8((void *)dst, dval, 1);
+                mval = vld1_lane_u8(mask, mval, 1);
+                dval = vld1_lane_u8(dst, dval, 1);
             }
 
             res = vqadd_u8(neon2mul(mval,sa),dval);
 
             if (w&1)
-                vst1_lane_u8((void *)dst, res, 1);
+                vst1_lane_u8(dst, res, 1);
             if (w&2)
                 vst1_lane_u16((void *)dst2, vreinterpret_u16_u8(res), 1);
             if (w&4)
commit ff866e70e399e655ad9b5a851bb682463fdda5ac
Author: Jeff Muizelaar <jmuizelaar at mozilla.com>
Date:   Fri May 22 11:56:44 2009 -0700

    Fix uses of dst_keep

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 633f05e..97615c3 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -207,7 +207,7 @@ fbCompositeSrcAdd_8000x8000neon (pixman_op_t op,
                         "1:\n\t"
                         "vst1.8  {d20}, [%[keep_dst]]\n\t"
 
-                        : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
+                        : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "=r" (keep_dst)
                         :
                         : "ip", "cc", "memory", "d0","d4",
                           "d20"
@@ -371,7 +371,7 @@ fbCompositeSrc_8888x8888neon (pixman_op_t op,
                         "1:\n\t"
                         "vst4.8  {d20-d23}, [%[keep_dst]]\n\t"
 
-                        : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
+                        : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "=r" (keep_dst)
                         : 
                         : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
                           "d16","d17","d18","d19","d20","d21","d22","d23"
@@ -661,7 +661,7 @@ fbCompositeSrc_8888x8x8888neon (pixman_op_t op,
                         "1:\n\t"
                         "vst4.8       {d20-d23}, [%[keep_dst]]\n\t"
 
-                        : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "+r" (keep_dst)
+                        : [w] "+r" (w), [src] "+r" (src), [dst] "+r" (dst), [keep_dst] "=r" (keep_dst)
                         : [mask] "r" (mask)
                         : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
                           "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27",
@@ -889,7 +889,7 @@ fbCompositeSolidMask_nx8x0565neon (pixman_op_t op,
                         "1:\n\t"
                         "vst1.16      {q10}, [%[keep_dst]]\n\t"
 
-                        : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
+                        : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "=r" (keep_dst)
                         : [src] "r" (src)
                         : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
                           "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",
@@ -1207,7 +1207,7 @@ fbCompositeSolidMask_nx8x8888neon (pixman_op_t      op,
                         "1:\n\t"
                         "vst4.8       {d20-d23}, [%[keep_dst]]\n\t"
 
-                        : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "+r" (keep_dst)
+                        : [w] "+r" (w), [dst] "+r" (dst), [mask] "+r" (mask), [keep_dst] "=r" (keep_dst)
                         : [src] "r" (src) 
                         : "ip", "cc", "memory", "d0","d1","d2","d3","d4","d5","d6","d7",
                           "d16","d17","d18","d19","d20","d21","d22","d23","d24","d25","d26","d27","d28","d29",