Fix register constraints to this works with both -O and without (David

Woodhouse).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4614

diff --git a/none/tests/ppc32/lsw.c b/none/tests/ppc32/lsw.c
index 1d09221437daf87369c6623f5802035153d4a9b6..a0496dbefd120a3e13227b3faa9eafe16a451952 100644 (file)
--- a/none/tests/ppc32/lsw.c
+++ b/none/tests/ppc32/lsw.c
@@ -3,6 +3,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+/* Apparently the "b" register constraint is like "r" except that it
+   disallows the use of r0, which means it is safe to use in places
+   where the appearance of r0 would cause a problem due to it being
+   read as zero. */
+
 static void announce ( char* str )
 {
    printf("------ %s ------\n", str);
@@ -21,7 +26,7 @@ int main ( void )
                "stw 3,0(%1)\n\t"
                "stw 4,4(%1)\n\t"
                "stw 5,8(%1)\n\t"
-               : : "r"(a1), "r"(a2) : "r3", "r4", "r5", 
+               : : "b"(a1), "b"(a2) : "r3", "r4", "r5", 
                                       "cc", "memory" );
   printf("%s\n", a2);
   for (i = 0; i < 12; i++)
@@ -34,7 +39,7 @@ int main ( void )
                "stw 3,0(%1)\n\t"
                "stw 4,4(%1)\n\t"
                "stw 5,8(%1)\n\t"
-               : : "r"(a1), "r"(a2) : "r3", "r4", "r5", 
+               : : "b"(a1), "b"(a2) : "r3", "r4", "r5", 
                                       "cc", "memory" );
   printf("%s\n", a2);
   for (i = 0; i < 12; i++)
@@ -51,7 +56,7 @@ int main ( void )
                "stw 3,0(%1)\n\t"
                "stw 4,4(%1)\n\t"
                "stw 5,8(%1)\n\t"
-               : : "r"(a1), "r"(a2), "r"(16) : "r3", "r4", "r5", "r8", 
+               : : "b"(a1), "b"(a2), "b"(16) : "r3", "r4", "r5", "r8", 
                                                "cc", "memory" );
   printf("%s\n", a2);
   for (i = 0; i < 12; i++)
@@ -64,7 +69,7 @@ int main ( void )
   a2 = calloc(100,1);
   asm volatile("lswi 3,%0, 19\n\t"
                "stswi 3,%1, 8\n"
-              : : "r"(a1), "r"(a2) : "r3","r4","r5","r6","r7",
+              : : "b"(a1), "b"(a2) : "r3","r4","r5","r6","r7",
                                       "cc", "memory" );
   printf("%s\n", a2);
   printf("\n");
@@ -75,7 +80,7 @@ int main ( void )
   a2 = calloc(100,1);
   asm volatile("lswi 3,%0, 19\n\t"
                "stswi 3,%1, 17\n"
-              : : "r"(a1), "r"(a2) : "r3","r4","r5","r6","r7",
+              : : "b"(a1), "b"(a2) : "r3","r4","r5","r6","r7",
                                       "cc", "memory" );
   printf("%s\n", a2);
   printf("\n");
@@ -88,7 +93,7 @@ int main ( void )
                "mtxer 8\n\t"
                "lswx  3,%0,%2\n\t" 
                "stswx 3,%1,%2\n\t" 
-               : : "r"(a1), "r"(a2), "r"(16) : "r3", "r4", "r5", "r8", 
+               : : "b"(a1), "b"(a2), "b"(16) : "r3", "r4", "r5", "r8", 
                                                "cc", "memory" );
   printf("%s\n", a2+16);
   printf("\n");