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>

3 files changed, 2 insertions, 89 deletions

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index e75ec13..032c6d9 100644
--- 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
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 2ebfecf..9f35c88 100644
--- 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 */