pixman: Branch 'master' - 2 commits

[Jeff Muizelaar]

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

New commits:
commit 5f086792eeaea6b2c401105b8bbf0c92fb7d192e
Author: Jonathan Morton <jmorton at sd070.hel.movial.fi>
Date:   Thu Jun 4 11:24:26 2009 -0400

    [NEON] Really fix filler bug.
    
    Advance the destination pointer (r4 register) properly.
    Found by Siarhei Siamashka.

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 5d07c76..abcd24f 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -1703,15 +1703,15 @@ pixman_fill_neon (uint32_t *bits,
 	"2:\n"
 	"tst		%[width], #4\n"
 	"beq		2f\n"
-	"str		%[color], [r4]!\n"
+	"str		%[color], [r4], #4\n"
 	"2:\n"
 	"tst		%[width], #2\n"
 	"beq		2f\n"
-	"strh		%[color], [r4]!\n"
+	"strh		%[color], [r4], #2\n"
 	"2:\n"
 	"tst		%[width], #1\n"
 	"beq		2f\n"
-	"strb		%[color], [r4]!\n"
+	"strb		%[color], [r4], #1\n"
 	"2:\n"
 
 	"subs		%[height], %[height], #1\n"
commit 3b12cc7a23f81581b027764be96bf028785b1b5f
Author: Jonathan Morton <jmorton at sd070.hel.movial.fi>
Date:   Thu Jun 4 11:24:22 2009 -0400

    [NEON] Fix filler bug.
    
    r5 is being sourced explicitly instead of the %[width] reference.
    It's probably a copy-paste bug, not spotted because I didn't
    originally write it.

diff --git a/pixman/pixman-arm-neon.c b/pixman/pixman-arm-neon.c
index 36d7026..5d07c76 100644
--- a/pixman/pixman-arm-neon.c
+++ b/pixman/pixman-arm-neon.c
@@ -1709,7 +1709,7 @@ pixman_fill_neon (uint32_t *bits,
 	"beq		2f\n"
 	"strh		%[color], [r4]!\n"
 	"2:\n"
-	"tst		r5, #1\n"
+	"tst		%[width], #1\n"
 	"beq		2f\n"
 	"strb		%[color], [r4]!\n"
 	"2:\n"