user: Move 'abitypes.h' from 'exec/user' to 'user'

Keep all user emulation headers under the same user/ directory.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240503125202.35667-1-philmd@linaro.org>

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8629f0dcde9142fa81f435fc9584c8732c0ff806..a0c1ad7efaf9d01e285f3cc0f9ea521d0f88329a 100644 (file)
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -22,7 +22,7 @@
 #include "exec/cpu_ldst.h"
 #include "exec/exec-all.h"
 
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 extern char **environ;
 

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index e75ec13cd0283311d08c7b52b49b9dd328c48202..032c6d990e18a3c0bb78f36b21d11690e7bd7a9d 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -64,7 +64,7 @@
 /* MMU memory access macros */
 
 #if defined(CONFIG_USER_ONLY)
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 /*
  * If non-zero, the guest virtual address space is a contiguous subset

diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h
deleted file mode 100644 (file)
index 3ec1969..0000000
--- a/include/exec/user/abitypes.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef EXEC_USER_ABITYPES_H
-#define EXEC_USER_ABITYPES_H
-
-#ifndef CONFIG_USER_ONLY
-#error Cannot include this header from system emulation
-#endif
-
-#include "exec/cpu-defs.h"
-#include "exec/tswap.h"
-#include "user/tswap-target.h"
-
-#ifdef TARGET_ABI32
-#define TARGET_ABI_BITS 32
-#else
-#define TARGET_ABI_BITS TARGET_LONG_BITS
-#endif
-
-#ifdef TARGET_M68K
-#define ABI_INT_ALIGNMENT 2
-#define ABI_LONG_ALIGNMENT 2
-#define ABI_LLONG_ALIGNMENT 2
-#endif
-
-#ifdef TARGET_CRIS
-#define ABI_SHORT_ALIGNMENT 1
-#define ABI_INT_ALIGNMENT 1
-#define ABI_LONG_ALIGNMENT 1
-#define ABI_LLONG_ALIGNMENT 1
-#endif
-
-#if (defined(TARGET_I386) && !defined(TARGET_X86_64)) \
-    || defined(TARGET_SH4) \
-    || defined(TARGET_OPENRISC) \
-    || defined(TARGET_MICROBLAZE)
-#define ABI_LLONG_ALIGNMENT 4
-#endif
-
-#ifndef ABI_SHORT_ALIGNMENT
-#define ABI_SHORT_ALIGNMENT 2
-#endif
-#ifndef ABI_INT_ALIGNMENT
-#define ABI_INT_ALIGNMENT 4
-#endif
-#ifndef ABI_LONG_ALIGNMENT
-#define ABI_LONG_ALIGNMENT (TARGET_ABI_BITS / 8)
-#endif
-#ifndef ABI_LLONG_ALIGNMENT
-#define ABI_LLONG_ALIGNMENT 8
-#endif
-
-typedef int16_t abi_short __attribute__ ((aligned(ABI_SHORT_ALIGNMENT)));
-typedef uint16_t abi_ushort __attribute__((aligned(ABI_SHORT_ALIGNMENT)));
-typedef int32_t abi_int __attribute__((aligned(ABI_INT_ALIGNMENT)));
-typedef uint32_t abi_uint __attribute__((aligned(ABI_INT_ALIGNMENT)));
-typedef int64_t abi_llong __attribute__((aligned(ABI_LLONG_ALIGNMENT)));
-typedef uint64_t abi_ullong __attribute__((aligned(ABI_LLONG_ALIGNMENT)));
-
-#ifdef TARGET_ABI32
-typedef uint32_t abi_ulong __attribute__((aligned(ABI_LONG_ALIGNMENT)));
-typedef int32_t abi_long __attribute__((aligned(ABI_LONG_ALIGNMENT)));
-#define TARGET_ABI_FMT_lx "%08x"
-#define TARGET_ABI_FMT_ld "%d"
-#define TARGET_ABI_FMT_lu "%u"
-
-static inline abi_ulong tswapal(abi_ulong v)
-{
-    return tswap32(v);
-}
-
-#else
-typedef target_ulong abi_ulong __attribute__((aligned(ABI_LONG_ALIGNMENT)));
-typedef target_long abi_long __attribute__((aligned(ABI_LONG_ALIGNMENT)));
-#define TARGET_ABI_FMT_lx TARGET_FMT_lx
-#define TARGET_ABI_FMT_ld TARGET_FMT_ld
-#define TARGET_ABI_FMT_lu TARGET_FMT_lu
-/* for consistency, define ABI32 too */
-#if TARGET_ABI_BITS == 32
-#define TARGET_ABI32 1
-#endif
-
-static inline abi_ulong tswapal(abi_ulong v)
-{
-    return tswapl(v);
-}
-
-#endif
-#endif

diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 2ebfecf58eb2f62da322a595ea79f7c951565b96..9f35c888f9277c19de0f13a51b000d7e47cd29b1 100644 (file)
--- a/include/exec/user/thunk.h
+++ b/include/exec/user/thunk.h
@@ -21,7 +21,7 @@
 #define THUNK_H
 
 #include "cpu.h"
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 /* types enums definitions */
 

diff --git a/include/user/abitypes.h b/include/user/abitypes.h
new file mode 100644 (file)
index 0000000..5c9a955
--- /dev/null
+++ b/include/user/abitypes.h
@@ -0,0 +1,87 @@
+#ifndef USER_ABITYPES_H
+#define USER_ABITYPES_H
+
+#ifndef CONFIG_USER_ONLY
+#error Cannot include this header from system emulation
+#endif
+
+#include "exec/cpu-defs.h"
+#include "exec/tswap.h"
+#include "user/tswap-target.h"
+
+#ifdef TARGET_ABI32
+#define TARGET_ABI_BITS 32
+#else
+#define TARGET_ABI_BITS TARGET_LONG_BITS
+#endif
+
+#ifdef TARGET_M68K
+#define ABI_INT_ALIGNMENT 2
+#define ABI_LONG_ALIGNMENT 2
+#define ABI_LLONG_ALIGNMENT 2
+#endif
+
+#ifdef TARGET_CRIS
+#define ABI_SHORT_ALIGNMENT 1
+#define ABI_INT_ALIGNMENT 1
+#define ABI_LONG_ALIGNMENT 1
+#define ABI_LLONG_ALIGNMENT 1
+#endif
+
+#if (defined(TARGET_I386) && !defined(TARGET_X86_64)) \
+    || defined(TARGET_SH4) \
+    || defined(TARGET_OPENRISC) \
+    || defined(TARGET_MICROBLAZE)
+#define ABI_LLONG_ALIGNMENT 4
+#endif
+
+#ifndef ABI_SHORT_ALIGNMENT
+#define ABI_SHORT_ALIGNMENT 2
+#endif
+#ifndef ABI_INT_ALIGNMENT
+#define ABI_INT_ALIGNMENT 4
+#endif
+#ifndef ABI_LONG_ALIGNMENT
+#define ABI_LONG_ALIGNMENT (TARGET_ABI_BITS / 8)
+#endif
+#ifndef ABI_LLONG_ALIGNMENT
+#define ABI_LLONG_ALIGNMENT 8
+#endif
+
+typedef int16_t abi_short __attribute__ ((aligned(ABI_SHORT_ALIGNMENT)));
+typedef uint16_t abi_ushort __attribute__((aligned(ABI_SHORT_ALIGNMENT)));
+typedef int32_t abi_int __attribute__((aligned(ABI_INT_ALIGNMENT)));
+typedef uint32_t abi_uint __attribute__((aligned(ABI_INT_ALIGNMENT)));
+typedef int64_t abi_llong __attribute__((aligned(ABI_LLONG_ALIGNMENT)));
+typedef uint64_t abi_ullong __attribute__((aligned(ABI_LLONG_ALIGNMENT)));
+
+#ifdef TARGET_ABI32
+typedef uint32_t abi_ulong __attribute__((aligned(ABI_LONG_ALIGNMENT)));
+typedef int32_t abi_long __attribute__((aligned(ABI_LONG_ALIGNMENT)));
+#define TARGET_ABI_FMT_lx "%08x"
+#define TARGET_ABI_FMT_ld "%d"
+#define TARGET_ABI_FMT_lu "%u"
+
+static inline abi_ulong tswapal(abi_ulong v)
+{
+    return tswap32(v);
+}
+
+#else
+typedef target_ulong abi_ulong __attribute__((aligned(ABI_LONG_ALIGNMENT)));
+typedef target_long abi_long __attribute__((aligned(ABI_LONG_ALIGNMENT)));
+#define TARGET_ABI_FMT_lx TARGET_FMT_lx
+#define TARGET_ABI_FMT_ld TARGET_FMT_ld
+#define TARGET_ABI_FMT_lu TARGET_FMT_lu
+/* for consistency, define ABI32 too */
+#if TARGET_ABI_BITS == 32
+#define TARGET_ABI32 1
+#endif
+
+static inline abi_ulong tswapal(abi_ulong v)
+{
+    return tswapl(v);
+}
+
+#endif
+#endif

diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h
index b48b2b2d0aef5a55d950af1b94f1d20fd556820b..9bd7ca19c846511b76a1ef682d3c041a69edbcef 100644 (file)
--- a/include/user/syscall-trace.h
+++ b/include/user/syscall-trace.h
@@ -10,7 +10,7 @@
 #ifndef SYSCALL_TRACE_H
 #define SYSCALL_TRACE_H
 
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 #include "gdbstub/user.h"
 #include "qemu/plugin.h"
 #include "trace/trace-root.h"

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 4777856b529d758828225b9ded15b8aa8bc043a5..263f445ff1f3f67bc1d1363a1db76245ca494d79 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -4,7 +4,7 @@
 #include "cpu.h"
 #include "exec/cpu_ldst.h"
 
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 #include "syscall_defs.h"
 #include "target_syscall.h"