target/ppc: Rename spr_tcg.h to spr_common.h

Initial intent for the spr_tcg header was to expose the spr_read|write
callbacks that are only used by TCG code. However, although these
routines are TCG-specific, the KVM code needs access to env->sprs
which creation is currently coupled to the callback registration.

We are probably not going to decouple SPR creation and TCG callback
registration any time soon, so let's rename the header to spr_common
to accomodate the register_*_sprs functions that will be moved out of
cpu_init.c in the following patches.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20220216162426.1885923-24-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 452dbdda4db6526b1ab49d10d1160db8d917bb1a..f0bbe340e4fd98dfd981f2f513288b5d337dcd6a 100644 (file)
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -44,7 +44,7 @@
 
 #include "helper_regs.h"
 #include "internal.h"
-#include "spr_tcg.h"
+#include "spr_common.h"
 #include "power8-pmu.h"
 
 /* #define PPC_DEBUG_SPR */

diff --git a/target/ppc/spr_common.h b/target/ppc/spr_common.h
new file mode 100644 (file)
index 0000000..5aec76a
--- /dev/null
+++ b/target/ppc/spr_common.h
@@ -0,0 +1,144 @@
+/*
+ *  PowerPC emulation for qemu: read/write callbacks for SPRs
+ *
+ *  Copyright (C) 2021 Instituto de Pesquisas Eldorado
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef SPR_COMMON_H
+#define SPR_COMMON_H
+
+#define SPR_NOACCESS (&spr_noaccess)
+
+/* prototypes for readers and writers for SPRs */
+void spr_noaccess(DisasContext *ctx, int gprn, int sprn);
+void spr_read_generic(DisasContext *ctx, int gprn, int sprn);
+void spr_write_generic(DisasContext *ctx, int sprn, int gprn);
+void spr_write_MMCR0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_MMCR1(DisasContext *ctx, int sprn, int gprn);
+void spr_write_PMC(DisasContext *ctx, int sprn, int gprn);
+void spr_write_CTRL(DisasContext *ctx, int sprn, int gprn);
+void spr_read_xer(DisasContext *ctx, int gprn, int sprn);
+void spr_write_xer(DisasContext *ctx, int sprn, int gprn);
+void spr_read_lr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_lr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_ctr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_ctr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_ureg(DisasContext *ctx, int gprn, int sprn);
+void spr_read_MMCR0_ureg(DisasContext *ctx, int gprn, int sprn);
+void spr_read_MMCR2_ureg(DisasContext *ctx, int gprn, int sprn);
+void spr_read_PMC(DisasContext *ctx, int gprn, int sprn);
+void spr_read_PMC14_ureg(DisasContext *ctx, int gprn, int sprn);
+void spr_read_PMC56_ureg(DisasContext *ctx, int gprn, int sprn);
+void spr_read_tbl(DisasContext *ctx, int gprn, int sprn);
+void spr_read_tbu(DisasContext *ctx, int gprn, int sprn);
+void spr_read_atbl(DisasContext *ctx, int gprn, int sprn);
+void spr_read_atbu(DisasContext *ctx, int gprn, int sprn);
+void spr_read_spefscr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_spefscr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_MMCR0_ureg(DisasContext *ctx, int sprn, int gprn);
+void spr_write_MMCR2_ureg(DisasContext *ctx, int sprn, int gprn);
+void spr_write_PMC14_ureg(DisasContext *ctx, int sprn, int gprn);
+void spr_write_PMC56_ureg(DisasContext *ctx, int sprn, int gprn);
+
+#ifndef CONFIG_USER_ONLY
+void spr_write_generic32(DisasContext *ctx, int sprn, int gprn);
+void spr_write_clear(DisasContext *ctx, int sprn, int gprn);
+void spr_access_nop(DisasContext *ctx, int sprn, int gprn);
+void spr_read_decr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_decr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_tbl(DisasContext *ctx, int sprn, int gprn);
+void spr_write_tbu(DisasContext *ctx, int sprn, int gprn);
+void spr_write_atbl(DisasContext *ctx, int sprn, int gprn);
+void spr_write_atbu(DisasContext *ctx, int sprn, int gprn);
+void spr_read_ibat(DisasContext *ctx, int gprn, int sprn);
+void spr_read_ibat_h(DisasContext *ctx, int gprn, int sprn);
+void spr_write_ibatu(DisasContext *ctx, int sprn, int gprn);
+void spr_write_ibatu_h(DisasContext *ctx, int sprn, int gprn);
+void spr_write_ibatl(DisasContext *ctx, int sprn, int gprn);
+void spr_write_ibatl_h(DisasContext *ctx, int sprn, int gprn);
+void spr_read_dbat(DisasContext *ctx, int gprn, int sprn);
+void spr_read_dbat_h(DisasContext *ctx, int gprn, int sprn);
+void spr_write_dbatu(DisasContext *ctx, int sprn, int gprn);
+void spr_write_dbatu_h(DisasContext *ctx, int sprn, int gprn);
+void spr_write_dbatl(DisasContext *ctx, int sprn, int gprn);
+void spr_write_dbatl_h(DisasContext *ctx, int sprn, int gprn);
+void spr_write_sdr1(DisasContext *ctx, int sprn, int gprn);
+void spr_read_40x_pit(DisasContext *ctx, int gprn, int sprn);
+void spr_write_40x_pit(DisasContext *ctx, int sprn, int gprn);
+void spr_write_40x_dbcr0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_40x_sler(DisasContext *ctx, int sprn, int gprn);
+void spr_write_40x_tcr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_40x_tsr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_40x_pid(DisasContext *ctx, int sprn, int gprn);
+void spr_write_booke_tcr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_booke_tsr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_403_pbr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_403_pbr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_pir(DisasContext *ctx, int sprn, int gprn);
+void spr_write_excp_prefix(DisasContext *ctx, int sprn, int gprn);
+void spr_write_excp_vector(DisasContext *ctx, int sprn, int gprn);
+void spr_read_thrm(DisasContext *ctx, int gprn, int sprn);
+void spr_write_e500_l1csr0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_e500_l1csr1(DisasContext *ctx, int sprn, int gprn);
+void spr_write_e500_l2csr0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_booke206_mmucsr0(DisasContext *ctx, int sprn, int gprn);
+void spr_write_booke_pid(DisasContext *ctx, int sprn, int gprn);
+void spr_write_eplc(DisasContext *ctx, int sprn, int gprn);
+void spr_write_epsc(DisasContext *ctx, int sprn, int gprn);
+void spr_write_mas73(DisasContext *ctx, int sprn, int gprn);
+void spr_read_mas73(DisasContext *ctx, int gprn, int sprn);
+#ifdef TARGET_PPC64
+void spr_read_cfar(DisasContext *ctx, int gprn, int sprn);
+void spr_write_cfar(DisasContext *ctx, int sprn, int gprn);
+void spr_write_ureg(DisasContext *ctx, int sprn, int gprn);
+void spr_read_purr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_purr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_hdecr(DisasContext *ctx, int gprn, int sprn);
+void spr_write_hdecr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_vtb(DisasContext *ctx, int gprn, int sprn);
+void spr_write_vtb(DisasContext *ctx, int sprn, int gprn);
+void spr_write_tbu40(DisasContext *ctx, int sprn, int gprn);
+void spr_write_pidr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_lpidr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_hior(DisasContext *ctx, int gprn, int sprn);
+void spr_write_hior(DisasContext *ctx, int sprn, int gprn);
+void spr_write_ptcr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_pcr(DisasContext *ctx, int sprn, int gprn);
+void spr_read_dpdes(DisasContext *ctx, int gprn, int sprn);
+void spr_write_dpdes(DisasContext *ctx, int sprn, int gprn);
+void spr_write_amr(DisasContext *ctx, int sprn, int gprn);
+void spr_write_uamor(DisasContext *ctx, int sprn, int gprn);
+void spr_write_iamr(DisasContext *ctx, int sprn, int gprn);
+#endif
+#endif
+
+#ifdef TARGET_PPC64
+void spr_read_prev_upper32(DisasContext *ctx, int gprn, int sprn);
+void spr_write_prev_upper32(DisasContext *ctx, int sprn, int gprn);
+void spr_read_tar(DisasContext *ctx, int gprn, int sprn);
+void spr_write_tar(DisasContext *ctx, int sprn, int gprn);
+void spr_read_tm(DisasContext *ctx, int gprn, int sprn);
+void spr_write_tm(DisasContext *ctx, int sprn, int gprn);
+void spr_read_tm_upper32(DisasContext *ctx, int gprn, int sprn);
+void spr_write_tm_upper32(DisasContext *ctx, int sprn, int gprn);
+void spr_read_ebb(DisasContext *ctx, int gprn, int sprn);
+void spr_write_ebb(DisasContext *ctx, int sprn, int gprn);
+void spr_read_ebb_upper32(DisasContext *ctx, int gprn, int sprn);
+void spr_write_ebb_upper32(DisasContext *ctx, int sprn, int gprn);
+void spr_write_hmer(DisasContext *ctx, int sprn, int gprn);
+void spr_write_lpcr(DisasContext *ctx, int sprn, int gprn);
+#endif
+
+#endif

diff --git a/target/ppc/spr_tcg.h b/target/ppc/spr_tcg.h
deleted file mode 100644 (file)
index df2abac..0000000
--- a/target/ppc/spr_tcg.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- *  PowerPC emulation for qemu: read/write callbacks for SPRs
- *
- *  Copyright (C) 2021 Instituto de Pesquisas Eldorado
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef SPR_TCG_H
-#define SPR_TCG_H
-
-#define SPR_NOACCESS (&spr_noaccess)
-
-/* prototypes for readers and writers for SPRs */
-void spr_noaccess(DisasContext *ctx, int gprn, int sprn);
-void spr_read_generic(DisasContext *ctx, int gprn, int sprn);
-void spr_write_generic(DisasContext *ctx, int sprn, int gprn);
-void spr_write_MMCR0(DisasContext *ctx, int sprn, int gprn);
-void spr_write_MMCR1(DisasContext *ctx, int sprn, int gprn);
-void spr_write_PMC(DisasContext *ctx, int sprn, int gprn);
-void spr_write_CTRL(DisasContext *ctx, int sprn, int gprn);
-void spr_read_xer(DisasContext *ctx, int gprn, int sprn);
-void spr_write_xer(DisasContext *ctx, int sprn, int gprn);
-void spr_read_lr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_lr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_ctr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_ctr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_ureg(DisasContext *ctx, int gprn, int sprn);
-void spr_read_MMCR0_ureg(DisasContext *ctx, int gprn, int sprn);
-void spr_read_MMCR2_ureg(DisasContext *ctx, int gprn, int sprn);
-void spr_read_PMC(DisasContext *ctx, int gprn, int sprn);
-void spr_read_PMC14_ureg(DisasContext *ctx, int gprn, int sprn);
-void spr_read_PMC56_ureg(DisasContext *ctx, int gprn, int sprn);
-void spr_read_tbl(DisasContext *ctx, int gprn, int sprn);
-void spr_read_tbu(DisasContext *ctx, int gprn, int sprn);
-void spr_read_atbl(DisasContext *ctx, int gprn, int sprn);
-void spr_read_atbu(DisasContext *ctx, int gprn, int sprn);
-void spr_read_spefscr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_spefscr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_MMCR0_ureg(DisasContext *ctx, int sprn, int gprn);
-void spr_write_MMCR2_ureg(DisasContext *ctx, int sprn, int gprn);
-void spr_write_PMC14_ureg(DisasContext *ctx, int sprn, int gprn);
-void spr_write_PMC56_ureg(DisasContext *ctx, int sprn, int gprn);
-
-#ifndef CONFIG_USER_ONLY
-void spr_write_generic32(DisasContext *ctx, int sprn, int gprn);
-void spr_write_clear(DisasContext *ctx, int sprn, int gprn);
-void spr_access_nop(DisasContext *ctx, int sprn, int gprn);
-void spr_read_decr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_decr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_tbl(DisasContext *ctx, int sprn, int gprn);
-void spr_write_tbu(DisasContext *ctx, int sprn, int gprn);
-void spr_write_atbl(DisasContext *ctx, int sprn, int gprn);
-void spr_write_atbu(DisasContext *ctx, int sprn, int gprn);
-void spr_read_ibat(DisasContext *ctx, int gprn, int sprn);
-void spr_read_ibat_h(DisasContext *ctx, int gprn, int sprn);
-void spr_write_ibatu(DisasContext *ctx, int sprn, int gprn);
-void spr_write_ibatu_h(DisasContext *ctx, int sprn, int gprn);
-void spr_write_ibatl(DisasContext *ctx, int sprn, int gprn);
-void spr_write_ibatl_h(DisasContext *ctx, int sprn, int gprn);
-void spr_read_dbat(DisasContext *ctx, int gprn, int sprn);
-void spr_read_dbat_h(DisasContext *ctx, int gprn, int sprn);
-void spr_write_dbatu(DisasContext *ctx, int sprn, int gprn);
-void spr_write_dbatu_h(DisasContext *ctx, int sprn, int gprn);
-void spr_write_dbatl(DisasContext *ctx, int sprn, int gprn);
-void spr_write_dbatl_h(DisasContext *ctx, int sprn, int gprn);
-void spr_write_sdr1(DisasContext *ctx, int sprn, int gprn);
-void spr_read_40x_pit(DisasContext *ctx, int gprn, int sprn);
-void spr_write_40x_pit(DisasContext *ctx, int sprn, int gprn);
-void spr_write_40x_dbcr0(DisasContext *ctx, int sprn, int gprn);
-void spr_write_40x_sler(DisasContext *ctx, int sprn, int gprn);
-void spr_write_40x_tcr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_40x_tsr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_40x_pid(DisasContext *ctx, int sprn, int gprn);
-void spr_write_booke_tcr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_booke_tsr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_403_pbr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_403_pbr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_pir(DisasContext *ctx, int sprn, int gprn);
-void spr_write_excp_prefix(DisasContext *ctx, int sprn, int gprn);
-void spr_write_excp_vector(DisasContext *ctx, int sprn, int gprn);
-void spr_read_thrm(DisasContext *ctx, int gprn, int sprn);
-void spr_write_e500_l1csr0(DisasContext *ctx, int sprn, int gprn);
-void spr_write_e500_l1csr1(DisasContext *ctx, int sprn, int gprn);
-void spr_write_e500_l2csr0(DisasContext *ctx, int sprn, int gprn);
-void spr_write_booke206_mmucsr0(DisasContext *ctx, int sprn, int gprn);
-void spr_write_booke_pid(DisasContext *ctx, int sprn, int gprn);
-void spr_write_eplc(DisasContext *ctx, int sprn, int gprn);
-void spr_write_epsc(DisasContext *ctx, int sprn, int gprn);
-void spr_write_mas73(DisasContext *ctx, int sprn, int gprn);
-void spr_read_mas73(DisasContext *ctx, int gprn, int sprn);
-#ifdef TARGET_PPC64
-void spr_read_cfar(DisasContext *ctx, int gprn, int sprn);
-void spr_write_cfar(DisasContext *ctx, int sprn, int gprn);
-void spr_write_ureg(DisasContext *ctx, int sprn, int gprn);
-void spr_read_purr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_purr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_hdecr(DisasContext *ctx, int gprn, int sprn);
-void spr_write_hdecr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_vtb(DisasContext *ctx, int gprn, int sprn);
-void spr_write_vtb(DisasContext *ctx, int sprn, int gprn);
-void spr_write_tbu40(DisasContext *ctx, int sprn, int gprn);
-void spr_write_pidr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_lpidr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_hior(DisasContext *ctx, int gprn, int sprn);
-void spr_write_hior(DisasContext *ctx, int sprn, int gprn);
-void spr_write_ptcr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_pcr(DisasContext *ctx, int sprn, int gprn);
-void spr_read_dpdes(DisasContext *ctx, int gprn, int sprn);
-void spr_write_dpdes(DisasContext *ctx, int sprn, int gprn);
-void spr_write_amr(DisasContext *ctx, int sprn, int gprn);
-void spr_write_uamor(DisasContext *ctx, int sprn, int gprn);
-void spr_write_iamr(DisasContext *ctx, int sprn, int gprn);
-#endif
-#endif
-
-#ifdef TARGET_PPC64
-void spr_read_prev_upper32(DisasContext *ctx, int gprn, int sprn);
-void spr_write_prev_upper32(DisasContext *ctx, int sprn, int gprn);
-void spr_read_tar(DisasContext *ctx, int gprn, int sprn);
-void spr_write_tar(DisasContext *ctx, int sprn, int gprn);
-void spr_read_tm(DisasContext *ctx, int gprn, int sprn);
-void spr_write_tm(DisasContext *ctx, int sprn, int gprn);
-void spr_read_tm_upper32(DisasContext *ctx, int gprn, int sprn);
-void spr_write_tm_upper32(DisasContext *ctx, int sprn, int gprn);
-void spr_read_ebb(DisasContext *ctx, int gprn, int sprn);
-void spr_write_ebb(DisasContext *ctx, int sprn, int gprn);
-void spr_read_ebb_upper32(DisasContext *ctx, int gprn, int sprn);
-void spr_write_ebb_upper32(DisasContext *ctx, int sprn, int gprn);
-void spr_write_hmer(DisasContext *ctx, int sprn, int gprn);
-void spr_write_lpcr(DisasContext *ctx, int sprn, int gprn);
-#endif
-
-#endif

diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 2eaffd432a9d1110d79c35f38367d644c75a7d83..ecc5a104e0498341b96a231ad9f891931f90a52d 100644 (file)
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -35,7 +35,7 @@
 #include "exec/translator.h"
 #include "exec/log.h"
 #include "qemu/atomic128.h"
-#include "spr_tcg.h"
+#include "spr_common.h"
 
 #include "qemu/qemu-print.h"
 #include "qapi/error.h"