tests/tcg: move ARM specific tests into subdir
authorAlex Bennée <alex.bennee@linaro.org>
Thu, 5 Apr 2018 14:45:32 +0000 (15:45 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Wed, 20 Jun 2018 19:22:34 +0000 (20:22 +0100)
These only need to be built for ARM guests.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
MAINTAINERS
tests/tcg/README
tests/tcg/arm/Makefile.target [new file with mode: 0644]
tests/tcg/arm/README [new file with mode: 0644]
tests/tcg/arm/hello-arm.c [new file with mode: 0644]
tests/tcg/arm/test-arm-iwmmxt.s [new file with mode: 0644]
tests/tcg/hello-arm.c [deleted file]
tests/tcg/test-arm-iwmmxt.s [deleted file]

index 096b5bbf61205648dbf280ff8f0e68ae4ee23649..a6d233a43a34d8dbf6bacd1b0759e1ef14963df9 100644 (file)
@@ -135,6 +135,7 @@ M: Peter Maydell <peter.maydell@linaro.org>
 L: qemu-arm@nongnu.org
 S: Maintained
 F: target/arm/
+F: tests/tcg/arm/
 F: hw/arm/
 F: hw/cpu/a*mpcore.c
 F: include/hw/cpu/a*mpcore.h
index 469504c4cb048a98ecae10f5ab2b322bd10a1d4c..625f2326e67463f7e13151832eaf53e1fa45929e 100644 (file)
@@ -5,15 +5,6 @@ or they are architecture specific.
 
 
 
-ARM
-===
-
-hello-arm
----------
-
-test-arm-iwmmxt
----------------
-
 MIPS
 ====
 
diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target
new file mode 100644 (file)
index 0000000..bc6962e
--- /dev/null
@@ -0,0 +1,13 @@
+# -*- Mode: makefile -*-
+#
+# ARM - included from tests/tcg/Makefile.target
+#
+
+ARM_SRC=$(SRC_PATH)/tests/tcg/arm
+
+# Set search path for all sources
+VPATH          += $(ARM_SRC)
+
+
+hello-arm: CFLAGS+=-marm -ffreestanding
+hello-arm: LDFLAGS+=-nostdlib
diff --git a/tests/tcg/arm/README b/tests/tcg/arm/README
new file mode 100644 (file)
index 0000000..e630711
--- /dev/null
@@ -0,0 +1,11 @@
+These are ARM specific guest programs
+
+hello-arm
+---------
+
+A very simple inline assembly, write syscall based hello world
+
+test-arm-iwmmxt
+---------------
+
+A simple test case for older iwmmxt extended ARMs
diff --git a/tests/tcg/arm/hello-arm.c b/tests/tcg/arm/hello-arm.c
new file mode 100644 (file)
index 0000000..e0daa7a
--- /dev/null
@@ -0,0 +1,113 @@
+#define __NR_SYSCALL_BASE      0x900000
+#define __NR_exit1                     (__NR_SYSCALL_BASE+  1)
+#define __NR_write                     (__NR_SYSCALL_BASE+  4)
+
+#define __sys2(x) #x
+#define __sys1(x) __sys2(x)
+
+#ifndef __syscall
+#define __syscall(name) "swi\t" __sys1(__NR_##name) "\n\t"
+#endif
+
+#define __syscall_return(type, res)                                    \
+do {                                                                   \
+       return (type) (res);                                            \
+} while (0)
+
+#define _syscall0(type,name)                                           \
+type name(void) {                                                      \
+  long __res;                                                          \
+  __asm__ __volatile__ (                                               \
+  __syscall(name)                                                      \
+  "mov %0,r0"                                                          \
+  :"=r" (__res) : : "r0","lr");                                                \
+  __syscall_return(type,__res);                                                \
+}
+
+#define _syscall1(type,name,type1,arg1)                                        \
+type name(type1 arg1) {                                                        \
+  long __res;                                                          \
+  __asm__ __volatile__ (                                               \
+  "mov\tr0,%1\n\t"                                                     \
+  __syscall(name)                                                      \
+  "mov %0,r0"                                                          \
+        : "=r" (__res)                                                 \
+        : "r" ((long)(arg1))                                           \
+       : "r0","lr");                                                   \
+  __syscall_return(type,__res);                                                \
+}
+
+#define _syscall2(type,name,type1,arg1,type2,arg2)                     \
+type name(type1 arg1,type2 arg2) {                                     \
+  long __res;                                                          \
+  __asm__ __volatile__ (                                               \
+  "mov\tr0,%1\n\t"                                                     \
+  "mov\tr1,%2\n\t"                                                     \
+  __syscall(name)                                                      \
+  "mov\t%0,r0"                                                         \
+        : "=r" (__res)                                                 \
+        : "r" ((long)(arg1)),"r" ((long)(arg2))                                \
+       : "r0","r1","lr");                                              \
+  __syscall_return(type,__res);                                                \
+}
+
+
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)          \
+type name(type1 arg1,type2 arg2,type3 arg3) {                          \
+  long __res;                                                          \
+  __asm__ __volatile__ (                                               \
+  "mov\tr0,%1\n\t"                                                     \
+  "mov\tr1,%2\n\t"                                                     \
+  "mov\tr2,%3\n\t"                                                     \
+  __syscall(name)                                                      \
+  "mov\t%0,r0"                                                         \
+        : "=r" (__res)                                                 \
+        : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3))     \
+        : "r0","r1","r2","lr");                                                \
+  __syscall_return(type,__res);                                                \
+}
+
+
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)               \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {                            \
+  long __res;                                                                          \
+  __asm__ __volatile__ (                                                               \
+  "mov\tr0,%1\n\t"                                                                     \
+  "mov\tr1,%2\n\t"                                                                     \
+  "mov\tr2,%3\n\t"                                                                     \
+  "mov\tr3,%4\n\t"                                                                     \
+  __syscall(name)                                                                      \
+  "mov\t%0,r0"                                                                         \
+       : "=r" (__res)                                                                  \
+       : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4))   \
+       : "r0","r1","r2","r3","lr");                                                    \
+  __syscall_return(type,__res);                                                                \
+}
+
+
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)    \
+type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {                        \
+  long __res;                                                                          \
+  __asm__ __volatile__ (                                                               \
+  "mov\tr0,%1\n\t"                                                                     \
+  "mov\tr1,%2\n\t"                                                                     \
+  "mov\tr2,%3\n\t"                                                                     \
+  "mov\tr3,%4\n\t"                                                                     \
+  "mov\tr4,%5\n\t"                                                                     \
+  __syscall(name)                                                                      \
+  "mov\t%0,r0"                                                                         \
+       : "=r" (__res)                                                                  \
+       : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4)),  \
+         "r" ((long)(arg5))                                                            \
+       : "r0","r1","r2","r3","r4","lr");                                               \
+  __syscall_return(type,__res);                                                                \
+}
+
+_syscall1(int,exit1,int,status);
+_syscall3(int,write,int,fd,const char *,buf, int, len);
+
+void _start(void)
+{
+    write(1, "Hello World\n", 12);
+    exit1(0);
+}
diff --git a/tests/tcg/arm/test-arm-iwmmxt.s b/tests/tcg/arm/test-arm-iwmmxt.s
new file mode 100644 (file)
index 0000000..d647f94
--- /dev/null
@@ -0,0 +1,49 @@
+@ Checks whether iwMMXt is functional.
+.code  32
+.globl main
+
+main:
+ldr    r0, =data0
+ldr    r1, =data1
+ldr    r2, =data2
+#ifndef FPA
+wldrd  wr0, [r0, #0]
+wldrd  wr1, [r0, #8]
+wldrd  wr2, [r1, #0]
+wldrd  wr3, [r1, #8]
+wsubb  wr2, wr2, wr0
+wsubb  wr3, wr3, wr1
+wldrd  wr0, [r2, #0]
+wldrd  wr1, [r2, #8]
+waddb  wr0, wr0, wr2
+waddb  wr1, wr1, wr3
+wstrd  wr0, [r2, #0]
+wstrd  wr1, [r2, #8]
+#else
+ldfe   f0, [r0, #0]
+ldfe   f1, [r0, #8]
+ldfe   f2, [r1, #0]
+ldfe   f3, [r1, #8]
+adfdp  f2, f2, f0
+adfdp  f3, f3, f1
+ldfe   f0, [r2, #0]
+ldfe   f1, [r2, #8]
+adfd   f0, f0, f2
+adfd   f1, f1, f3
+stfe   f0, [r2, #0]
+stfe   f1, [r2, #8]
+#endif
+mov    r0, #1
+mov    r1, r2
+mov    r2, #0x11
+swi    #0x900004
+mov    r0, #0
+swi    #0x900001
+
+.data
+data0:
+.string        "aaaabbbbccccdddd"
+data1:
+.string        "bbbbccccddddeeee"
+data2:
+.string        "hvLLWs\x1fsdrs9\x1fNJ-\n"
diff --git a/tests/tcg/hello-arm.c b/tests/tcg/hello-arm.c
deleted file mode 100644 (file)
index e0daa7a..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-#define __NR_SYSCALL_BASE      0x900000
-#define __NR_exit1                     (__NR_SYSCALL_BASE+  1)
-#define __NR_write                     (__NR_SYSCALL_BASE+  4)
-
-#define __sys2(x) #x
-#define __sys1(x) __sys2(x)
-
-#ifndef __syscall
-#define __syscall(name) "swi\t" __sys1(__NR_##name) "\n\t"
-#endif
-
-#define __syscall_return(type, res)                                    \
-do {                                                                   \
-       return (type) (res);                                            \
-} while (0)
-
-#define _syscall0(type,name)                                           \
-type name(void) {                                                      \
-  long __res;                                                          \
-  __asm__ __volatile__ (                                               \
-  __syscall(name)                                                      \
-  "mov %0,r0"                                                          \
-  :"=r" (__res) : : "r0","lr");                                                \
-  __syscall_return(type,__res);                                                \
-}
-
-#define _syscall1(type,name,type1,arg1)                                        \
-type name(type1 arg1) {                                                        \
-  long __res;                                                          \
-  __asm__ __volatile__ (                                               \
-  "mov\tr0,%1\n\t"                                                     \
-  __syscall(name)                                                      \
-  "mov %0,r0"                                                          \
-        : "=r" (__res)                                                 \
-        : "r" ((long)(arg1))                                           \
-       : "r0","lr");                                                   \
-  __syscall_return(type,__res);                                                \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)                     \
-type name(type1 arg1,type2 arg2) {                                     \
-  long __res;                                                          \
-  __asm__ __volatile__ (                                               \
-  "mov\tr0,%1\n\t"                                                     \
-  "mov\tr1,%2\n\t"                                                     \
-  __syscall(name)                                                      \
-  "mov\t%0,r0"                                                         \
-        : "=r" (__res)                                                 \
-        : "r" ((long)(arg1)),"r" ((long)(arg2))                                \
-       : "r0","r1","lr");                                              \
-  __syscall_return(type,__res);                                                \
-}
-
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)          \
-type name(type1 arg1,type2 arg2,type3 arg3) {                          \
-  long __res;                                                          \
-  __asm__ __volatile__ (                                               \
-  "mov\tr0,%1\n\t"                                                     \
-  "mov\tr1,%2\n\t"                                                     \
-  "mov\tr2,%3\n\t"                                                     \
-  __syscall(name)                                                      \
-  "mov\t%0,r0"                                                         \
-        : "=r" (__res)                                                 \
-        : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3))     \
-        : "r0","r1","r2","lr");                                                \
-  __syscall_return(type,__res);                                                \
-}
-
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)               \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {                            \
-  long __res;                                                                          \
-  __asm__ __volatile__ (                                                               \
-  "mov\tr0,%1\n\t"                                                                     \
-  "mov\tr1,%2\n\t"                                                                     \
-  "mov\tr2,%3\n\t"                                                                     \
-  "mov\tr3,%4\n\t"                                                                     \
-  __syscall(name)                                                                      \
-  "mov\t%0,r0"                                                                         \
-       : "=r" (__res)                                                                  \
-       : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4))   \
-       : "r0","r1","r2","r3","lr");                                                    \
-  __syscall_return(type,__res);                                                                \
-}
-
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5)    \
-type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {                        \
-  long __res;                                                                          \
-  __asm__ __volatile__ (                                                               \
-  "mov\tr0,%1\n\t"                                                                     \
-  "mov\tr1,%2\n\t"                                                                     \
-  "mov\tr2,%3\n\t"                                                                     \
-  "mov\tr3,%4\n\t"                                                                     \
-  "mov\tr4,%5\n\t"                                                                     \
-  __syscall(name)                                                                      \
-  "mov\t%0,r0"                                                                         \
-       : "=r" (__res)                                                                  \
-       : "r" ((long)(arg1)),"r" ((long)(arg2)),"r" ((long)(arg3)),"r" ((long)(arg4)),  \
-         "r" ((long)(arg5))                                                            \
-       : "r0","r1","r2","r3","r4","lr");                                               \
-  __syscall_return(type,__res);                                                                \
-}
-
-_syscall1(int,exit1,int,status);
-_syscall3(int,write,int,fd,const char *,buf, int, len);
-
-void _start(void)
-{
-    write(1, "Hello World\n", 12);
-    exit1(0);
-}
diff --git a/tests/tcg/test-arm-iwmmxt.s b/tests/tcg/test-arm-iwmmxt.s
deleted file mode 100644 (file)
index d647f94..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-@ Checks whether iwMMXt is functional.
-.code  32
-.globl main
-
-main:
-ldr    r0, =data0
-ldr    r1, =data1
-ldr    r2, =data2
-#ifndef FPA
-wldrd  wr0, [r0, #0]
-wldrd  wr1, [r0, #8]
-wldrd  wr2, [r1, #0]
-wldrd  wr3, [r1, #8]
-wsubb  wr2, wr2, wr0
-wsubb  wr3, wr3, wr1
-wldrd  wr0, [r2, #0]
-wldrd  wr1, [r2, #8]
-waddb  wr0, wr0, wr2
-waddb  wr1, wr1, wr3
-wstrd  wr0, [r2, #0]
-wstrd  wr1, [r2, #8]
-#else
-ldfe   f0, [r0, #0]
-ldfe   f1, [r0, #8]
-ldfe   f2, [r1, #0]
-ldfe   f3, [r1, #8]
-adfdp  f2, f2, f0
-adfdp  f3, f3, f1
-ldfe   f0, [r2, #0]
-ldfe   f1, [r2, #8]
-adfd   f0, f0, f2
-adfd   f1, f1, f3
-stfe   f0, [r2, #0]
-stfe   f1, [r2, #8]
-#endif
-mov    r0, #1
-mov    r1, r2
-mov    r2, #0x11
-swi    #0x900004
-mov    r0, #0
-swi    #0x900001
-
-.data
-data0:
-.string        "aaaabbbbccccdddd"
-data1:
-.string        "bbbbccccddddeeee"
-data2:
-.string        "hvLLWs\x1fsdrs9\x1fNJ-\n"