[Qemu-devel] [4682] Make the tests run when built with experimental gcc-cris 4.4.

[Edgar E. Iglesias]

Revision: 4682
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4682
Author:   edgar_igl
Date:     2008-06-06 11:07:50 +0000 (Fri, 06 Jun 2008)

Log Message:
-----------
Make the tests run when built with experimental gcc-cris 4.4. Prettify the logs.

Modified Paths:
--------------
    trunk/tests/cris/Makefile
    trunk/tests/cris/sys.c
    trunk/tests/cris/testutils.inc

Modified: trunk/tests/cris/Makefile
===================================================================
--- trunk/tests/cris/Makefile   2008-06-06 11:05:18 UTC (rev 4681)
+++ trunk/tests/cris/Makefile   2008-06-06 11:07:50 UTC (rev 4682)
@@ -140,9 +140,9 @@
 
 check: $(CRT) $(SYS) $(TESTCASES)
        @echo -e "\nQEMU simulator."
-       @for case in $(TESTCASES); do \
+       for case in $(TESTCASES); do \
                echo -n "$$case "; \
-               $(SIM) $$case; \
+               $(SIM) ./$$case; \
        done
 check-g: $(CRT) $(SYS) $(TESTCASES)
        @echo -e "\nGDB simulator."

Modified: trunk/tests/cris/sys.c
===================================================================
--- trunk/tests/cris/sys.c      2008-06-06 11:05:18 UTC (rev 4681)
+++ trunk/tests/cris/sys.c      2008-06-06 11:07:50 UTC (rev 4682)
@@ -16,7 +16,7 @@
 }
 
 void _fail(char *reason) {
-       char s[] = "failed: ";
+       char s[] = "\nfailed: ";
        int len = mystrlen(reason);
        write (1, s, sizeof (s) - 1);
        write (1, reason, len);
@@ -41,8 +41,11 @@
 
 ssize_t write (int fd, const void *buf, size_t count) {
        int r;
-       asm volatile ("moveq 4, $r9\n" /* NR_write.  */
-                     "break 13\n" : : : "memory");
-       asm volatile ("move.d $r10, %0\n" : "=r" (r));
+       asm ("move.d %0, $r10\n"
+            "move.d %1, $r11\n"
+            "move.d %2, $r12\n"
+            "moveq 4, $r9\n" /* NR_write.  */
+            "break 13\n" : : "r" (fd), "r" (buf), "r" (count) : "memory");
+       asm ("move.d $r10, %0\n" : "=r" (r));
        return r;
 }

Modified: trunk/tests/cris/testutils.inc
===================================================================
--- trunk/tests/cris/testutils.inc      2008-06-06 11:05:18 UTC (rev 4681)
+++ trunk/tests/cris/testutils.inc      2008-06-06 11:07:50 UTC (rev 4682)
@@ -23,7 +23,7 @@
        .macro  fail
        .data
 99:
-       .asciz " checkr3 failed"
+       .asciz " checkr3 failed\n"
        .text
        move.d  99b, $r10
        jsr     _fail
@@ -36,7 +36,7 @@
        nop
        .data
 99:
-       .asciz "checkr3 failed"
+       .asciz "checkr3 failed\n"
        .text
        move.d  99b, $r10
        jsr     _fail
@@ -79,7 +79,7 @@
 9:
        .data
 99:
-       .asciz "test_move_cc failed"
+       .asciz "test_move_cc failed\n"
        .text
        move.d  99b, $r10
        jsr     _fail
@@ -108,7 +108,7 @@
 9:
        .data
 99:
-       .asciz "test_move_cc failed"
+       .asciz "test_move_cc failed\n"
        .text
        move.d  99b, $r10
        jsr     _fail