While the primary use of mmu_index is for the softmmu index for system-mode tcg, it has a secondary use in encoding cpu state for the page table walker, and thus depending on the target may also be used by memory_rw_debug with kvm et al.
This is why I placed the hook in CPUClass not TCGCPUOps. r~ Richard Henderson (33): include/hw/core: Add mmu_index to CPUClass target/alpha: Split out alpha_env_mmu_index target/alpha: Populate CPUClass.mmu_index target/arm: Split out arm_env_mmu_index target/arm: Populate CPUClass.mmu_index target/avr: Populate CPUClass.mmu_index target/cris: Cache mem_index in DisasContext target/cris: Populate CPUClass.mmu_index target/hppa: Populate CPUClass.mmu_index target/i386: Populate CPUClass.mmu_index target/loongarch: Populate CPUClass.mmu_index target/loongarch: Rename MMU_IDX_* target/m68k: Populate CPUClass.mmu_index target/microblaze: Populate CPUClass.mmu_index target/mips: Pass ptw_mmu_idx down from mips_cpu_tlb_fill target/mips: Split out mips_env_mmu_index target/mips: Populate CPUClass.mmu_index target/nios2: Populate CPUClass.mmu_index target/openrisc: Populate CPUClass.mmu_index target/ppc: Split out ppc_env_mmu_index target/ppc: Populate CPUClass.mmu_index target/riscv: Rename riscv_cpu_mmu_index to riscv_env_mmu_index target/riscv: Replace cpu_mmu_index with riscv_env_mmu_index target/riscv: Populate CPUClass.mmu_index target/rx: Populate CPUClass.mmu_index target/s390x: Split out s390x_env_mmu_index target/s390x: Populate CPUClass.mmu_index target/sh4: Populate CPUClass.mmu_index target/sparc: Populate CPUClass.mmu_index target/tricore: Populate CPUClass.mmu_index target/xtensa: Populate CPUClass.mmu_index include/exec: Implement cpu_mmu_index generically include/exec: Change cpu_mmu_index argument to CPUState include/exec/cpu-all.h | 4 ++ include/exec/cpu-common.h | 18 ++++++++ include/hw/core/cpu.h | 3 ++ target/alpha/cpu.h | 2 +- target/arm/cpu.h | 13 ------ target/arm/internals.h | 5 +++ target/avr/cpu.h | 7 ---- target/cris/cpu.h | 4 -- target/hexagon/cpu.h | 9 ---- target/hppa/cpu.h | 13 ------ target/i386/cpu.h | 7 ---- target/loongarch/cpu.h | 18 ++------ target/m68k/cpu.h | 4 -- target/microblaze/cpu.h | 15 ------- target/mips/cpu.h | 6 ++- target/nios2/cpu.h | 6 --- target/openrisc/cpu.h | 12 ------ target/ppc/cpu.h | 2 +- target/riscv/cpu.h | 4 +- target/rx/cpu.h | 5 --- target/s390x/cpu.h | 2 +- target/sh4/cpu.h | 10 ----- target/sparc/cpu.h | 30 +------------ target/tricore/cpu.h | 5 --- target/xtensa/cpu.h | 5 --- accel/tcg/cputlb.c | 22 ++++++---- semihosting/uaccess.c | 2 +- target/alpha/cpu.c | 6 +++ target/alpha/translate.c | 2 +- target/arm/cpu.c | 6 +++ target/arm/helper.c | 2 +- target/arm/tcg/helper-a64.c | 4 +- target/arm/tcg/mte_helper.c | 18 ++++---- target/arm/tcg/sve_helper.c | 8 ++-- target/arm/tcg/tlb_helper.c | 2 +- target/avr/cpu.c | 6 +++ target/cris/cpu.c | 6 +++ target/cris/translate.c | 14 +++---- target/hppa/cpu.c | 12 ++++++ target/hppa/mem_helper.c | 2 +- target/hppa/op_helper.c | 8 ++-- target/i386/cpu.c | 10 +++++ target/i386/tcg/translate.c | 2 +- target/loongarch/cpu.c | 11 +++++ target/loongarch/tcg/tlb_helper.c | 8 ++-- target/loongarch/tcg/translate.c | 2 +- target/m68k/cpu.c | 6 +++ target/m68k/op_helper.c | 2 +- target/microblaze/cpu.c | 18 +++++++- target/microblaze/helper.c | 3 +- target/microblaze/mmu.c | 2 +- target/microblaze/translate.c | 2 +- target/mips/cpu.c | 6 +++ target/mips/sysemu/physaddr.c | 2 +- target/mips/tcg/msa_helper.c | 10 ++--- target/mips/tcg/sysemu/cp0_helper.c | 2 +- target/mips/tcg/sysemu/special_helper.c | 2 +- target/mips/tcg/sysemu/tlb_helper.c | 34 +++++++-------- target/nios2/cpu.c | 7 ++++ target/nios2/translate.c | 2 +- target/openrisc/cpu.c | 13 ++++++ target/openrisc/translate.c | 2 +- target/ppc/cpu_init.c | 8 +++- target/ppc/mem_helper.c | 10 ++--- target/ppc/mmu_common.c | 4 +- target/riscv/cpu.c | 6 +++ target/riscv/cpu_helper.c | 6 +-- target/riscv/op_helper.c | 4 +- target/riscv/vector_helper.c | 9 ++-- target/rx/cpu.c | 6 +++ target/s390x/cpu.c | 6 +++ target/s390x/tcg/mem_helper.c | 34 ++++++++------- target/sh4/cpu.c | 16 +++++++ target/sparc/cpu.c | 29 +++++++++++++ target/sparc/ldst_helper.c | 2 +- target/sparc/mmu_helper.c | 2 +- target/tricore/cpu.c | 6 +++ target/tricore/helper.c | 2 +- target/tricore/translate.c | 2 +- target/xtensa/cpu.c | 6 +++ target/xtensa/mmu_helper.c | 2 +- accel/tcg/ldst_common.c.inc | 42 ++++++++++++------- target/cris/translate_v10.c.inc | 6 +-- .../tcg/insn_trans/trans_privileged.c.inc | 2 +- 84 files changed, 377 insertions(+), 308 deletions(-) -- 2.34.1
