* [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants
@ 2026-01-18 19:34 Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header Philippe Mathieu-Daudé
` (18 more replies)
0 siblings, 19 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Missing review: 1-4
Since v5:
- No pointer arithmetic in ld/st[M] (Richard)
- Inline (Paolo)
Since v4:
- No change (RESEND)
Since v3:
- Assign device_endian enums (Richard)
- Add/use ldm_p() and stm_p() helpers (Paolo)
Since v2:
- Changed opt-out to opt-in approach (Pierrick)
- Split big patches in smaller ones
- Mark ioport little-endian
Philippe Mathieu-Daudé (18):
bswap: Include missing 'qemu/bswap.h' header
bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h'
bswap: Remove unnecessary 'qemu/bswap.h'
system/memory: Introduce ldm_p() and stm_p() load/store helpers
system/memory: Define address_space_ldst[W] endian variants via
template
system/memory: Define address_space_ldst[L] endian variants via
template
system/memory: Define address_space_ldst[Q] endian variants via
template
system/memory: Factor address_space_ldst[M]_internal() helper out
system/memory: Pass device_endian argument as MemOp bit
system/memory: Use ldm_p() and stm_p() helpers
system/memory: Directly call address_space_ldst[M]_internal() helper
system: Allow restricting the legacy ld/st_phys() 'native-endian' API
system: Allow restricting legacy address_space_ldst() native-endian
API
system: Allow restricting the legacy cpu_ld/st() 'native-endian' API
system: Allow restricting the legacy translator_ld() 'native-endian'
API
system: Allow restricting the legacy tswap() 'native-endian' API
system: Allow restricting the legacy MO_TE* 'native-endian'
definitions
system: Allow restricting the legacy DEVICE_NATIVE_ENDIAN definition
MAINTAINERS | 1 +
block/qcow2.h | 1 +
include/accel/tcg/cpu-ldst.h | 2 +
include/exec/memop.h | 4 +
include/exec/translator.h | 5 +-
include/exec/tswap.h | 3 +
include/qemu/bswap.h | 72 +++
include/qemu/host-utils.h | 1 -
include/qemu/int128.h | 2 -
include/system/memory.h | 8 +-
include/system/memory_cached.h | 2 +
system/memory-internal.h | 2 +
include/system/memory_ldst.h.inc | 52 +--
include/system/memory_ldst_endian.h.inc | 33 ++
include/system/memory_ldst_phys.h.inc | 113 +----
include/system/memory_ldst_phys_endian.h.inc | 57 +++
audio/audio.c | 1 +
block/blklogwrites.c | 1 +
block/export/vduse-blk.c | 1 +
block/export/vhost-user-blk-server.c | 1 +
block/export/virtio-blk-handler.c | 1 +
block/parallels-ext.c | 1 +
hw/9pfs/9p-local.c | 1 +
hw/block/cdrom.c | 1 +
hw/block/hd-geometry.c | 1 +
hw/net/can/ctucan_core.c | 1 +
hw/nvram/xlnx-efuse.c | 1 +
hw/scsi/scsi-generic.c | 1 +
hw/sd/sd.c | 1 +
hw/sd/ssi-sd.c | 1 +
net/l2tpv3.c | 1 +
qga/commands-linux.c | 1 +
scsi/pr-manager-helper.c | 1 +
target/arm/tcg/arith_helper.c | 1 +
tests/qtest/acpi-utils.c | 1 +
tests/qtest/ahci-test.c | 2 +-
tests/qtest/aspeed-hace-utils.c | 1 +
tests/qtest/bios-tables-test.c | 1 +
tests/qtest/libqos/ahci.c | 2 +-
tests/qtest/libqos/generic-pcihost.c | 2 +-
tests/qtest/libqos/igb.c | 1 +
tests/qtest/libqos/pci-spapr.c | 2 +-
tests/qtest/libqos/virtio-9p-client.c | 1 +
tests/qtest/migration/framework.c | 1 +
tests/qtest/npcm7xx_emc-test.c | 1 +
tests/qtest/tpm-emu.c | 1 +
tests/qtest/ufs-test.c | 1 +
tests/qtest/vmgenid-test.c | 1 +
tests/unit/test-hbitmap.c | 1 +
util/bitmap.c | 1 +
util/hbitmap.c | 2 +-
system/memory_ldst.c.inc | 449 ++-----------------
system/memory_ldst_endian.c.inc | 70 +++
scripts/make-config-poison.sh | 1 +
54 files changed, 354 insertions(+), 564 deletions(-)
create mode 100644 include/system/memory_ldst_endian.h.inc
create mode 100644 include/system/memory_ldst_phys_endian.h.inc
create mode 100644 system/memory_ldst_endian.c.inc
--
2.52.0
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 23:11 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 02/18] bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h' Philippe Mathieu-Daudé
` (17 subsequent siblings)
18 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
All these files indirectly include the "qemu/bswap.h" header.
Make this inclusion explicit to avoid build errors when
refactoring unrelated headers.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
block/qcow2.h | 1 +
audio/audio.c | 1 +
block/blklogwrites.c | 1 +
block/export/vduse-blk.c | 1 +
block/export/vhost-user-blk-server.c | 1 +
block/export/virtio-blk-handler.c | 1 +
block/parallels-ext.c | 1 +
hw/9pfs/9p-local.c | 1 +
hw/block/cdrom.c | 1 +
hw/block/hd-geometry.c | 1 +
hw/net/can/ctucan_core.c | 1 +
hw/nvram/xlnx-efuse.c | 1 +
hw/scsi/scsi-generic.c | 1 +
hw/sd/sd.c | 1 +
hw/sd/ssi-sd.c | 1 +
net/l2tpv3.c | 1 +
qga/commands-linux.c | 1 +
scsi/pr-manager-helper.c | 1 +
target/arm/tcg/arith_helper.c | 1 +
tests/qtest/acpi-utils.c | 1 +
tests/qtest/aspeed-hace-utils.c | 1 +
tests/qtest/bios-tables-test.c | 1 +
tests/qtest/libqos/igb.c | 1 +
tests/qtest/libqos/virtio-9p-client.c | 1 +
tests/qtest/migration/framework.c | 1 +
tests/qtest/npcm7xx_emc-test.c | 1 +
tests/qtest/tpm-emu.c | 1 +
tests/qtest/ufs-test.c | 1 +
tests/qtest/vmgenid-test.c | 1 +
tests/unit/test-hbitmap.c | 1 +
util/bitmap.c | 1 +
31 files changed, 31 insertions(+)
diff --git a/block/qcow2.h b/block/qcow2.h
index 96db7c51ec2..192a45d596b 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -26,6 +26,7 @@
#define BLOCK_QCOW2_H
#include "crypto/block.h"
+#include "qemu/bswap.h"
#include "qemu/coroutine.h"
#include "qemu/units.h"
#include "block/block_int.h"
diff --git a/audio/audio.c b/audio/audio.c
index 86e674410ab..b7a28f79d4f 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -32,6 +32,7 @@
#include "qapi/qapi-visit-audio.h"
#include "qapi/qapi-commands-audio.h"
#include "qobject/qdict.h"
+#include "qemu/bswap.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/block/blklogwrites.c b/block/blklogwrites.c
index aa1f8888690..2490e91802c 100644
--- a/block/blklogwrites.c
+++ b/block/blklogwrites.c
@@ -16,6 +16,7 @@
#include "block/block_int.h"
#include "qobject/qdict.h"
#include "qobject/qstring.h"
+#include "qemu/bswap.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/option.h"
diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c
index bd852e538dc..8af13b7f0bf 100644
--- a/block/export/vduse-blk.c
+++ b/block/export/vduse-blk.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include <sys/eventfd.h>
+#include "qemu/bswap.h"
#include "qapi/error.h"
#include "block/export.h"
#include "qemu/error-report.h"
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
index d9d2014d9b7..a4d54e824f2 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -10,6 +10,7 @@
* later. See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "qemu/error-report.h"
#include "block/block.h"
#include "subprojects/libvhost-user/libvhost-user.h" /* only for the type definitions */
diff --git a/block/export/virtio-blk-handler.c b/block/export/virtio-blk-handler.c
index bc1cec67570..3dd6c43af1a 100644
--- a/block/export/virtio-blk-handler.c
+++ b/block/export/virtio-blk-handler.c
@@ -13,6 +13,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "qemu/error-report.h"
#include "virtio-blk-handler.h"
diff --git a/block/parallels-ext.c b/block/parallels-ext.c
index 778b8f684ef..3410daa6206 100644
--- a/block/parallels-ext.c
+++ b/block/parallels-ext.c
@@ -30,6 +30,7 @@
#include "block/dirty-bitmap.h"
#include "parallels.h"
#include "crypto/hash.h"
+#include "qemu/bswap.h"
#include "qemu/uuid.h"
#include "qemu/memalign.h"
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 376b377698c..c3745f2839f 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -28,6 +28,7 @@
#include <sys/un.h>
#include "qemu/xattr.h"
#include "qapi/error.h"
+#include "qemu/bswap.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
diff --git a/hw/block/cdrom.c b/hw/block/cdrom.c
index c6bfa50ad0c..70399a54601 100644
--- a/hw/block/cdrom.c
+++ b/hw/block/cdrom.c
@@ -26,6 +26,7 @@
here. */
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "hw/scsi/scsi.h"
static void lba_to_msf(uint8_t *buf, int lba)
diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c
index db221901cf4..a86f2b406b6 100644
--- a/hw/block/hd-geometry.c
+++ b/hw/block/hd-geometry.c
@@ -31,6 +31,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "system/block-backend.h"
#include "qapi/qapi-types-block.h"
#include "hw/block/block.h"
diff --git a/hw/net/can/ctucan_core.c b/hw/net/can/ctucan_core.c
index b6ad7cdb400..f6ff4ad2003 100644
--- a/hw/net/can/ctucan_core.c
+++ b/hw/net/can/ctucan_core.c
@@ -29,6 +29,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/bitops.h"
+#include "qemu/bswap.h"
#include "hw/core/irq.h"
#include "migration/vmstate.h"
#include "net/can_emu.h"
diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c
index facbef3fc4c..34436705dde 100644
--- a/hw/nvram/xlnx-efuse.c
+++ b/hw/nvram/xlnx-efuse.c
@@ -27,6 +27,7 @@
#include "qemu/osdep.h"
#include "hw/nvram/xlnx-efuse.h"
+#include "qemu/bswap.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "qapi/error.h"
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index 0a676a16fa4..6acaf8831a3 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qemu/bswap.h"
#include "qemu/ctype.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 5a1fda38a7b..37f6e0702b0 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -35,6 +35,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/cutils.h"
+#include "qemu/bswap.h"
#include "hw/core/irq.h"
#include "hw/core/registerfields.h"
#include "system/block-backend.h"
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index 1782fb74316..a3a9f0c7efd 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -19,6 +19,7 @@
#include "hw/ssi/ssi.h"
#include "migration/vmstate.h"
#include "hw/sd/sd.h"
+#include "qemu/bswap.h"
#include "qemu/crc-ccitt.h"
#include "qom/object.h"
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index 3044fa46081..68c95552687 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -29,6 +29,7 @@
#include "net/net.h"
#include "clients.h"
#include "qapi/error.h"
+#include "qemu/bswap.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/sockets.h"
diff --git a/qga/commands-linux.c b/qga/commands-linux.c
index ae2c4d442a3..378f4d080c1 100644
--- a/qga/commands-linux.c
+++ b/qga/commands-linux.c
@@ -12,6 +12,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "qapi/error.h"
#include "qga-qapi-commands.h"
#include "qapi/error.h"
diff --git a/scsi/pr-manager-helper.c b/scsi/pr-manager-helper.c
index aea751fb047..f6454cd80de 100644
--- a/scsi/pr-manager-helper.c
+++ b/scsi/pr-manager-helper.c
@@ -19,6 +19,7 @@
#include "pr-helper.h"
#include "qapi/qapi-events-block.h"
#include "qemu/module.h"
+#include "qemu/bswap.h"
#include <scsi/sg.h>
#include "qom/object.h"
diff --git a/target/arm/tcg/arith_helper.c b/target/arm/tcg/arith_helper.c
index 670139819df..97c6362992c 100644
--- a/target/arm/tcg/arith_helper.c
+++ b/target/arm/tcg/arith_helper.c
@@ -6,6 +6,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "qemu/crc32c.h"
#include <zlib.h> /* for crc32 */
diff --git a/tests/qtest/acpi-utils.c b/tests/qtest/acpi-utils.c
index 9dc24fbe5a0..28cca00b960 100644
--- a/tests/qtest/acpi-utils.c
+++ b/tests/qtest/acpi-utils.c
@@ -15,6 +15,7 @@
#include "qemu/osdep.h"
#include <glib/gstdio.h>
#include "qemu/bitmap.h"
+#include "qemu/bswap.h"
#include "acpi-utils.h"
#include "boot-sector.h"
diff --git a/tests/qtest/aspeed-hace-utils.c b/tests/qtest/aspeed-hace-utils.c
index 0f7f911e5eb..25450a296bf 100644
--- a/tests/qtest/aspeed-hace-utils.c
+++ b/tests/qtest/aspeed-hace-utils.c
@@ -8,6 +8,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "qemu/bitops.h"
+#include "qemu/bswap.h"
#include "aspeed-hace-utils.h"
/*
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 6b892ef23e1..e489d943312 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -59,6 +59,7 @@
#include <glib/gstdio.h>
#include "hw/firmware/smbios.h"
#include "qemu/bitmap.h"
+#include "qemu/bswap.h"
#include "acpi-utils.h"
#include "boot-sector.h"
#include "tpm-emu.h"
diff --git a/tests/qtest/libqos/igb.c b/tests/qtest/libqos/igb.c
index ab3ef6f0c3b..64fdadac90a 100644
--- a/tests/qtest/libqos/igb.c
+++ b/tests/qtest/libqos/igb.c
@@ -27,6 +27,7 @@
#include "qemu/iov.h"
#include "qemu/module.h"
#include "qemu/bitops.h"
+#include "qemu/bswap.h"
#include "libqos-malloc.h"
#include "qgraph.h"
#include "e1000e.h"
diff --git a/tests/qtest/libqos/virtio-9p-client.c b/tests/qtest/libqos/virtio-9p-client.c
index 6ab4501c6e1..af01d4c3458 100644
--- a/tests/qtest/libqos/virtio-9p-client.c
+++ b/tests/qtest/libqos/virtio-9p-client.c
@@ -13,6 +13,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "virtio-9p-client.h"
#define QVIRTIO_9P_TIMEOUT_US (10 * 1000 * 1000)
diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c
index 57d3b9b7c5a..6a0063c322d 100644
--- a/tests/qtest/migration/framework.c
+++ b/tests/qtest/migration/framework.c
@@ -21,6 +21,7 @@
#include "qapi/error.h"
#include "qobject/qjson.h"
#include "qobject/qlist.h"
+#include "qemu/bswap.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "qemu/range.h"
diff --git a/tests/qtest/npcm7xx_emc-test.c b/tests/qtest/npcm7xx_emc-test.c
index eeedb27ee68..71505356b04 100644
--- a/tests/qtest/npcm7xx_emc-test.c
+++ b/tests/qtest/npcm7xx_emc-test.c
@@ -19,6 +19,7 @@
#include "qobject/qdict.h"
#include "qobject/qnum.h"
#include "qemu/bitops.h"
+#include "qemu/bswap.h"
#include "qemu/iov.h"
/* Name of the emc device. */
diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index 9e4c2005d0e..189374a9cec 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -16,6 +16,7 @@
#include "backends/tpm/tpm_ioctl.h"
#include "io/channel-socket.h"
#include "qapi/error.h"
+#include "qemu/bswap.h"
#include "qobject/qlist.h"
#include "qobject/qstring.h"
#include "tpm-emu.h"
diff --git a/tests/qtest/ufs-test.c b/tests/qtest/ufs-test.c
index 4867ccf08a1..8cfdc41d3ce 100644
--- a/tests/qtest/ufs-test.c
+++ b/tests/qtest/ufs-test.c
@@ -14,6 +14,7 @@
#include "scsi/constants.h"
#include "block/ufs.h"
#include "qemu/bitmap.h"
+#include "qemu/bswap.h"
#define DWORD_BYTE 4
/* Test images sizes in Bytes */
diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c
index 33e96b7c559..2a159e24dd4 100644
--- a/tests/qtest/vmgenid-test.c
+++ b/tests/qtest/vmgenid-test.c
@@ -10,6 +10,7 @@
#include "qemu/osdep.h"
#include "qemu/bitmap.h"
+#include "qemu/bswap.h"
#include "qemu/uuid.h"
#include "hw/acpi/acpi-defs.h"
#include "boot-sector.h"
diff --git a/tests/unit/test-hbitmap.c b/tests/unit/test-hbitmap.c
index a4fe0679178..d6e710b9cf6 100644
--- a/tests/unit/test-hbitmap.c
+++ b/tests/unit/test-hbitmap.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/hbitmap.h"
#include "qemu/bitmap.h"
+#include "qemu/bswap.h"
#include "block/block.h"
#define LOG_BITS_PER_LONG (BITS_PER_LONG == 32 ? 5 : 6)
diff --git a/util/bitmap.c b/util/bitmap.c
index 8d12e90a5a4..7095a0c398c 100644
--- a/util/bitmap.c
+++ b/util/bitmap.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
+#include "qemu/bswap.h"
#include "qemu/atomic.h"
/*
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 02/18] bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h'
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 23:11 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 03/18] bswap: Remove unnecessary 'qemu/bswap.h' Philippe Mathieu-Daudé
` (16 subsequent siblings)
18 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
These files only require "qemu/bswap.h", not "qemu/host-utils.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
tests/qtest/ahci-test.c | 2 +-
tests/qtest/libqos/ahci.c | 2 +-
tests/qtest/libqos/generic-pcihost.c | 2 +-
tests/qtest/libqos/pci-spapr.c | 2 +-
util/hbitmap.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
index e8aabfc13f5..5c32ff20029 100644
--- a/tests/qtest/ahci-test.c
+++ b/tests/qtest/ahci-test.c
@@ -31,7 +31,7 @@
#include "libqos/pci-pc.h"
#include "qobject/qdict.h"
-#include "qemu/host-utils.h"
+#include "qemu/bswap.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/libqos/ahci.c b/tests/qtest/libqos/ahci.c
index 34a75b7f43b..0621a6c4775 100644
--- a/tests/qtest/libqos/ahci.c
+++ b/tests/qtest/libqos/ahci.c
@@ -28,7 +28,7 @@
#include "ahci.h"
#include "pci-pc.h"
-#include "qemu/host-utils.h"
+#include "qemu/bswap.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/libqos/generic-pcihost.c b/tests/qtest/libqos/generic-pcihost.c
index 4bbeb5ff508..b77617524ca 100644
--- a/tests/qtest/libqos/generic-pcihost.c
+++ b/tests/qtest/libqos/generic-pcihost.c
@@ -15,7 +15,7 @@
#include "generic-pcihost.h"
#include "qobject/qdict.h"
#include "hw/pci/pci_regs.h"
-#include "qemu/host-utils.h"
+#include "qemu/bswap.h"
#include "qemu/module.h"
diff --git a/tests/qtest/libqos/pci-spapr.c b/tests/qtest/libqos/pci-spapr.c
index 0f1023e4a73..3723cbb38db 100644
--- a/tests/qtest/libqos/pci-spapr.c
+++ b/tests/qtest/libqos/pci-spapr.c
@@ -13,7 +13,7 @@
#include "hw/pci/pci_regs.h"
-#include "qemu/host-utils.h"
+#include "qemu/bswap.h"
#include "qemu/module.h"
/*
diff --git a/util/hbitmap.c b/util/hbitmap.c
index d9a1dabc630..3525bf7751a 100644
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -10,8 +10,8 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "qemu/hbitmap.h"
-#include "qemu/host-utils.h"
#include "trace.h"
#include "crypto/hash.h"
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 03/18] bswap: Remove unnecessary 'qemu/bswap.h'
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 02/18] bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h' Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 23:12 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 04/18] system/memory: Introduce ldm_p() and stm_p() load/store helpers Philippe Mathieu-Daudé
` (15 subsequent siblings)
18 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
"qemu/host-utils.h" and "qemu/int128.h" are included a lot in
the tree, and don't use any definition from "qemu/bswap.h"...
Since it contains a lot of inlined functions, remove it to
reduce pointless compilation cycles.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/qemu/host-utils.h | 1 -
include/qemu/int128.h | 2 --
2 files changed, 3 deletions(-)
diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
index 0777a2bb60e..181d026b6c7 100644
--- a/include/qemu/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -30,7 +30,6 @@
#ifndef HOST_UTILS_H
#define HOST_UTILS_H
-#include "qemu/bswap.h"
#include "qemu/int128.h"
#ifdef CONFIG_INT128
diff --git a/include/qemu/int128.h b/include/qemu/int128.h
index 2b8dd4dec9f..7b3b071c512 100644
--- a/include/qemu/int128.h
+++ b/include/qemu/int128.h
@@ -1,8 +1,6 @@
#ifndef INT128_H
#define INT128_H
-#include "qemu/bswap.h"
-
/*
* With TCI, we need to use libffi for interfacing with TCG helpers.
* But libffi does not support __int128_t, and therefore cannot pass
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 04/18] system/memory: Introduce ldm_p() and stm_p() load/store helpers
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 03/18] bswap: Remove unnecessary 'qemu/bswap.h' Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 23:14 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 05/18] system/memory: Define address_space_ldst[W] endian variants via template Philippe Mathieu-Daudé
` (14 subsequent siblings)
18 siblings, 1 reply; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Introduce load/store helpers which take a MemOp argument.
Inspired-by: Paolo Bonzini <pbonzini@redhat.com>
Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Possible optimization:
https://lore.kernel.org/qemu-devel/546f3a4b-64ff-4f63-bb07-f5cb52b6c64c@redhat.com/
---
include/qemu/bswap.h | 72 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h
index 65a1b3634f4..387d65c0b0b 100644
--- a/include/qemu/bswap.h
+++ b/include/qemu/bswap.h
@@ -2,6 +2,7 @@
#define BSWAP_H
#include "qemu/target-info.h"
+#include "exec/memop.h"
#undef bswap16
#define bswap16(_x) __builtin_bswap16(_x)
@@ -375,6 +376,77 @@ static inline void stq_be_p(void *ptr, uint64_t v)
stq_he_p(ptr, be_bswap(v, 64));
}
+
+/**
+ * ldm_p: Load value from host memory (byteswapping if necessary)
+ *
+ * @ptr: the host pointer to be accessed
+ * @mop: #MemOp mask containing access size and optional byteswapping
+ *
+ * Convert the value stored at @ptr in host memory and byteswap if necessary.
+ *
+ * Returns: the converted value.
+ */
+static inline uint64_t ldm_p(const void *ptr, MemOp mop)
+{
+ switch (mop & (MO_SIZE | MO_BSWAP)) {
+ case MO_8:
+ return ldub_p(ptr);
+ case MO_16 | MO_LE:
+ return lduw_le_p(ptr);
+ case MO_16 | MO_BE:
+ return lduw_be_p(ptr);
+ case MO_32 | MO_LE:
+ return ldl_le_p(ptr);
+ case MO_32 | MO_BE:
+ return ldl_be_p(ptr);
+ case MO_64 | MO_LE:
+ return ldq_le_p(ptr);
+ case MO_64 | MO_BE:
+ return ldq_be_p(ptr);
+ default:
+ g_assert_not_reached();
+ }
+}
+
+/**
+ * stm_p: Store value to host memory (byteswapping if necessary)
+ *
+ * @ptr: the host pointer to be accessed
+ * @mop: #MemOp mask containing access size and optional byteswapping
+ * @val: the value to store
+ *
+ * Convert the value (byteswap if necessary) and store at @ptr in host memory.
+ */
+static inline void stm_p(void *ptr, MemOp mop, uint64_t val)
+{
+ switch (mop & (MO_SIZE | MO_BSWAP)) {
+ case MO_8:
+ stb_p(ptr, val);
+ break;
+ case MO_16 | MO_LE:
+ stw_le_p(ptr, val);
+ break;
+ case MO_16 | MO_BE:
+ stw_be_p(ptr, val);
+ break;
+ case MO_32 | MO_LE:
+ stl_le_p(ptr, val);
+ break;
+ case MO_32 | MO_BE:
+ stl_be_p(ptr, val);
+ break;
+ case MO_64 | MO_LE:
+ stq_le_p(ptr, val);
+ break;
+ case MO_64 | MO_BE:
+ stq_be_p(ptr, val);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+}
+
/* Store v to p as a sz byte value in host order */
#define DO_STN_LDN_P(END) \
static inline void stn_## END ## _p(void *ptr, int sz, uint64_t v) \
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 05/18] system/memory: Define address_space_ldst[W] endian variants via template
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (3 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 04/18] system/memory: Introduce ldm_p() and stm_p() load/store helpers Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 06/18] system/memory: Define address_space_ldst[L] " Philippe Mathieu-Daudé
` (13 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Like we do for other LD/ST APIs, use one template to declare and
define all endianness variants of the address_space_ldst[W] methods.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
MAINTAINERS | 1 +
include/system/memory_ldst.h.inc | 21 ++++----
include/system/memory_ldst_endian.h.inc | 25 +++++++++
include/system/memory_ldst_phys.h.inc | 45 ++++------------
include/system/memory_ldst_phys_endian.h.inc | 37 ++++++++++++++
system/memory_ldst.c.inc | 54 +++++---------------
system/memory_ldst_endian.c.inc | 42 +++++++++++++++
7 files changed, 135 insertions(+), 90 deletions(-)
create mode 100644 include/system/memory_ldst_endian.h.inc
create mode 100644 include/system/memory_ldst_phys_endian.h.inc
create mode 100644 system/memory_ldst_endian.c.inc
diff --git a/MAINTAINERS b/MAINTAINERS
index de8246c3ffd..a99a629d722 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3296,6 +3296,7 @@ F: system/ioport.c
F: system/memory.c
F: system/memory_mapping.c
F: system/physmem.c
+F: system/memory_ldst*
F: system/memory-internal.h
F: system/ram-block-attributes.c
F: scripts/coccinelle/memory-region-housekeeping.cocci
diff --git a/include/system/memory_ldst.h.inc b/include/system/memory_ldst.h.inc
index 173164fee3a..73c0366a247 100644
--- a/include/system/memory_ldst.h.inc
+++ b/include/system/memory_ldst.h.inc
@@ -19,24 +19,16 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stw, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stl, SUFFIX)(ARG1_DECL,
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stq, SUFFIX)(ARG1_DECL,
hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint32_t glue(address_space_ldl_be, SUFFIX)(ARG1_DECL,
@@ -47,10 +39,6 @@ uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stb, SUFFIX)(ARG1_DECL,
hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stw_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stw_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stl_le, SUFFIX)(ARG1_DECL,
hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stl_be, SUFFIX)(ARG1_DECL,
@@ -60,6 +48,15 @@ void glue(address_space_stq_le, SUFFIX)(ARG1_DECL,
void glue(address_space_stq_be, SUFFIX)(ARG1_DECL,
hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
+#define ENDIANNESS
+#include "system/memory_ldst_endian.h.inc"
+
+#define ENDIANNESS _le
+#include "system/memory_ldst_endian.h.inc"
+
+#define ENDIANNESS _be
+#include "system/memory_ldst_endian.h.inc"
+
#undef ARG1_DECL
#undef ARG1
#undef SUFFIX
diff --git a/include/system/memory_ldst_endian.h.inc b/include/system/memory_ldst_endian.h.inc
new file mode 100644
index 00000000000..3f216197663
--- /dev/null
+++ b/include/system/memory_ldst_endian.h.inc
@@ -0,0 +1,25 @@
+/*
+ * Physical memory access endian templates
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2015 Linaro, Inc.
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Copyright (c) 2025 Linaro Ltd.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#define ADDRESS_SPACE_LD(size) \
+ glue(glue(address_space_ld, size), glue(ENDIANNESS, SUFFIX))
+#define ADDRESS_SPACE_ST(size) \
+ glue(glue(address_space_st, size), glue(ENDIANNESS, SUFFIX))
+
+uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result);
+void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
+ MemTxAttrs attrs, MemTxResult *result);
+
+#undef ADDRESS_SPACE_LD
+#undef ADDRESS_SPACE_ST
+
+#undef ENDIANNESS
diff --git a/include/system/memory_ldst_phys.h.inc b/include/system/memory_ldst_phys.h.inc
index db67de75251..71c2e64ff0f 100644
--- a/include/system/memory_ldst_phys.h.inc
+++ b/include/system/memory_ldst_phys.h.inc
@@ -19,12 +19,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-static inline uint16_t glue(lduw_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_lduw, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline uint32_t glue(ldl_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
{
return glue(address_space_ldl, SUFFIX)(ARG1, addr,
@@ -37,12 +31,6 @@ static inline uint64_t glue(ldq_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline void glue(stw_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val)
-{
- glue(address_space_stw, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline void glue(stl_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val)
{
glue(address_space_stl, SUFFIX)(ARG1, addr, val,
@@ -61,18 +49,6 @@ static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline uint16_t glue(lduw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_lduw_le, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline uint16_t glue(lduw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_lduw_be, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline uint32_t glue(ldl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
{
return glue(address_space_ldl_le, SUFFIX)(ARG1, addr,
@@ -103,18 +79,6 @@ static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val)
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline void glue(stw_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val)
-{
- glue(address_space_stw_le, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline void glue(stw_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint16_t val)
-{
- glue(address_space_stw_be, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline void glue(stl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val)
{
glue(address_space_stl_le, SUFFIX)(ARG1, addr, val,
@@ -139,6 +103,15 @@ static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t va
MEMTXATTRS_UNSPECIFIED, NULL);
}
+#define ENDIANNESS
+#include "system/memory_ldst_phys_endian.h.inc"
+
+#define ENDIANNESS _le
+#include "system/memory_ldst_phys_endian.h.inc"
+
+#define ENDIANNESS _be
+#include "system/memory_ldst_phys_endian.h.inc"
+
#undef ARG1_DECL
#undef ARG1
#undef SUFFIX
diff --git a/include/system/memory_ldst_phys_endian.h.inc b/include/system/memory_ldst_phys_endian.h.inc
new file mode 100644
index 00000000000..25ab52a88d9
--- /dev/null
+++ b/include/system/memory_ldst_phys_endian.h.inc
@@ -0,0 +1,37 @@
+/*
+ * Physical memory access endian templates
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2015 Linaro, Inc.
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Copyright (c) 2025 Linaro Ltd.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#define LD_PHYS(size) \
+ glue(glue(ld, size), glue(ENDIANNESS, glue(_phys, SUFFIX)))
+#define ADDRESS_SPACE_LD(size) \
+ glue(glue(address_space_ld, size), glue(ENDIANNESS, SUFFIX))
+
+#define ST_PHYS(size) \
+ glue(glue(st, size), glue(ENDIANNESS, glue(_phys, SUFFIX)))
+#define ADDRESS_SPACE_ST(size) \
+ glue(glue(address_space_st, size), glue(ENDIANNESS, SUFFIX))
+
+static inline uint16_t LD_PHYS(uw)(ARG1_DECL, hwaddr addr)
+{
+ return ADDRESS_SPACE_LD(uw)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL);
+}
+
+static inline void ST_PHYS(w)(ARG1_DECL, hwaddr addr, uint16_t val)
+{
+ ADDRESS_SPACE_ST(w)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL);
+}
+
+#undef LD_PHYS
+#undef ST_PHYS
+#undef ADDRESS_SPACE_LD
+#undef ADDRESS_SPACE_ST
+
+#undef ENDIANNESS
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index d5776678edf..c37a07b4f4a 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -240,27 +240,6 @@ static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
return val;
}
-uint16_t glue(address_space_lduw, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_NATIVE_ENDIAN);
-}
-
-uint16_t glue(address_space_lduw_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_LITTLE_ENDIAN);
-}
-
-uint16_t glue(address_space_lduw_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_lduw_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_BIG_ENDIAN);
-}
-
/* warning: addr must be aligned */
static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, uint32_t val, MemTxAttrs attrs,
@@ -401,27 +380,6 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
RCU_READ_UNLOCK();
}
-void glue(address_space_stw, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, result,
- DEVICE_NATIVE_ENDIAN);
-}
-
-void glue(address_space_stw_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, result,
- DEVICE_LITTLE_ENDIAN);
-}
-
-void glue(address_space_stw_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stw_internal, SUFFIX)(ARG1, addr, val, attrs, result,
- DEVICE_BIG_ENDIAN);
-}
-
static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, uint64_t val, MemTxAttrs attrs,
MemTxResult *result, enum device_endian endian)
@@ -486,6 +444,18 @@ void glue(address_space_stq_be, SUFFIX)(ARG1_DECL,
DEVICE_BIG_ENDIAN);
}
+#define ENDIANNESS
+#define DEVICE_ENDIANNESS DEVICE_NATIVE_ENDIAN
+#include "memory_ldst_endian.c.inc"
+
+#define ENDIANNESS _le
+#define DEVICE_ENDIANNESS DEVICE_LITTLE_ENDIAN
+#include "memory_ldst_endian.c.inc"
+
+#define ENDIANNESS _be
+#define DEVICE_ENDIANNESS DEVICE_BIG_ENDIAN
+#include "memory_ldst_endian.c.inc"
+
#undef ARG1_DECL
#undef ARG1
#undef SUFFIX
diff --git a/system/memory_ldst_endian.c.inc b/system/memory_ldst_endian.c.inc
new file mode 100644
index 00000000000..e1ae44ca232
--- /dev/null
+++ b/system/memory_ldst_endian.c.inc
@@ -0,0 +1,42 @@
+/*
+ * Physical memory access endian templates
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2015 Linaro, Inc.
+ * Copyright (c) 2016 Red Hat, Inc.
+ * Copyright (c) 2025 Linaro Ltd.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#define ADDRESS_SPACE_LD(size) \
+ glue(glue(address_space_ld, size), glue(ENDIANNESS, SUFFIX))
+#define ADDRESS_SPACE_LD_INTERNAL(size) \
+ glue(glue(address_space_ld, size), glue(_internal, SUFFIX))
+
+#define ADDRESS_SPACE_ST(size) \
+ glue(glue(address_space_st, size), glue(ENDIANNESS, SUFFIX))
+#define ADDRESS_SPACE_ST_INTERNAL(size) \
+ glue(glue(address_space_st, size), glue(_internal, SUFFIX))
+
+uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result)
+{
+ return ADDRESS_SPACE_LD_INTERNAL(uw)(ARG1, addr, attrs, result,
+ DEVICE_ENDIANNESS);
+}
+
+void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
+ MemTxAttrs attrs, MemTxResult *result)
+{
+ ADDRESS_SPACE_ST_INTERNAL(w)(ARG1, addr, val, attrs, result,
+ DEVICE_ENDIANNESS);
+}
+
+#undef ADDRESS_SPACE_LD
+#undef ADDRESS_SPACE_LD_INTERNAL
+#undef ADDRESS_SPACE_ST
+#undef ADDRESS_SPACE_ST_INTERNAL
+
+#undef ENDIANNESS
+#undef DEVICE_ENDIANNESS
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 06/18] system/memory: Define address_space_ldst[L] endian variants via template
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (4 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 05/18] system/memory: Define address_space_ldst[W] endian variants via template Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 07/18] system/memory: Define address_space_ldst[Q] " Philippe Mathieu-Daudé
` (12 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Define address_space_ldst[L] endian variants via template.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/memory_ldst.h.inc | 12 ------
include/system/memory_ldst_endian.h.inc | 4 ++
include/system/memory_ldst_phys.h.inc | 36 -----------------
include/system/memory_ldst_phys_endian.h.inc | 10 +++++
system/memory_ldst.c.inc | 42 --------------------
system/memory_ldst_endian.c.inc | 14 +++++++
6 files changed, 28 insertions(+), 90 deletions(-)
diff --git a/include/system/memory_ldst.h.inc b/include/system/memory_ldst.h.inc
index 73c0366a247..7ccca46f2a9 100644
--- a/include/system/memory_ldst.h.inc
+++ b/include/system/memory_ldst.h.inc
@@ -19,30 +19,18 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stl, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stq, SUFFIX)(ARG1_DECL,
hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-uint32_t glue(address_space_ldl_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stb, SUFFIX)(ARG1_DECL,
hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stl_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stl_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stq_le, SUFFIX)(ARG1_DECL,
hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
void glue(address_space_stq_be, SUFFIX)(ARG1_DECL,
diff --git a/include/system/memory_ldst_endian.h.inc b/include/system/memory_ldst_endian.h.inc
index 3f216197663..845ec3b4ad1 100644
--- a/include/system/memory_ldst_endian.h.inc
+++ b/include/system/memory_ldst_endian.h.inc
@@ -16,8 +16,12 @@
uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result);
+uint32_t ADDRESS_SPACE_LD(l)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result);
void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
MemTxAttrs attrs, MemTxResult *result);
+void ADDRESS_SPACE_ST(l)(ARG1_DECL, hwaddr addr, uint32_t val,
+ MemTxAttrs attrs, MemTxResult *result);
#undef ADDRESS_SPACE_LD
#undef ADDRESS_SPACE_ST
diff --git a/include/system/memory_ldst_phys.h.inc b/include/system/memory_ldst_phys.h.inc
index 71c2e64ff0f..c3c73419e61 100644
--- a/include/system/memory_ldst_phys.h.inc
+++ b/include/system/memory_ldst_phys.h.inc
@@ -19,24 +19,12 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-static inline uint32_t glue(ldl_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_ldl, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline uint64_t glue(ldq_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
{
return glue(address_space_ldq, SUFFIX)(ARG1, addr,
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline void glue(stl_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val)
-{
- glue(address_space_stl, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val)
{
glue(address_space_stq, SUFFIX)(ARG1, addr, val,
@@ -49,18 +37,6 @@ static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline uint32_t glue(ldl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_ldl_le, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline uint32_t glue(ldl_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_ldl_be, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline uint64_t glue(ldq_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
{
return glue(address_space_ldq_le, SUFFIX)(ARG1, addr,
@@ -79,18 +55,6 @@ static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val)
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline void glue(stl_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val)
-{
- glue(address_space_stl_le, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline void glue(stl_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint32_t val)
-{
- glue(address_space_stl_be, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline void glue(stq_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val)
{
glue(address_space_stq_le, SUFFIX)(ARG1, addr, val,
diff --git a/include/system/memory_ldst_phys_endian.h.inc b/include/system/memory_ldst_phys_endian.h.inc
index 25ab52a88d9..1589f34e8e4 100644
--- a/include/system/memory_ldst_phys_endian.h.inc
+++ b/include/system/memory_ldst_phys_endian.h.inc
@@ -24,11 +24,21 @@ static inline uint16_t LD_PHYS(uw)(ARG1_DECL, hwaddr addr)
return ADDRESS_SPACE_LD(uw)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL);
}
+static inline uint32_t LD_PHYS(l)(ARG1_DECL, hwaddr addr)
+{
+ return ADDRESS_SPACE_LD(l)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL);
+}
+
static inline void ST_PHYS(w)(ARG1_DECL, hwaddr addr, uint16_t val)
{
ADDRESS_SPACE_ST(w)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL);
}
+static inline void ST_PHYS(l)(ARG1_DECL, hwaddr addr, uint32_t val)
+{
+ ADDRESS_SPACE_ST(l)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL);
+}
+
#undef LD_PHYS
#undef ST_PHYS
#undef ADDRESS_SPACE_LD
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index c37a07b4f4a..ab2df6e429b 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -67,27 +67,6 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
return val;
}
-uint32_t glue(address_space_ldl, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldl_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_NATIVE_ENDIAN);
-}
-
-uint32_t glue(address_space_ldl_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldl_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_LITTLE_ENDIAN);
-}
-
-uint32_t glue(address_space_ldl_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldl_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_BIG_ENDIAN);
-}
-
/* warning: addr must be aligned */
static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
@@ -284,27 +263,6 @@ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
RCU_READ_UNLOCK();
}
-void glue(address_space_stl, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stl_internal, SUFFIX)(ARG1, addr, val, attrs,
- result, DEVICE_NATIVE_ENDIAN);
-}
-
-void glue(address_space_stl_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stl_internal, SUFFIX)(ARG1, addr, val, attrs,
- result, DEVICE_LITTLE_ENDIAN);
-}
-
-void glue(address_space_stl_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stl_internal, SUFFIX)(ARG1, addr, val, attrs,
- result, DEVICE_BIG_ENDIAN);
-}
-
void glue(address_space_stb, SUFFIX)(ARG1_DECL,
hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result)
{
diff --git a/system/memory_ldst_endian.c.inc b/system/memory_ldst_endian.c.inc
index e1ae44ca232..5d46524ec4c 100644
--- a/system/memory_ldst_endian.c.inc
+++ b/system/memory_ldst_endian.c.inc
@@ -26,6 +26,13 @@ uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
DEVICE_ENDIANNESS);
}
+uint32_t ADDRESS_SPACE_LD(l)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result)
+{
+ return ADDRESS_SPACE_LD_INTERNAL(l)(ARG1, addr, attrs, result,
+ DEVICE_ENDIANNESS);
+}
+
void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
MemTxAttrs attrs, MemTxResult *result)
{
@@ -33,6 +40,13 @@ void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
DEVICE_ENDIANNESS);
}
+void ADDRESS_SPACE_ST(l)(ARG1_DECL, hwaddr addr, uint32_t val,
+ MemTxAttrs attrs, MemTxResult *result)
+{
+ ADDRESS_SPACE_ST_INTERNAL(l)(ARG1, addr, val, attrs, result,
+ DEVICE_ENDIANNESS);
+}
+
#undef ADDRESS_SPACE_LD
#undef ADDRESS_SPACE_LD_INTERNAL
#undef ADDRESS_SPACE_ST
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 07/18] system/memory: Define address_space_ldst[Q] endian variants via template
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (5 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 06/18] system/memory: Define address_space_ldst[L] " Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 08/18] system/memory: Factor address_space_ldst[M]_internal() helper out Philippe Mathieu-Daudé
` (11 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Define address_space_ldst[Q] endian variants via template.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/memory_ldst.h.inc | 17 ++------
include/system/memory_ldst_endian.h.inc | 4 ++
include/system/memory_ldst_phys.h.inc | 36 -----------------
include/system/memory_ldst_phys_endian.h.inc | 10 +++++
system/memory_ldst.c.inc | 42 --------------------
system/memory_ldst_endian.c.inc | 14 +++++++
6 files changed, 31 insertions(+), 92 deletions(-)
diff --git a/include/system/memory_ldst.h.inc b/include/system/memory_ldst.h.inc
index 7ccca46f2a9..dd1fb482eac 100644
--- a/include/system/memory_ldst.h.inc
+++ b/include/system/memory_ldst.h.inc
@@ -19,22 +19,11 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stq, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
-uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
+ hwaddr addr, MemTxAttrs attrs, MemTxResult *result);
+
void glue(address_space_stb, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stq_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
-void glue(address_space_stq_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result);
+ hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);
#define ENDIANNESS
#include "system/memory_ldst_endian.h.inc"
diff --git a/include/system/memory_ldst_endian.h.inc b/include/system/memory_ldst_endian.h.inc
index 845ec3b4ad1..f5b6b496be5 100644
--- a/include/system/memory_ldst_endian.h.inc
+++ b/include/system/memory_ldst_endian.h.inc
@@ -18,10 +18,14 @@ uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result);
uint32_t ADDRESS_SPACE_LD(l)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result);
+uint64_t ADDRESS_SPACE_LD(q)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result);
void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
MemTxAttrs attrs, MemTxResult *result);
void ADDRESS_SPACE_ST(l)(ARG1_DECL, hwaddr addr, uint32_t val,
MemTxAttrs attrs, MemTxResult *result);
+void ADDRESS_SPACE_ST(q)(ARG1_DECL, hwaddr addr, uint64_t val,
+ MemTxAttrs attrs, MemTxResult *result);
#undef ADDRESS_SPACE_LD
#undef ADDRESS_SPACE_ST
diff --git a/include/system/memory_ldst_phys.h.inc b/include/system/memory_ldst_phys.h.inc
index c3c73419e61..f4c91dc7a91 100644
--- a/include/system/memory_ldst_phys.h.inc
+++ b/include/system/memory_ldst_phys.h.inc
@@ -19,54 +19,18 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-static inline uint64_t glue(ldq_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_ldq, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline void glue(stq_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val)
-{
- glue(address_space_stq, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline uint8_t glue(ldub_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
{
return glue(address_space_ldub, SUFFIX)(ARG1, addr,
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline uint64_t glue(ldq_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_ldq_le, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline uint64_t glue(ldq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr)
-{
- return glue(address_space_ldq_be, SUFFIX)(ARG1, addr,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val)
{
glue(address_space_stb, SUFFIX)(ARG1, addr, val,
MEMTXATTRS_UNSPECIFIED, NULL);
}
-static inline void glue(stq_le_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val)
-{
- glue(address_space_stq_le, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
-static inline void glue(stq_be_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint64_t val)
-{
- glue(address_space_stq_be, SUFFIX)(ARG1, addr, val,
- MEMTXATTRS_UNSPECIFIED, NULL);
-}
-
#define ENDIANNESS
#include "system/memory_ldst_phys_endian.h.inc"
diff --git a/include/system/memory_ldst_phys_endian.h.inc b/include/system/memory_ldst_phys_endian.h.inc
index 1589f34e8e4..820e9dd1f13 100644
--- a/include/system/memory_ldst_phys_endian.h.inc
+++ b/include/system/memory_ldst_phys_endian.h.inc
@@ -29,6 +29,11 @@ static inline uint32_t LD_PHYS(l)(ARG1_DECL, hwaddr addr)
return ADDRESS_SPACE_LD(l)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL);
}
+static inline uint64_t LD_PHYS(q)(ARG1_DECL, hwaddr addr)
+{
+ return ADDRESS_SPACE_LD(q)(ARG1, addr, MEMTXATTRS_UNSPECIFIED, NULL);
+}
+
static inline void ST_PHYS(w)(ARG1_DECL, hwaddr addr, uint16_t val)
{
ADDRESS_SPACE_ST(w)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL);
@@ -39,6 +44,11 @@ static inline void ST_PHYS(l)(ARG1_DECL, hwaddr addr, uint32_t val)
ADDRESS_SPACE_ST(l)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL);
}
+static inline void ST_PHYS(q)(ARG1_DECL, hwaddr addr, uint64_t val)
+{
+ ADDRESS_SPACE_ST(q)(ARG1, addr, val, MEMTXATTRS_UNSPECIFIED, NULL);
+}
+
#undef LD_PHYS
#undef ST_PHYS
#undef ADDRESS_SPACE_LD
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index ab2df6e429b..823fc3a7561 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -115,27 +115,6 @@ static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
return val;
}
-uint64_t glue(address_space_ldq, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldq_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_NATIVE_ENDIAN);
-}
-
-uint64_t glue(address_space_ldq_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldq_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_LITTLE_ENDIAN);
-}
-
-uint64_t glue(address_space_ldq_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldq_internal, SUFFIX)(ARG1, addr, attrs, result,
- DEVICE_BIG_ENDIAN);
-}
-
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
{
@@ -381,27 +360,6 @@ static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
RCU_READ_UNLOCK();
}
-void glue(address_space_stq, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stq_internal, SUFFIX)(ARG1, addr, val, attrs, result,
- DEVICE_NATIVE_ENDIAN);
-}
-
-void glue(address_space_stq_le, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stq_internal, SUFFIX)(ARG1, addr, val, attrs, result,
- DEVICE_LITTLE_ENDIAN);
-}
-
-void glue(address_space_stq_be, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stq_internal, SUFFIX)(ARG1, addr, val, attrs, result,
- DEVICE_BIG_ENDIAN);
-}
-
#define ENDIANNESS
#define DEVICE_ENDIANNESS DEVICE_NATIVE_ENDIAN
#include "memory_ldst_endian.c.inc"
diff --git a/system/memory_ldst_endian.c.inc b/system/memory_ldst_endian.c.inc
index 5d46524ec4c..791d041b15d 100644
--- a/system/memory_ldst_endian.c.inc
+++ b/system/memory_ldst_endian.c.inc
@@ -33,6 +33,13 @@ uint32_t ADDRESS_SPACE_LD(l)(ARG1_DECL, hwaddr addr,
DEVICE_ENDIANNESS);
}
+uint64_t ADDRESS_SPACE_LD(q)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result)
+{
+ return ADDRESS_SPACE_LD_INTERNAL(q)(ARG1, addr, attrs, result,
+ DEVICE_ENDIANNESS);
+}
+
void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
MemTxAttrs attrs, MemTxResult *result)
{
@@ -47,6 +54,13 @@ void ADDRESS_SPACE_ST(l)(ARG1_DECL, hwaddr addr, uint32_t val,
DEVICE_ENDIANNESS);
}
+void ADDRESS_SPACE_ST(q)(ARG1_DECL, hwaddr addr, uint64_t val,
+ MemTxAttrs attrs, MemTxResult *result)
+{
+ ADDRESS_SPACE_ST_INTERNAL(q)(ARG1, addr, val, attrs, result,
+ DEVICE_ENDIANNESS);
+}
+
#undef ADDRESS_SPACE_LD
#undef ADDRESS_SPACE_LD_INTERNAL
#undef ADDRESS_SPACE_ST
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 08/18] system/memory: Factor address_space_ldst[M]_internal() helper out
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (6 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 07/18] system/memory: Define address_space_ldst[Q] " Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 09/18] system/memory: Pass device_endian argument as MemOp bit Philippe Mathieu-Daudé
` (10 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
All the LD/ST[W,L,Q] variants use the same template, only
modifying the access size used. Unify as a single pair of
LD/ST methods taking a MemOp argument. Thus use the 'm'
suffix for MemOp.
Keep the pre-existing "warning: addr must be aligned" comment.
We leave the wonder about why we aren't asserting alignment
for later.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
system/memory_ldst.c.inc | 298 +++++++++------------------------------
1 file changed, 63 insertions(+), 235 deletions(-)
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index 823fc3a7561..39b3930bf50 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -20,39 +20,43 @@
*/
/* warning: addr must be aligned */
-static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
- enum device_endian endian)
+static inline
+uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
+ hwaddr addr,
+ MemTxAttrs attrs,
+ MemTxResult *result,
+ enum device_endian endian)
{
+ const unsigned size = memop_size(mop);
uint8_t *ptr;
uint64_t val;
MemoryRegion *mr;
- hwaddr l = 4;
+ hwaddr l = size;
hwaddr addr1;
MemTxResult r;
bool release_lock = false;
RCU_READ_LOCK();
mr = TRANSLATE(addr, &addr1, &l, false, attrs);
- if (l < 4 || !memory_access_is_direct(mr, false, attrs)) {
+ if (l < size || !memory_access_is_direct(mr, false, attrs)) {
release_lock |= prepare_mmio_access(mr);
/* I/O case */
r = memory_region_dispatch_read(mr, addr1, &val,
- MO_32 | devend_memop(endian), attrs);
+ mop | devend_memop(endian), attrs);
} else {
/* RAM case */
- fuzz_dma_read_cb(addr, 4, mr);
+ fuzz_dma_read_cb(addr, size, mr);
ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
switch (endian) {
case DEVICE_LITTLE_ENDIAN:
- val = ldl_le_p(ptr);
+ val = ldn_le_p(ptr, size);
break;
case DEVICE_BIG_ENDIAN:
- val = ldl_be_p(ptr);
+ val = ldn_be_p(ptr, size);
break;
default:
- val = ldl_p(ptr);
+ val = ldn_p(ptr, size);
break;
}
r = MEMTX_OK;
@@ -67,87 +71,30 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
return val;
}
+/* warning: addr must be aligned */
+static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
+ hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
+ enum device_endian endian)
+{
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_32, addr,
+ attrs, result, endian);
+}
+
/* warning: addr must be aligned */
static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
enum device_endian endian)
{
- uint8_t *ptr;
- uint64_t val;
- MemoryRegion *mr;
- hwaddr l = 8;
- hwaddr addr1;
- MemTxResult r;
- bool release_lock = false;
-
- RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, false, attrs);
- if (l < 8 || !memory_access_is_direct(mr, false, attrs)) {
- release_lock |= prepare_mmio_access(mr);
-
- /* I/O case */
- r = memory_region_dispatch_read(mr, addr1, &val,
- MO_64 | devend_memop(endian), attrs);
- } else {
- /* RAM case */
- fuzz_dma_read_cb(addr, 8, mr);
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- switch (endian) {
- case DEVICE_LITTLE_ENDIAN:
- val = ldq_le_p(ptr);
- break;
- case DEVICE_BIG_ENDIAN:
- val = ldq_be_p(ptr);
- break;
- default:
- val = ldq_p(ptr);
- break;
- }
- r = MEMTX_OK;
- }
- if (result) {
- *result = r;
- }
- if (release_lock) {
- bql_unlock();
- }
- RCU_READ_UNLOCK();
- return val;
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_64, addr,
+ attrs, result, endian);
}
-uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
+uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr,
+ MemTxAttrs attrs, MemTxResult *result)
{
- uint8_t *ptr;
- uint64_t val;
- MemoryRegion *mr;
- hwaddr l = 1;
- hwaddr addr1;
- MemTxResult r;
- bool release_lock = false;
-
- RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, false, attrs);
- if (!memory_access_is_direct(mr, false, attrs)) {
- release_lock |= prepare_mmio_access(mr);
-
- /* I/O case */
- r = memory_region_dispatch_read(mr, addr1, &val, MO_8, attrs);
- } else {
- /* RAM case */
- fuzz_dma_read_cb(addr, 1, mr);
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- val = ldub_p(ptr);
- r = MEMTX_OK;
- }
- if (result) {
- *result = r;
- }
- if (release_lock) {
- bql_unlock();
- }
- RCU_READ_UNLOCK();
- return val;
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_8, addr,
+ attrs, result,
+ DEVICE_NATIVE_ENDIAN);
}
/* warning: addr must be aligned */
@@ -155,37 +102,47 @@ static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
enum device_endian endian)
{
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_16, addr,
+ attrs, result, endian);
+}
+
+/* warning: addr must be aligned */
+static inline
+void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
+ hwaddr addr, uint64_t val,
+ MemTxAttrs attrs,
+ MemTxResult *result,
+ enum device_endian endian)
+{
+ const unsigned size = memop_size(mop);
uint8_t *ptr;
- uint64_t val;
MemoryRegion *mr;
- hwaddr l = 2;
+ hwaddr l = size;
hwaddr addr1;
MemTxResult r;
bool release_lock = false;
RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, false, attrs);
- if (l < 2 || !memory_access_is_direct(mr, false, attrs)) {
+ mr = TRANSLATE(addr, &addr1, &l, true, attrs);
+ if (l < size || !memory_access_is_direct(mr, true, attrs)) {
release_lock |= prepare_mmio_access(mr);
-
- /* I/O case */
- r = memory_region_dispatch_read(mr, addr1, &val,
- MO_16 | devend_memop(endian), attrs);
+ r = memory_region_dispatch_write(mr, addr1, val,
+ mop | devend_memop(endian), attrs);
} else {
/* RAM case */
- fuzz_dma_read_cb(addr, 2, mr);
ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
switch (endian) {
case DEVICE_LITTLE_ENDIAN:
- val = lduw_le_p(ptr);
+ stn_le_p(ptr, size, val);
break;
case DEVICE_BIG_ENDIAN:
- val = lduw_be_p(ptr);
+ stn_be_p(ptr, size, val);
break;
default:
- val = lduw_p(ptr);
+ stn_p(ptr, size, val);
break;
}
+ invalidate_and_set_dirty(mr, addr1, size);
r = MEMTX_OK;
}
if (result) {
@@ -195,7 +152,6 @@ static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
bql_unlock();
}
RCU_READ_UNLOCK();
- return val;
}
/* warning: addr must be aligned */
@@ -203,74 +159,16 @@ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, uint32_t val, MemTxAttrs attrs,
MemTxResult *result, enum device_endian endian)
{
- uint8_t *ptr;
- MemoryRegion *mr;
- hwaddr l = 4;
- hwaddr addr1;
- MemTxResult r;
- bool release_lock = false;
-
- RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, true, attrs);
- if (l < 4 || !memory_access_is_direct(mr, true, attrs)) {
- release_lock |= prepare_mmio_access(mr);
- r = memory_region_dispatch_write(mr, addr1, val,
- MO_32 | devend_memop(endian), attrs);
- } else {
- /* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- switch (endian) {
- case DEVICE_LITTLE_ENDIAN:
- stl_le_p(ptr, val);
- break;
- case DEVICE_BIG_ENDIAN:
- stl_be_p(ptr, val);
- break;
- default:
- stl_p(ptr, val);
- break;
- }
- invalidate_and_set_dirty(mr, addr1, 4);
- r = MEMTX_OK;
- }
- if (result) {
- *result = r;
- }
- if (release_lock) {
- bql_unlock();
- }
- RCU_READ_UNLOCK();
+ glue(address_space_stm_internal, SUFFIX)(ARG1, MO_32, addr, val,
+ attrs, result, endian);
}
-void glue(address_space_stb, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result)
+void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val,
+ MemTxAttrs attrs, MemTxResult *result)
{
- uint8_t *ptr;
- MemoryRegion *mr;
- hwaddr l = 1;
- hwaddr addr1;
- MemTxResult r;
- bool release_lock = false;
-
- RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, true, attrs);
- if (!memory_access_is_direct(mr, true, attrs)) {
- release_lock |= prepare_mmio_access(mr);
- r = memory_region_dispatch_write(mr, addr1, val, MO_8, attrs);
- } else {
- /* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- stb_p(ptr, val);
- invalidate_and_set_dirty(mr, addr1, 1);
- r = MEMTX_OK;
- }
- if (result) {
- *result = r;
- }
- if (release_lock) {
- bql_unlock();
- }
- RCU_READ_UNLOCK();
+ glue(address_space_stm_internal, SUFFIX)(ARG1, MO_8, addr, val,
+ attrs, result,
+ DEVICE_NATIVE_ENDIAN);
}
/* warning: addr must be aligned */
@@ -278,86 +176,16 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, uint16_t val, MemTxAttrs attrs,
MemTxResult *result, enum device_endian endian)
{
- uint8_t *ptr;
- MemoryRegion *mr;
- hwaddr l = 2;
- hwaddr addr1;
- MemTxResult r;
- bool release_lock = false;
-
- RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, true, attrs);
- if (l < 2 || !memory_access_is_direct(mr, true, attrs)) {
- release_lock |= prepare_mmio_access(mr);
- r = memory_region_dispatch_write(mr, addr1, val,
- MO_16 | devend_memop(endian), attrs);
- } else {
- /* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- switch (endian) {
- case DEVICE_LITTLE_ENDIAN:
- stw_le_p(ptr, val);
- break;
- case DEVICE_BIG_ENDIAN:
- stw_be_p(ptr, val);
- break;
- default:
- stw_p(ptr, val);
- break;
- }
- invalidate_and_set_dirty(mr, addr1, 2);
- r = MEMTX_OK;
- }
- if (result) {
- *result = r;
- }
- if (release_lock) {
- bql_unlock();
- }
- RCU_READ_UNLOCK();
+ glue(address_space_stm_internal, SUFFIX)(ARG1, MO_16, addr, val,
+ attrs, result, endian);
}
static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
hwaddr addr, uint64_t val, MemTxAttrs attrs,
MemTxResult *result, enum device_endian endian)
{
- uint8_t *ptr;
- MemoryRegion *mr;
- hwaddr l = 8;
- hwaddr addr1;
- MemTxResult r;
- bool release_lock = false;
-
- RCU_READ_LOCK();
- mr = TRANSLATE(addr, &addr1, &l, true, attrs);
- if (l < 8 || !memory_access_is_direct(mr, true, attrs)) {
- release_lock |= prepare_mmio_access(mr);
- r = memory_region_dispatch_write(mr, addr1, val,
- MO_64 | devend_memop(endian), attrs);
- } else {
- /* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- switch (endian) {
- case DEVICE_LITTLE_ENDIAN:
- stq_le_p(ptr, val);
- break;
- case DEVICE_BIG_ENDIAN:
- stq_be_p(ptr, val);
- break;
- default:
- stq_p(ptr, val);
- break;
- }
- invalidate_and_set_dirty(mr, addr1, 8);
- r = MEMTX_OK;
- }
- if (result) {
- *result = r;
- }
- if (release_lock) {
- bql_unlock();
- }
- RCU_READ_UNLOCK();
+ glue(address_space_stm_internal, SUFFIX)(ARG1, MO_64, addr, val,
+ attrs, result, endian);
}
#define ENDIANNESS
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 09/18] system/memory: Pass device_endian argument as MemOp bit
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (7 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 08/18] system/memory: Factor address_space_ldst[M]_internal() helper out Philippe Mathieu-Daudé
@ 2026-01-18 19:34 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 10/18] system/memory: Use ldm_p() and stm_p() helpers Philippe Mathieu-Daudé
` (9 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:34 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Use the MemOp argument to hold both the access size and
its endianness.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
system/memory_ldst.c.inc | 86 ++++++++++++---------------------
system/memory_ldst_endian.c.inc | 26 +++++-----
2 files changed, 44 insertions(+), 68 deletions(-)
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index 39b3930bf50..5c8299e0cdc 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -24,8 +24,7 @@ static inline
uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
hwaddr addr,
MemTxAttrs attrs,
- MemTxResult *result,
- enum device_endian endian)
+ MemTxResult *result)
{
const unsigned size = memop_size(mop);
uint8_t *ptr;
@@ -42,22 +41,15 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
release_lock |= prepare_mmio_access(mr);
/* I/O case */
- r = memory_region_dispatch_read(mr, addr1, &val,
- mop | devend_memop(endian), attrs);
+ r = memory_region_dispatch_read(mr, addr1, &val, mop, attrs);
} else {
/* RAM case */
fuzz_dma_read_cb(addr, size, mr);
ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- switch (endian) {
- case DEVICE_LITTLE_ENDIAN:
+ if ((mop & MO_BSWAP) == MO_LE) {
val = ldn_le_p(ptr, size);
- break;
- case DEVICE_BIG_ENDIAN:
+ } else {
val = ldn_be_p(ptr, size);
- break;
- default:
- val = ldn_p(ptr, size);
- break;
}
r = MEMTX_OK;
}
@@ -73,37 +65,33 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
/* warning: addr must be aligned */
static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
- enum device_endian endian)
+ MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
{
- return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_32, addr,
- attrs, result, endian);
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_32, addr,
+ attrs, result);
}
/* warning: addr must be aligned */
static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
- enum device_endian endian)
+ MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
{
- return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_64, addr,
- attrs, result, endian);
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_64, addr,
+ attrs, result);
}
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_8, addr,
- attrs, result,
- DEVICE_NATIVE_ENDIAN);
+ attrs, result);
}
/* warning: addr must be aligned */
static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, MemTxAttrs attrs, MemTxResult *result,
- enum device_endian endian)
+ MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
{
- return glue(address_space_ldm_internal, SUFFIX)(ARG1, MO_16, addr,
- attrs, result, endian);
+ return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_16, addr,
+ attrs, result);
}
/* warning: addr must be aligned */
@@ -111,8 +99,7 @@ static inline
void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
hwaddr addr, uint64_t val,
MemTxAttrs attrs,
- MemTxResult *result,
- enum device_endian endian)
+ MemTxResult *result)
{
const unsigned size = memop_size(mop);
uint8_t *ptr;
@@ -126,21 +113,14 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
mr = TRANSLATE(addr, &addr1, &l, true, attrs);
if (l < size || !memory_access_is_direct(mr, true, attrs)) {
release_lock |= prepare_mmio_access(mr);
- r = memory_region_dispatch_write(mr, addr1, val,
- mop | devend_memop(endian), attrs);
+ r = memory_region_dispatch_write(mr, addr1, val, mop, attrs);
} else {
/* RAM case */
ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- switch (endian) {
- case DEVICE_LITTLE_ENDIAN:
+ if ((mop & MO_BSWAP) == MO_LE) {
stn_le_p(ptr, size, val);
- break;
- case DEVICE_BIG_ENDIAN:
+ } else {
stn_be_p(ptr, size, val);
- break;
- default:
- stn_p(ptr, size, val);
- break;
}
invalidate_and_set_dirty(mr, addr1, size);
r = MEMTX_OK;
@@ -156,48 +136,44 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
/* warning: addr must be aligned */
static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint32_t val, MemTxAttrs attrs,
- MemTxResult *result, enum device_endian endian)
+ MemOp mop, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
{
- glue(address_space_stm_internal, SUFFIX)(ARG1, MO_32, addr, val,
- attrs, result, endian);
+ glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_32, addr, val,
+ attrs, result);
}
void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val,
MemTxAttrs attrs, MemTxResult *result)
{
glue(address_space_stm_internal, SUFFIX)(ARG1, MO_8, addr, val,
- attrs, result,
- DEVICE_NATIVE_ENDIAN);
+ attrs, result);
}
/* warning: addr must be aligned */
static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint16_t val, MemTxAttrs attrs,
- MemTxResult *result, enum device_endian endian)
+ MemOp mop, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
{
- glue(address_space_stm_internal, SUFFIX)(ARG1, MO_16, addr, val,
- attrs, result, endian);
+ glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_16, addr, val,
+ attrs, result);
}
static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
- hwaddr addr, uint64_t val, MemTxAttrs attrs,
- MemTxResult *result, enum device_endian endian)
+ MemOp mop, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result)
{
- glue(address_space_stm_internal, SUFFIX)(ARG1, MO_64, addr, val,
- attrs, result, endian);
+ glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_64, addr, val,
+ attrs, result);
}
#define ENDIANNESS
-#define DEVICE_ENDIANNESS DEVICE_NATIVE_ENDIAN
+#define MO_ENDIAN (target_big_endian() ? MO_BE : MO_LE)
#include "memory_ldst_endian.c.inc"
#define ENDIANNESS _le
-#define DEVICE_ENDIANNESS DEVICE_LITTLE_ENDIAN
+#define MO_ENDIAN MO_LE
#include "memory_ldst_endian.c.inc"
#define ENDIANNESS _be
-#define DEVICE_ENDIANNESS DEVICE_BIG_ENDIAN
+#define MO_ENDIAN MO_BE
#include "memory_ldst_endian.c.inc"
#undef ARG1_DECL
diff --git a/system/memory_ldst_endian.c.inc b/system/memory_ldst_endian.c.inc
index 791d041b15d..9cf36017135 100644
--- a/system/memory_ldst_endian.c.inc
+++ b/system/memory_ldst_endian.c.inc
@@ -22,43 +22,43 @@
uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
- return ADDRESS_SPACE_LD_INTERNAL(uw)(ARG1, addr, attrs, result,
- DEVICE_ENDIANNESS);
+ return ADDRESS_SPACE_LD_INTERNAL(uw)(ARG1, MO_ENDIAN,
+ addr, attrs, result);
}
uint32_t ADDRESS_SPACE_LD(l)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
- return ADDRESS_SPACE_LD_INTERNAL(l)(ARG1, addr, attrs, result,
- DEVICE_ENDIANNESS);
+ return ADDRESS_SPACE_LD_INTERNAL(l)(ARG1, MO_ENDIAN,
+ addr, attrs, result);
}
uint64_t ADDRESS_SPACE_LD(q)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
- return ADDRESS_SPACE_LD_INTERNAL(q)(ARG1, addr, attrs, result,
- DEVICE_ENDIANNESS);
+ return ADDRESS_SPACE_LD_INTERNAL(q)(ARG1, MO_ENDIAN,
+ addr, attrs, result);
}
void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
MemTxAttrs attrs, MemTxResult *result)
{
- ADDRESS_SPACE_ST_INTERNAL(w)(ARG1, addr, val, attrs, result,
- DEVICE_ENDIANNESS);
+ ADDRESS_SPACE_ST_INTERNAL(w)(ARG1, MO_ENDIAN,
+ addr, val, attrs, result);
}
void ADDRESS_SPACE_ST(l)(ARG1_DECL, hwaddr addr, uint32_t val,
MemTxAttrs attrs, MemTxResult *result)
{
- ADDRESS_SPACE_ST_INTERNAL(l)(ARG1, addr, val, attrs, result,
- DEVICE_ENDIANNESS);
+ ADDRESS_SPACE_ST_INTERNAL(l)(ARG1, MO_ENDIAN,
+ addr, val, attrs, result);
}
void ADDRESS_SPACE_ST(q)(ARG1_DECL, hwaddr addr, uint64_t val,
MemTxAttrs attrs, MemTxResult *result)
{
- ADDRESS_SPACE_ST_INTERNAL(q)(ARG1, addr, val, attrs, result,
- DEVICE_ENDIANNESS);
+ ADDRESS_SPACE_ST_INTERNAL(q)(ARG1, MO_ENDIAN,
+ addr, val, attrs, result);
}
#undef ADDRESS_SPACE_LD
@@ -67,4 +67,4 @@ void ADDRESS_SPACE_ST(q)(ARG1_DECL, hwaddr addr, uint64_t val,
#undef ADDRESS_SPACE_ST_INTERNAL
#undef ENDIANNESS
-#undef DEVICE_ENDIANNESS
+#undef MO_ENDIAN
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 10/18] system/memory: Use ldm_p() and stm_p() helpers
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (8 preceding siblings ...)
2026-01-18 19:34 ` [PATCH v6 09/18] system/memory: Pass device_endian argument as MemOp bit Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 11/18] system/memory: Directly call address_space_ldst[M]_internal() helper Philippe Mathieu-Daudé
` (8 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
address_space_{ld,st}m_internal() take a MemOp argument
so can directly use the {ld,st}m_p() helpers.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
system/memory_ldst.c.inc | 16 ++--------------
1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index 5c8299e0cdc..d51c5feddf7 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -27,7 +27,6 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
MemTxResult *result)
{
const unsigned size = memop_size(mop);
- uint8_t *ptr;
uint64_t val;
MemoryRegion *mr;
hwaddr l = size;
@@ -45,12 +44,7 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
} else {
/* RAM case */
fuzz_dma_read_cb(addr, size, mr);
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- if ((mop & MO_BSWAP) == MO_LE) {
- val = ldn_le_p(ptr, size);
- } else {
- val = ldn_be_p(ptr, size);
- }
+ val = ldm_p(qemu_map_ram_ptr(mr->ram_block, addr1), mop);
r = MEMTX_OK;
}
if (result) {
@@ -102,7 +96,6 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
MemTxResult *result)
{
const unsigned size = memop_size(mop);
- uint8_t *ptr;
MemoryRegion *mr;
hwaddr l = size;
hwaddr addr1;
@@ -116,12 +109,7 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
r = memory_region_dispatch_write(mr, addr1, val, mop, attrs);
} else {
/* RAM case */
- ptr = qemu_map_ram_ptr(mr->ram_block, addr1);
- if ((mop & MO_BSWAP) == MO_LE) {
- stn_le_p(ptr, size, val);
- } else {
- stn_be_p(ptr, size, val);
- }
+ stm_p(qemu_map_ram_ptr(mr->ram_block, addr1), mop, val);
invalidate_and_set_dirty(mr, addr1, size);
r = MEMTX_OK;
}
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 11/18] system/memory: Directly call address_space_ldst[M]_internal() helper
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (9 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 10/18] system/memory: Use ldm_p() and stm_p() helpers Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 12/18] system: Allow restricting the legacy ld/st_phys() 'native-endian' API Philippe Mathieu-Daudé
` (7 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Inline internal address_space_ld/st[L,D,Q] helpers,
directly calling address_space_ldst[M]_internal().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
system/memory_ldst.c.inc | 47 ---------------------------------
system/memory_ldst_endian.c.inc | 12 ++++-----
2 files changed, 6 insertions(+), 53 deletions(-)
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index d51c5feddf7..ebb441f1a66 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -57,22 +57,6 @@ uint64_t glue(address_space_ldm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
return val;
}
-/* warning: addr must be aligned */
-static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL,
- MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_32, addr,
- attrs, result);
-}
-
-/* warning: addr must be aligned */
-static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL,
- MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_64, addr,
- attrs, result);
-}
-
uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
@@ -80,14 +64,6 @@ uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, hwaddr addr,
attrs, result);
}
-/* warning: addr must be aligned */
-static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL,
- MemOp mop, hwaddr addr, MemTxAttrs attrs, MemTxResult *result)
-{
- return glue(address_space_ldm_internal, SUFFIX)(ARG1, mop | MO_16, addr,
- attrs, result);
-}
-
/* warning: addr must be aligned */
static inline
void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
@@ -122,14 +98,6 @@ void glue(address_space_stm_internal, SUFFIX)(ARG1_DECL, MemOp mop,
RCU_READ_UNLOCK();
}
-/* warning: addr must be aligned */
-static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL,
- MemOp mop, hwaddr addr, uint32_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_32, addr, val,
- attrs, result);
-}
-
void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val,
MemTxAttrs attrs, MemTxResult *result)
{
@@ -137,21 +105,6 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val,
attrs, result);
}
-/* warning: addr must be aligned */
-static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL,
- MemOp mop, hwaddr addr, uint16_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_16, addr, val,
- attrs, result);
-}
-
-static inline void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL,
- MemOp mop, hwaddr addr, uint64_t val, MemTxAttrs attrs, MemTxResult *result)
-{
- glue(address_space_stm_internal, SUFFIX)(ARG1, mop | MO_64, addr, val,
- attrs, result);
-}
-
#define ENDIANNESS
#define MO_ENDIAN (target_big_endian() ? MO_BE : MO_LE)
#include "memory_ldst_endian.c.inc"
diff --git a/system/memory_ldst_endian.c.inc b/system/memory_ldst_endian.c.inc
index 9cf36017135..fb933de11f8 100644
--- a/system/memory_ldst_endian.c.inc
+++ b/system/memory_ldst_endian.c.inc
@@ -22,42 +22,42 @@
uint16_t ADDRESS_SPACE_LD(uw)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
- return ADDRESS_SPACE_LD_INTERNAL(uw)(ARG1, MO_ENDIAN,
+ return ADDRESS_SPACE_LD_INTERNAL(m)(ARG1, MO_ENDIAN | MO_16,
addr, attrs, result);
}
uint32_t ADDRESS_SPACE_LD(l)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
- return ADDRESS_SPACE_LD_INTERNAL(l)(ARG1, MO_ENDIAN,
+ return ADDRESS_SPACE_LD_INTERNAL(m)(ARG1, MO_ENDIAN | MO_32,
addr, attrs, result);
}
uint64_t ADDRESS_SPACE_LD(q)(ARG1_DECL, hwaddr addr,
MemTxAttrs attrs, MemTxResult *result)
{
- return ADDRESS_SPACE_LD_INTERNAL(q)(ARG1, MO_ENDIAN,
+ return ADDRESS_SPACE_LD_INTERNAL(m)(ARG1, MO_ENDIAN | MO_64,
addr, attrs, result);
}
void ADDRESS_SPACE_ST(w)(ARG1_DECL, hwaddr addr, uint16_t val,
MemTxAttrs attrs, MemTxResult *result)
{
- ADDRESS_SPACE_ST_INTERNAL(w)(ARG1, MO_ENDIAN,
+ ADDRESS_SPACE_ST_INTERNAL(m)(ARG1, MO_ENDIAN | MO_16,
addr, val, attrs, result);
}
void ADDRESS_SPACE_ST(l)(ARG1_DECL, hwaddr addr, uint32_t val,
MemTxAttrs attrs, MemTxResult *result)
{
- ADDRESS_SPACE_ST_INTERNAL(l)(ARG1, MO_ENDIAN,
+ ADDRESS_SPACE_ST_INTERNAL(m)(ARG1, MO_ENDIAN | MO_32,
addr, val, attrs, result);
}
void ADDRESS_SPACE_ST(q)(ARG1_DECL, hwaddr addr, uint64_t val,
MemTxAttrs attrs, MemTxResult *result)
{
- ADDRESS_SPACE_ST_INTERNAL(q)(ARG1, MO_ENDIAN,
+ ADDRESS_SPACE_ST_INTERNAL(m)(ARG1, MO_ENDIAN | MO_64,
addr, val, attrs, result);
}
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 12/18] system: Allow restricting the legacy ld/st_phys() 'native-endian' API
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (10 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 11/18] system/memory: Directly call address_space_ldst[M]_internal() helper Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 13/18] system: Allow restricting legacy address_space_ldst() native-endian API Philippe Mathieu-Daudé
` (6 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian APIs we want to remove by surrounding
them with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Since all targets can check the definition, do not poison it.
Once a target gets cleaned we'll set the definition in the
target config, then the target won't be able to use the legacy
API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/memory_ldst_phys.h.inc | 2 ++
scripts/make-config-poison.sh | 1 +
2 files changed, 3 insertions(+)
diff --git a/include/system/memory_ldst_phys.h.inc b/include/system/memory_ldst_phys.h.inc
index f4c91dc7a91..66bbd3061c2 100644
--- a/include/system/memory_ldst_phys.h.inc
+++ b/include/system/memory_ldst_phys.h.inc
@@ -31,8 +31,10 @@ static inline void glue(stb_phys, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val)
MEMTXATTRS_UNSPECIFIED, NULL);
}
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
#define ENDIANNESS
#include "system/memory_ldst_phys_endian.h.inc"
+#endif /* TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API */
#define ENDIANNESS _le
#include "system/memory_ldst_phys_endian.h.inc"
diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh
index 937357b3531..b4d61e8bc9e 100755
--- a/scripts/make-config-poison.sh
+++ b/scripts/make-config-poison.sh
@@ -11,6 +11,7 @@ exec sed -n \
-e '/CONFIG_USER_ONLY/d' \
-e '/CONFIG_SOFTMMU/d' \
-e '/TARGET_NOT_USING_LEGACY_LDST_PHYS_API/d' \
+ -e '/TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API/d' \
-e '/^#define / {' \
-e 's///' \
-e 's/ .*//' \
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 13/18] system: Allow restricting legacy address_space_ldst() native-endian API
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (11 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 12/18] system: Allow restricting the legacy ld/st_phys() 'native-endian' API Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 14/18] system: Allow restricting the legacy cpu_ld/st() 'native-endian' API Philippe Mathieu-Daudé
` (5 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian APIs we want to remove by surrounding
them with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Once a target gets cleaned we'll set the definition in the
target config, then the target won't be able to use the legacy
API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/memory_cached.h | 2 ++
include/system/memory_ldst.h.inc | 2 ++
system/memory_ldst.c.inc | 2 ++
3 files changed, 6 insertions(+)
diff --git a/include/system/memory_cached.h b/include/system/memory_cached.h
index e0ed54bd1eb..6eb6179140b 100644
--- a/include/system/memory_cached.h
+++ b/include/system/memory_cached.h
@@ -80,8 +80,10 @@ void address_space_stb_cached(MemoryRegionCache *cache,
}
}
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
#define ENDIANNESS
#include "system/memory_ldst_cached.h.inc"
+#endif
#define ENDIANNESS _le
#include "system/memory_ldst_cached.h.inc"
diff --git a/include/system/memory_ldst.h.inc b/include/system/memory_ldst.h.inc
index dd1fb482eac..896550bdd65 100644
--- a/include/system/memory_ldst.h.inc
+++ b/include/system/memory_ldst.h.inc
@@ -25,8 +25,10 @@ uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL,
void glue(address_space_stb, SUFFIX)(ARG1_DECL,
hwaddr addr, uint8_t val, MemTxAttrs attrs, MemTxResult *result);
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
#define ENDIANNESS
#include "system/memory_ldst_endian.h.inc"
+#endif /* TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API */
#define ENDIANNESS _le
#include "system/memory_ldst_endian.h.inc"
diff --git a/system/memory_ldst.c.inc b/system/memory_ldst.c.inc
index ebb441f1a66..a728b7737c2 100644
--- a/system/memory_ldst.c.inc
+++ b/system/memory_ldst.c.inc
@@ -105,9 +105,11 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL, hwaddr addr, uint8_t val,
attrs, result);
}
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
#define ENDIANNESS
#define MO_ENDIAN (target_big_endian() ? MO_BE : MO_LE)
#include "memory_ldst_endian.c.inc"
+#endif /* TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API */
#define ENDIANNESS _le
#define MO_ENDIAN MO_LE
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 14/18] system: Allow restricting the legacy cpu_ld/st() 'native-endian' API
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (12 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 13/18] system: Allow restricting legacy address_space_ldst() native-endian API Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 15/18] system: Allow restricting the legacy translator_ld() " Philippe Mathieu-Daudé
` (4 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian APIs we want to remove by surrounding
them with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Once a target gets cleaned we'll set the definition in the
target config, then the target won't be able to use the legacy
API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/accel/tcg/cpu-ldst.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/accel/tcg/cpu-ldst.h b/include/accel/tcg/cpu-ldst.h
index 0de7f5eaa6b..a5711bc15a6 100644
--- a/include/accel/tcg/cpu-ldst.h
+++ b/include/accel/tcg/cpu-ldst.h
@@ -428,6 +428,7 @@ cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
cpu_stq_le_data_ra(env, addr, val, 0);
}
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data
@@ -501,5 +502,6 @@ static inline uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true));
return cpu_ldq_code_mmu(env, addr, oi, 0);
}
+#endif /* TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API */
#endif /* ACCEL_TCG_CPU_LDST_H */
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 15/18] system: Allow restricting the legacy translator_ld() 'native-endian' API
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (13 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 14/18] system: Allow restricting the legacy cpu_ld/st() 'native-endian' API Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 16/18] system: Allow restricting the legacy tswap() " Philippe Mathieu-Daudé
` (3 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian APIs we want to remove by surrounding
them with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Once a target gets cleaned we'll set the definition in the
target config, then the target won't be able to use the legacy
API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/translator.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 3c326555696..8d343627bd9 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -188,7 +188,8 @@ uint32_t translator_ldl_end(CPUArchState *env, DisasContextBase *db,
uint64_t translator_ldq_end(CPUArchState *env, DisasContextBase *db,
vaddr pc, MemOp endian);
-#ifdef COMPILING_PER_TARGET
+#if !defined(TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API) \
+ && defined(COMPILING_PER_TARGET)
static inline uint16_t
translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
@@ -227,7 +228,7 @@ translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
{
return translator_ldq_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
}
-#endif /* COMPILING_PER_TARGET */
+#endif /* !TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API && COMPILING_PER_TARGET */
/**
* translator_fake_ld - fake instruction load
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 16/18] system: Allow restricting the legacy tswap() 'native-endian' API
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (14 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 15/18] system: Allow restricting the legacy translator_ld() " Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 17/18] system: Allow restricting the legacy MO_TE* 'native-endian' definitions Philippe Mathieu-Daudé
` (2 subsequent siblings)
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian APIs we want to remove by surrounding
them with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Once a target gets cleaned we'll set the definition in the
target config, then the target won't be able to use the legacy
API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/tswap.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/exec/tswap.h b/include/exec/tswap.h
index 72219e2c431..9e94fa0021c 100644
--- a/include/exec/tswap.h
+++ b/include/exec/tswap.h
@@ -21,6 +21,8 @@
#define target_needs_bswap() (HOST_BIG_ENDIAN != target_big_endian())
#endif /* COMPILING_PER_TARGET */
+#if defined(CONFIG_USER_ONLY) \
+ || !defined(TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API)
static inline uint16_t tswap16(uint16_t s)
{
if (target_needs_bswap()) {
@@ -68,5 +70,6 @@ static inline void tswap64s(uint64_t *s)
*s = bswap64(*s);
}
}
+#endif
#endif /* TSWAP_H */
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 17/18] system: Allow restricting the legacy MO_TE* 'native-endian' definitions
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (15 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 16/18] system: Allow restricting the legacy tswap() " Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 18/18] system: Allow restricting the legacy DEVICE_NATIVE_ENDIAN definition Philippe Mathieu-Daudé
2026-01-21 20:56 ` [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian definitions we want to remove by surrounding
them with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Once a target gets cleaned we'll set the definition in the
target config, then the target won't be able to use the legacy
API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/memop.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/include/exec/memop.h b/include/exec/memop.h
index 799b5b42218..4aaa6a0ab02 100644
--- a/include/exec/memop.h
+++ b/include/exec/memop.h
@@ -36,11 +36,13 @@ typedef enum MemOp {
MO_BE = MO_BSWAP,
#endif
#ifdef COMPILING_PER_TARGET
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
#if TARGET_BIG_ENDIAN
MO_TE = MO_BE,
#else
MO_TE = MO_LE,
#endif
+#endif
#endif
/*
@@ -150,6 +152,7 @@ typedef enum MemOp {
MO_BESQ = MO_BE | MO_SQ,
#ifdef COMPILING_PER_TARGET
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
MO_TEUW = MO_TE | MO_UW,
MO_TEUL = MO_TE | MO_UL,
MO_TEUQ = MO_TE | MO_UQ,
@@ -157,6 +160,7 @@ typedef enum MemOp {
MO_TESW = MO_TE | MO_SW,
MO_TESL = MO_TE | MO_SL,
MO_TESQ = MO_TE | MO_SQ,
+#endif
#endif
MO_SSIZE = MO_SIZE | MO_SIGN,
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH v6 18/18] system: Allow restricting the legacy DEVICE_NATIVE_ENDIAN definition
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (16 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 17/18] system: Allow restricting the legacy MO_TE* 'native-endian' definitions Philippe Mathieu-Daudé
@ 2026-01-18 19:35 ` Philippe Mathieu-Daudé
2026-01-21 20:56 ` [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-18 19:35 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
Guard the native endian definition we want to remove by surrounding
it with TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API #ifdef'ry.
Assign values to the enumerators so they stay unchanged.
Once a target gets cleaned we'll set the definition in the target
config, then the target won't be able to use the legacy API anymore.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/memory.h | 8 +++++---
system/memory-internal.h | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/system/memory.h b/include/system/memory.h
index 92028dc7a4e..8f8725ea2d5 100644
--- a/include/system/memory.h
+++ b/include/system/memory.h
@@ -27,9 +27,11 @@
#include "qemu/rcu.h"
enum device_endian {
- DEVICE_NATIVE_ENDIAN,
- DEVICE_BIG_ENDIAN,
- DEVICE_LITTLE_ENDIAN,
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
+ DEVICE_NATIVE_ENDIAN = 0,
+#endif
+ DEVICE_BIG_ENDIAN = 1,
+ DEVICE_LITTLE_ENDIAN = 2,
};
#define RAM_ADDR_INVALID (~(ram_addr_t)0)
diff --git a/system/memory-internal.h b/system/memory-internal.h
index 46f758fa7e4..5f0524756eb 100644
--- a/system/memory-internal.h
+++ b/system/memory-internal.h
@@ -41,9 +41,11 @@ void mtree_print_dispatch(struct AddressSpaceDispatch *d,
/* returns true if end is big endian. */
static inline bool devend_big_endian(enum device_endian end)
{
+#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API
if (end == DEVICE_NATIVE_ENDIAN) {
return target_big_endian();
}
+#endif
return end == DEVICE_BIG_ENDIAN;
}
--
2.52.0
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header
2026-01-18 19:34 ` [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header Philippe Mathieu-Daudé
@ 2026-01-18 23:11 ` Richard Henderson
0 siblings, 0 replies; 24+ messages in thread
From: Richard Henderson @ 2026-01-18 23:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Xu, Paolo Bonzini, Anton Johansson, Manos Pitsidianakis,
Pierrick Bouvier
On 1/19/26 06:34, Philippe Mathieu-Daudé wrote:
> All these files indirectly include the "qemu/bswap.h" header.
> Make this inclusion explicit to avoid build errors when
> refactoring unrelated headers.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> block/qcow2.h | 1 +
> audio/audio.c | 1 +
> block/blklogwrites.c | 1 +
> block/export/vduse-blk.c | 1 +
> block/export/vhost-user-blk-server.c | 1 +
> block/export/virtio-blk-handler.c | 1 +
> block/parallels-ext.c | 1 +
> hw/9pfs/9p-local.c | 1 +
> hw/block/cdrom.c | 1 +
> hw/block/hd-geometry.c | 1 +
> hw/net/can/ctucan_core.c | 1 +
> hw/nvram/xlnx-efuse.c | 1 +
> hw/scsi/scsi-generic.c | 1 +
> hw/sd/sd.c | 1 +
> hw/sd/ssi-sd.c | 1 +
> net/l2tpv3.c | 1 +
> qga/commands-linux.c | 1 +
> scsi/pr-manager-helper.c | 1 +
> target/arm/tcg/arith_helper.c | 1 +
> tests/qtest/acpi-utils.c | 1 +
> tests/qtest/aspeed-hace-utils.c | 1 +
> tests/qtest/bios-tables-test.c | 1 +
> tests/qtest/libqos/igb.c | 1 +
> tests/qtest/libqos/virtio-9p-client.c | 1 +
> tests/qtest/migration/framework.c | 1 +
> tests/qtest/npcm7xx_emc-test.c | 1 +
> tests/qtest/tpm-emu.c | 1 +
> tests/qtest/ufs-test.c | 1 +
> tests/qtest/vmgenid-test.c | 1 +
> tests/unit/test-hbitmap.c | 1 +
> util/bitmap.c | 1 +
> 31 files changed, 31 insertions(+)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v6 02/18] bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h'
2026-01-18 19:34 ` [PATCH v6 02/18] bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h' Philippe Mathieu-Daudé
@ 2026-01-18 23:11 ` Richard Henderson
0 siblings, 0 replies; 24+ messages in thread
From: Richard Henderson @ 2026-01-18 23:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Xu, Paolo Bonzini, Anton Johansson, Manos Pitsidianakis,
Pierrick Bouvier
On 1/19/26 06:34, Philippe Mathieu-Daudé wrote:
> These files only require "qemu/bswap.h", not "qemu/host-utils.h".
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> tests/qtest/ahci-test.c | 2 +-
> tests/qtest/libqos/ahci.c | 2 +-
> tests/qtest/libqos/generic-pcihost.c | 2 +-
> tests/qtest/libqos/pci-spapr.c | 2 +-
> util/hbitmap.c | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v6 03/18] bswap: Remove unnecessary 'qemu/bswap.h'
2026-01-18 19:34 ` [PATCH v6 03/18] bswap: Remove unnecessary 'qemu/bswap.h' Philippe Mathieu-Daudé
@ 2026-01-18 23:12 ` Richard Henderson
0 siblings, 0 replies; 24+ messages in thread
From: Richard Henderson @ 2026-01-18 23:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Xu, Paolo Bonzini, Anton Johansson, Manos Pitsidianakis,
Pierrick Bouvier
On 1/19/26 06:34, Philippe Mathieu-Daudé wrote:
> "qemu/host-utils.h" and "qemu/int128.h" are included a lot in
> the tree, and don't use any definition from "qemu/bswap.h"...
> Since it contains a lot of inlined functions, remove it to
> reduce pointless compilation cycles.
>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> include/qemu/host-utils.h | 1 -
> include/qemu/int128.h | 2 --
> 2 files changed, 3 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v6 04/18] system/memory: Introduce ldm_p() and stm_p() load/store helpers
2026-01-18 19:34 ` [PATCH v6 04/18] system/memory: Introduce ldm_p() and stm_p() load/store helpers Philippe Mathieu-Daudé
@ 2026-01-18 23:14 ` Richard Henderson
0 siblings, 0 replies; 24+ messages in thread
From: Richard Henderson @ 2026-01-18 23:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Xu, Paolo Bonzini, Anton Johansson, Manos Pitsidianakis,
Pierrick Bouvier
On 1/19/26 06:34, Philippe Mathieu-Daudé wrote:
> Introduce load/store helpers which take a MemOp argument.
>
> Inspired-by: Paolo Bonzini<pbonzini@redhat.com>
> Suggested-by: Richard Henderson<richard.henderson@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> Possible optimization:
> https://lore.kernel.org/qemu-devel/546f3a4b-64ff-4f63-bb07-f5cb52b6c64c@redhat.com/
> ---
> include/qemu/bswap.h | 72 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 72 insertions(+)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
` (17 preceding siblings ...)
2026-01-18 19:35 ` [PATCH v6 18/18] system: Allow restricting the legacy DEVICE_NATIVE_ENDIAN definition Philippe Mathieu-Daudé
@ 2026-01-21 20:56 ` Philippe Mathieu-Daudé
18 siblings, 0 replies; 24+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-01-21 20:56 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Xu, Paolo Bonzini, Richard Henderson, Anton Johansson,
Manos Pitsidianakis, Pierrick Bouvier
On 18/1/26 20:34, Philippe Mathieu-Daudé wrote:
> Philippe Mathieu-Daudé (18):
> bswap: Include missing 'qemu/bswap.h' header
> bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h'
> bswap: Remove unnecessary 'qemu/bswap.h'
> system/memory: Introduce ldm_p() and stm_p() load/store helpers
> system/memory: Define address_space_ldst[W] endian variants via
> template
> system/memory: Define address_space_ldst[L] endian variants via
> template
> system/memory: Define address_space_ldst[Q] endian variants via
> template
> system/memory: Factor address_space_ldst[M]_internal() helper out
> system/memory: Pass device_endian argument as MemOp bit
> system/memory: Use ldm_p() and stm_p() helpers
> system/memory: Directly call address_space_ldst[M]_internal() helper
> system: Allow restricting the legacy ld/st_phys() 'native-endian' API
> system: Allow restricting legacy address_space_ldst() native-endian
> API
> system: Allow restricting the legacy cpu_ld/st() 'native-endian' API
> system: Allow restricting the legacy translator_ld() 'native-endian'
> API
> system: Allow restricting the legacy tswap() 'native-endian' API
> system: Allow restricting the legacy MO_TE* 'native-endian'
> definitions
> system: Allow restricting the legacy DEVICE_NATIVE_ENDIAN definition
Series queued, thanks.
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2026-01-21 20:56 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-18 19:34 [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 01/18] bswap: Include missing 'qemu/bswap.h' header Philippe Mathieu-Daudé
2026-01-18 23:11 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 02/18] bswap: Use 'qemu/bswap.h' instead of 'qemu/host-utils.h' Philippe Mathieu-Daudé
2026-01-18 23:11 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 03/18] bswap: Remove unnecessary 'qemu/bswap.h' Philippe Mathieu-Daudé
2026-01-18 23:12 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 04/18] system/memory: Introduce ldm_p() and stm_p() load/store helpers Philippe Mathieu-Daudé
2026-01-18 23:14 ` Richard Henderson
2026-01-18 19:34 ` [PATCH v6 05/18] system/memory: Define address_space_ldst[W] endian variants via template Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 06/18] system/memory: Define address_space_ldst[L] " Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 07/18] system/memory: Define address_space_ldst[Q] " Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 08/18] system/memory: Factor address_space_ldst[M]_internal() helper out Philippe Mathieu-Daudé
2026-01-18 19:34 ` [PATCH v6 09/18] system/memory: Pass device_endian argument as MemOp bit Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 10/18] system/memory: Use ldm_p() and stm_p() helpers Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 11/18] system/memory: Directly call address_space_ldst[M]_internal() helper Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 12/18] system: Allow restricting the legacy ld/st_phys() 'native-endian' API Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 13/18] system: Allow restricting legacy address_space_ldst() native-endian API Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 14/18] system: Allow restricting the legacy cpu_ld/st() 'native-endian' API Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 15/18] system: Allow restricting the legacy translator_ld() " Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 16/18] system: Allow restricting the legacy tswap() " Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 17/18] system: Allow restricting the legacy MO_TE* 'native-endian' definitions Philippe Mathieu-Daudé
2026-01-18 19:35 ` [PATCH v6 18/18] system: Allow restricting the legacy DEVICE_NATIVE_ENDIAN definition Philippe Mathieu-Daudé
2026-01-21 20:56 ` [PATCH v6 00/18] system/memory: Clean ups around address_space_ldst() endian variants Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox