From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Claudio Fontana" <cfontana@suse.de>,
qemu-ppc@nongnu.org, qemu-s390x@nongnu.org,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-riscv@nongnu.org, "Brian Cain" <bcain@quicinc.com>,
"Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-arm@nongnu.org,
"Manos Pitsidianakis" <manos.pitsidianakis@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Anton Johansson" <anjo@rev.ng>, "Warner Losh" <imp@bsdimp.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Kyle Evans" <kevans@freebsd.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PATCH v2 16/23] exec: Move [b]tswapl() declarations to 'exec/user/tswap-target.h'
Date: Tue, 12 Dec 2023 13:33:52 +0100 [thread overview]
Message-ID: <20231212123401.37493-17-philmd@linaro.org> (raw)
In-Reply-To: <20231212123401.37493-1-philmd@linaro.org>
tswapl() and bswaptls() are target-dependent and only used
by user emulation. Move their definitions to a new header:
"exec/user/tswap-target.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
bsd-user/freebsd/target_os_elf.h | 1 +
bsd-user/freebsd/target_os_stack.h | 1 +
bsd-user/netbsd/target_os_elf.h | 1 +
bsd-user/openbsd/target_os_elf.h | 1 +
include/exec/cpu-all.h | 8 --------
include/exec/user/abitypes.h | 1 +
include/exec/user/tswap-target.h | 22 ++++++++++++++++++++++
bsd-user/signal.c | 1 +
bsd-user/strace.c | 1 +
linux-user/elfload.c | 1 +
linux-user/i386/signal.c | 1 +
linux-user/ppc/signal.c | 1 +
12 files changed, 32 insertions(+), 8 deletions(-)
create mode 100644 include/exec/user/tswap-target.h
diff --git a/bsd-user/freebsd/target_os_elf.h b/bsd-user/freebsd/target_os_elf.h
index 9df17d56d8..27d8ce036c 100644
--- a/bsd-user/freebsd/target_os_elf.h
+++ b/bsd-user/freebsd/target_os_elf.h
@@ -22,6 +22,7 @@
#include "target_arch_elf.h"
#include "elf.h"
+#include "exec/user/tswap-target.h"
#define bsd_get_ncpu() 1 /* until we pull in bsd-proc.[hc] */
diff --git a/bsd-user/freebsd/target_os_stack.h b/bsd-user/freebsd/target_os_stack.h
index d15fc3263f..6125208182 100644
--- a/bsd-user/freebsd/target_os_stack.h
+++ b/bsd-user/freebsd/target_os_stack.h
@@ -23,6 +23,7 @@
#include <sys/param.h>
#include "target_arch_sigtramp.h"
#include "qemu/guest-random.h"
+#include "exec/user/tswap-target.h"
/*
* The initial FreeBSD stack is as follows:
diff --git a/bsd-user/netbsd/target_os_elf.h b/bsd-user/netbsd/target_os_elf.h
index 2f3cb20871..23b422bfce 100644
--- a/bsd-user/netbsd/target_os_elf.h
+++ b/bsd-user/netbsd/target_os_elf.h
@@ -22,6 +22,7 @@
#include "target_arch_elf.h"
#include "elf.h"
+#include "exec/user/tswap-target.h"
/* this flag is uneffective under linux too, should be deleted */
#ifndef MAP_DENYWRITE
diff --git a/bsd-user/openbsd/target_os_elf.h b/bsd-user/openbsd/target_os_elf.h
index 6dca9c5a85..fc1dfa2e49 100644
--- a/bsd-user/openbsd/target_os_elf.h
+++ b/bsd-user/openbsd/target_os_elf.h
@@ -22,6 +22,7 @@
#include "target_arch_elf.h"
#include "elf.h"
+#include "exec/user/tswap-target.h"
/* this flag is uneffective under linux too, should be deleted */
#ifndef MAP_DENYWRITE
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index b042d94892..95af418920 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -36,14 +36,6 @@
#define BSWAP_NEEDED
#endif
-#if TARGET_LONG_SIZE == 4
-#define tswapl(s) tswap32(s)
-#define bswaptls(s) bswap32s(s)
-#else
-#define tswapl(s) tswap64(s)
-#define bswaptls(s) bswap64s(s)
-#endif
-
/* Target-endianness CPU memory access functions. These fit into the
* {ld,st}{type}{sign}{size}{endian}_p naming scheme described in bswap.h.
*/
diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h
index 6178453d94..ed10d5fe7e 100644
--- a/include/exec/user/abitypes.h
+++ b/include/exec/user/abitypes.h
@@ -2,6 +2,7 @@
#define EXEC_USER_ABITYPES_H
#include "cpu.h"
+#include "exec/user/tswap-target.h"
#ifdef TARGET_ABI32
#define TARGET_ABI_BITS 32
diff --git a/include/exec/user/tswap-target.h b/include/exec/user/tswap-target.h
new file mode 100644
index 0000000000..ff302436fe
--- /dev/null
+++ b/include/exec/user/tswap-target.h
@@ -0,0 +1,22 @@
+/*
+ * target-specific swap() definitions
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+#ifndef EXEC_USER_TSWAP_H
+#define EXEC_USER_TSWAP_H
+
+#include "exec/cpu-defs.h"
+#include "exec/tswap.h"
+
+#if TARGET_LONG_SIZE == 4
+#define tswapl(s) tswap32(s)
+#define bswaptls(s) bswap32s(s)
+#else
+#define tswapl(s) tswap64(s)
+#define bswaptls(s) bswap64s(s)
+#endif
+
+#endif
diff --git a/bsd-user/signal.c b/bsd-user/signal.c
index ca31470772..7b2d25230a 100644
--- a/bsd-user/signal.c
+++ b/bsd-user/signal.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu.h"
+#include "exec/user/tswap-target.h"
#include "gdbstub/user.h"
#include "signal-common.h"
#include "trace.h"
diff --git a/bsd-user/strace.c b/bsd-user/strace.c
index 96499751eb..a1b738e63c 100644
--- a/bsd-user/strace.c
+++ b/bsd-user/strace.c
@@ -22,6 +22,7 @@
#include <sys/ioccom.h>
#include "qemu.h"
+#include "exec/user/tswap-target.h"
#include "os-strace.h" /* OS dependent strace print functions */
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index cf9e74468b..debea5c355 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -6,6 +6,7 @@
#include <sys/shm.h>
#include "qemu.h"
+#include "exec/user/tswap-target.h"
#include "user-internals.h"
#include "signal-common.h"
#include "loader.h"
diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c
index bc5d45302e..eea1fa68c9 100644
--- a/linux-user/i386/signal.c
+++ b/linux-user/i386/signal.c
@@ -21,6 +21,7 @@
#include "user-internals.h"
#include "signal-common.h"
#include "linux-user/trace.h"
+#include "exec/user/tswap-target.h"
/* from the Linux kernel - /arch/x86/include/uapi/asm/sigcontext.h */
diff --git a/linux-user/ppc/signal.c b/linux-user/ppc/signal.c
index 7e7302823b..988b59a916 100644
--- a/linux-user/ppc/signal.c
+++ b/linux-user/ppc/signal.c
@@ -21,6 +21,7 @@
#include "user-internals.h"
#include "signal-common.h"
#include "linux-user/trace.h"
+#include "exec/user/tswap-target.h"
#include "vdso-asmoffset.h"
/* See arch/powerpc/include/asm/ucontext.h. Only used for 32-bit PPC;
--
2.41.0
next prev parent reply other threads:[~2023-12-12 12:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 12:33 [PATCH v2 00/23] exec: Rework of various headers (user focused) Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 01/23] exec: Include 'cpu.h' before validating CPUArchState placement Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 02/23] exec: Expose 'target_page.h' API to user emulation Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 03/23] target: Define TCG_GUEST_DEFAULT_MO in 'cpu-param.h' Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 04/23] accel: Include missing 'exec/cpu_ldst.h' header Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 05/23] gdbstub: Include missing 'hw/core/cpu.h' header Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 06/23] semihosting/uaccess: Avoid including 'cpu.h' Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 07/23] semihosting/guestfd: Remove unused 'semihosting/uaccess.h' header Philippe Mathieu-Daudé
2023-12-13 10:58 ` Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 08/23] host/load-extract: Include missing 'qemu/atomic.h' and 'qemu/int128.h' Philippe Mathieu-Daudé
2023-12-13 11:46 ` Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 09/23] host/atomic128: Include missing 'qemu/atomic.h' header Philippe Mathieu-Daudé
2023-12-13 11:56 ` Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 10/23] target/i386: Include missing 'exec/exec-all.h' header Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 11/23] accel/tcg: Include missing 'hw/core/cpu.h' header Philippe Mathieu-Daudé
2023-12-13 13:38 ` Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 12/23] exec/cpu-all: Remove unused 'qemu/thread.h' header Philippe Mathieu-Daudé
2023-12-13 13:44 ` Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 13/23] exec/cpu-all: Reduce 'qemu/rcu.h' header inclusion Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 14/23] exec/cpu-all: Remove unused tswapls() definitions Philippe Mathieu-Daudé
2023-12-13 13:44 ` Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 15/23] exec: Declare target_words_bigendian() in 'exec/tswap.h' Philippe Mathieu-Daudé
2023-12-13 11:20 ` Anton Johansson via
2023-12-13 15:13 ` Philippe Mathieu-Daudé
2023-12-12 12:33 ` Philippe Mathieu-Daudé [this message]
2023-12-13 13:45 ` [PATCH v2 16/23] exec: Move [b]tswapl() declarations to 'exec/user/tswap-target.h' Anton Johansson via
2023-12-12 12:33 ` [PATCH v2 17/23] target/ppc/excp_helper: Avoid 'abi_ptr' in system emulation Philippe Mathieu-Daudé
2023-12-14 18:27 ` Thomas Huth
2023-12-12 12:33 ` [PATCH v2 18/23] accel/tcg: Un-inline retaddr helpers to 'user-retaddr.h' Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 19/23] exec/user: Do not include 'cpu.h' in 'abitypes.h' Philippe Mathieu-Daudé
2023-12-14 18:30 ` Thomas Huth
2023-12-12 12:33 ` [PATCH v2 20/23] exec: Declare abi_ptr type in its own 'abi_ptr.h' header Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 21/23] exec/cpu-all: Restrict inclusion of 'exec/user/guest-base.h' Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 22/23] exec/cpu-all: Extract page-protection definitions to page-prot-common.h Philippe Mathieu-Daudé
2023-12-12 12:33 ` [PATCH v2 23/23] exec/cpu_ldst: Avoid including 'cpu.h' Philippe Mathieu-Daudé
2023-12-12 12:41 ` [PATCH v2 00/23] exec: Rework of various headers (user focused) Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231212123401.37493-17-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=anjo@rev.ng \
--cc=bcain@quicinc.com \
--cc=cfontana@suse.de \
--cc=imp@bsdimp.com \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=manos.pitsidianakis@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).