By running the grep command `git grep -nr 'define \(fpscr\|msr\)_[a-z0-9]\+\>'` we can find multiple macros that use `env->fpscr` and `env->msr` but doesn't take *env as a parameter.
Richard Henderson said [1] that these macros hiding the usage of *env "are evil". This patch series remove them and substitute with an explicit usage of *env by adding macros in the same style of FP_* ones (e.g. FP_FI defined in cpu.h). Patch 20 (target/ppc: Add unused M_MSR_* macros) implements unused macros, the same that were removed in patch 02 (target/ppc: Remove unused msr_* macros). I did that to keep the changes consistent with what was already present before. [1]: https://lists.gnu.org/archive/html/qemu-ppc/2021-11/msg00280.html Víctor Colombo (20): target/ppc: Remove fpscr_* macros from cpu.h target/ppc: Remove unused msr_* macros target/ppc: Substitute msr_pr macro with new M_MSR_PR macro target/ppc: Substitute msr_le macro with new M_MSR_LE macro target/ppc: Substitute msr_ds macro with new M_MSR_DS macro target/ppc: Substitute msr_ile macro with new M_MSR_ILE macro target/ppc: Substitute msr_ee macro with new M_MSR_EE macro target/ppc: Substitute msr_ce macro with new M_MSR_CE macro target/ppc: Substitute msr_pow macro with new M_MSR_POW macro target/ppc: Substitute msr_me macro with new M_MSR_ME macro target/ppc: Substitute msr_gs macro with new M_MSR_GS macro target/ppc: Substitute msr_fp macro with new M_MSR_FP macro target/ppc: Substitute msr_cm macro with new M_MSR_CM macro target/ppc: Substitute msr_ir macro with new M_MSR_IR macro target/ppc: Substitute msr_dr macro with new M_MSR_DR macro target/ppc: Substitute msr_ep macro with new M_MSR_EP macro target/ppc: Substitute msr_fe macro with new M_MSR_FE macro target/ppc: Substitute msr_ts macro with new M_MSR_TS macro target/ppc: Substitute msr_hv macro with new M_MSR_HV macro target/ppc: Add unused M_MSR_* macros hw/ppc/pegasos2.c | 2 +- hw/ppc/spapr.c | 2 +- target/ppc/cpu.c | 2 +- target/ppc/cpu.h | 125 ++++++++++++++++----------------------- target/ppc/cpu_init.c | 21 ++++--- target/ppc/excp_helper.c | 53 +++++++++-------- target/ppc/fpu_helper.c | 28 ++++----- target/ppc/gdbstub.c | 2 +- target/ppc/helper_regs.c | 12 ++-- target/ppc/kvm.c | 7 ++- target/ppc/machine.c | 2 +- target/ppc/mem_helper.c | 23 +++---- target/ppc/misc_helper.c | 2 +- target/ppc/mmu-radix64.c | 10 ++-- target/ppc/mmu_common.c | 38 ++++++------ target/ppc/mmu_helper.c | 6 +- 16 files changed, 161 insertions(+), 174 deletions(-) -- 2.25.1
