Skip to content

Start replacing target_ulong with vaddr

Anton Johansson via qemu-devel 3 versions – Applied

Status from this message: Queued to tcg-next, thanks.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest12 patches 3 repliesApplied
  2. v212 patches 9 repliesSuperseded
  3. v18 patches 20 repliesSuperseded

Changes in v3 from the cover letter

- Rebased on master

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/12accel: Replace target_ulong in tlb_*()accel/stubs/tcg-stub.c accel/tcg/cputlb.c accel/tcg/tb-maint.c +3 more+131 -1350 replies
2/12accel/tcg/translate-all.c: Widen pc and cs_baseaccel/tcg/internal.h accel/tcg/translate-all.c+8 -80 replies
3/12target: Widen pc/cs_base in cpu_get_tb_cpu_stateaccel/tcg/cpu-exec.c accel/tcg/translate-all.c target/alpha/cpu.h +23 more+58 -580 replies
4/12accel/tcg/cputlb.c: Widen CPUTLBEntry access functionsaccel/tcg/cputlb.c include/exec/cpu_ldst.h+9 -90 replies
5/12accel/tcg/cputlb.c: Widen addr in MMULookupPageDataaccel/tcg/cputlb.c+15 -150 replies
6/12accel/tcg/cpu-exec.c: Widen pc to vaddraccel/tcg/cpu-exec.c+17 -170 replies
7/12accel/tcg: Widen pc to vaddr in CPUJumpCacheaccel/tcg/cputlb.c accel/tcg/tb-hash.h accel/tcg/tb-jmp-cache.h+8 -80 replies
8/12accel: Replace target_ulong with vaddr in probe_*()accel/stubs/tcg-stub.c accel/tcg/cputlb.c accel/tcg/user-exec.c +1 more+19 -190 replies
9/12accel/tcg: Replace target_ulong with vaddr in *_mmu_lookup()accel/tcg/cputlb.c accel/tcg/user-exec.c+6 -60 replies
10/12accel/tcg: Replace target_ulong with vaddr in translator_*()accel/tcg/translator.c include/exec/translator.h+8 -80 replies
11/12accel/tcg: Replace target_ulong with vaddr in page_*()accel/tcg/user-exec.c include/exec/cpu-all.h include/exec/translate-all.h+27 -292 replies
12/12cpu: Replace target_ulong with hwaddr in tb_invalidate_phys_addr()cpu.c include/exec/exec-all.h+2 -20 replies

Reviews trailers per patch

All 12 patches have a Reviewed-by or Acked-by.

PatchRichard Henderson
1/12R-b
2/12R-b
3/12R-b
4/12R-b
5/12R-b
6/12R-b
7/12R-b
8/12R-b
9/12R-b
10/12R-b
11/12R-b
12/12R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 00/12] Start replacing target_ulong with vaddr

This is a first patchset in removing target_ulong from non-target/ directories. As use of target_ulong is spread accross the codebase we are attempting to target as few maintainers as possible with each patchset in order to ease reviewing.

The following instances of target_ulong remain in accel/ and tcg/
- atomic helpers (atomic_common.c.inc), cpu_atomic_*() (atomic_template.h,) and cpu_[st|ld]*() (cputlb.c/ldst_common.c.inc) are only used in target/ and can be pulled out into a separate target-specific file;

- walk_memory_regions() is used in user-exec.c and linux-user/elfload.c;

- kvm_find_sw_breakpoint() in kvm-all.c used in target/;

Changes in v2:
- addr argument in tb_invalidate_phys_addr() changed from vaddr to hwaddr;

- Removed previous patch:

"[PATCH 4/8] accel/tcg: Replace target_ulong with vaddr in helper_unaligned_*()"

as these functions are removed by Richard's patches;

- First patch:

"[PATCH 1/8] accel: Replace target_ulong with vaddr in TB/TLB"

has been split into patches 1-7 to ease reviewing;

- Pulled in target/ changes to cpu_get_tb_cpu_state() into this patchset. This was done to avoid pointer casts to target_ulong * which would break for 32-bit targets on a 64-bit BE host;

Note the small target/ changes are collected in a single patch to not break bisection. If it's still desirable to split based on maintainer, let me know;

- last argument of pageflags_[find|next] changed from target_long to vaddr. This change was left out of the last patchset due to triggering a "Bad ram pointer" error (softmmu/physmem.c:2273) when running make check for a i386-softmmu target.

I was not able to recreate this on master or post rebase on Richard's tcg-once branch.

Changes in v3:
- Rebased on master

Finally, the grand goal is to allow for heterogeneous QEMU binaries consisting of multiple frontends.

RFC: https://lists.nongnu.org/archive/html/qemu-devel/2022-12/msg04518.html

Anton Johansson (12):
accel: Replace target_ulong in tlb_*() accel/tcg/translate-all.c: Widen pc and cs_base
target: Widen pc/cs_base in cpu_get_tb_cpu_state accel/tcg/cputlb.c: Widen CPUTLBEntry access functions accel/tcg/cputlb.c: Widen addr in MMULookupPageData accel/tcg/cpu-exec.c: Widen pc to vaddr
accel/tcg: Widen pc to vaddr in CPUJumpCache
accel: Replace target_ulong with vaddr in probe_*() accel/tcg: Replace target_ulong with vaddr in *_mmu_lookup() accel/tcg: Replace target_ulong with vaddr in translator_*() accel/tcg: Replace target_ulong with vaddr in page_*()
cpu: Replace target_ulong with hwaddr in tb_invalidate_phys_addr()

 accel/stubs/tcg-stub.c       |   6 +-
 accel/tcg/cpu-exec.c         |  43 ++++---
 accel/tcg/cputlb.c           | 233 +++++++++++++++++------------------
 accel/tcg/internal.h         |   6 +-
 accel/tcg/tb-hash.h          |  12 +-
 accel/tcg/tb-jmp-cache.h     |   2 +-
 accel/tcg/tb-maint.c         |   2 +-
 accel/tcg/translate-all.c    |  13 +-
 accel/tcg/translator.c       |  10 +-
 accel/tcg/user-exec.c        |  58 +++++----
 cpu.c                        |   2 +-
 include/exec/cpu-all.h       |  10 +-
 include/exec/cpu-defs.h      |   4 +-
 include/exec/cpu_ldst.h      |  10 +-
 include/exec/exec-all.h      |  95 +++++++-------
 include/exec/translate-all.h |   2 +-
 include/exec/translator.h    |   6 +-
 include/qemu/plugin-memory.h |   2 +-
 target/alpha/cpu.h           |   4 +-
 target/arm/cpu.h             |   4 +-
 target/arm/helper.c          |   4 +-
 target/avr/cpu.h             |   4 +-
 target/cris/cpu.h            |   4 +-
 target/hexagon/cpu.h         |   4 +-
 target/hppa/cpu.h            |   5 +-
 target/i386/cpu.h            |   4 +-
 target/loongarch/cpu.h       |   6 +-
 target/m68k/cpu.h            |   4 +-
 target/microblaze/cpu.h      |   4 +-
 target/mips/cpu.h            |   4 +-
 target/nios2/cpu.h           |   4 +-
 target/openrisc/cpu.h        |   5 +-
 target/ppc/cpu.h             |   8 +-
 target/ppc/helper_regs.c     |   4 +-
 target/riscv/cpu.h           |   4 +-
 target/riscv/cpu_helper.c    |   4 +-
 target/rx/cpu.h              |   4 +-
 target/s390x/cpu.h           |   4 +-
 target/sh4/cpu.h             |   4 +-
 target/sparc/cpu.h           |   4 +-
 target/tricore/cpu.h         |   4 +-
 target/xtensa/cpu.h          |   4 +-
 42 files changed, 307 insertions(+), 313 deletions(-)

--
2.41.0