[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 79/90] target/sparc: Move FiTOd, FsTOd, FsTOx to decodetree
From: |
Richard Henderson |
Subject: |
[PATCH v2 79/90] target/sparc: Move FiTOd, FsTOd, FsTOx to decodetree |
Date: |
Mon, 16 Oct 2023 23:12:33 -0700 |
Note that gen_ne_fop_DF was incorrectly named and does pass env.
The two sets of helpers should have been unified.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/sparc/insns.decode | 3 ++
target/sparc/translate.c | 67 ++++++++++++++++-----------------------
2 files changed, 30 insertions(+), 40 deletions(-)
diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode
index a0af20f042..1965084fb8 100644
--- a/target/sparc/insns.decode
+++ b/target/sparc/insns.decode
@@ -255,11 +255,14 @@ FDIVd 10 ..... 110100 ..... 0 0100 1110 .....
@r_r_r
FDIVq 10 ..... 110100 ..... 0 0100 1111 ..... @r_r_r
FsMULd 10 ..... 110100 ..... 0 0110 1001 ..... @r_r_r
FdMULq 10 ..... 110100 ..... 0 0110 1110 ..... @r_r_r
+FsTOx 10 ..... 110100 00000 0 1000 0001 ..... @r_r2
FdTOx 10 ..... 110100 00000 0 1000 0010 ..... @r_r2
FxTOs 10 ..... 110100 00000 0 1000 0100 ..... @r_r2
FxTOd 10 ..... 110100 00000 0 1000 1000 ..... @r_r2
FiTOs 10 ..... 110100 00000 0 1100 0100 ..... @r_r2
FdTOs 10 ..... 110100 00000 0 1100 0110 ..... @r_r2
+FiTOd 10 ..... 110100 00000 0 1100 1000 ..... @r_r2
+FsTOd 10 ..... 110100 00000 0 1100 1001 ..... @r_r2
FsTOi 10 ..... 110100 00000 0 1101 0001 ..... @r_r2
FdTOi 10 ..... 110100 00000 0 1101 0010 ..... @r_r2
diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index acb9e58319..395674d901 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -54,6 +54,7 @@
#define gen_helper_saved ({ qemu_build_not_reached(); NULL; })
#define gen_helper_restored ({ qemu_build_not_reached(); NULL; })
#define gen_helper_fdtox ({ qemu_build_not_reached(); NULL; })
+#define gen_helper_fstox ({ qemu_build_not_reached(); NULL; })
#define gen_helper_fxtod ({ qemu_build_not_reached(); NULL; })
#define gen_helper_fxtos ({ qemu_build_not_reached(); NULL; })
#define gen_helper_fnegd(D, S) qemu_build_not_reached()
@@ -1625,37 +1626,6 @@ static void gen_ne_fop_QQ(DisasContext *dc, int rd, int
rs,
}
#endif
-#ifdef TARGET_SPARC64
-static void gen_fop_DF(DisasContext *dc, int rd, int rs,
- void (*gen)(TCGv_i64, TCGv_ptr, TCGv_i32))
-{
- TCGv_i64 dst;
- TCGv_i32 src;
-
- src = gen_load_fpr_F(dc, rs);
- dst = gen_dest_fpr_D(dc, rd);
-
- gen(dst, tcg_env, src);
- gen_helper_check_ieee_exceptions(cpu_fsr, tcg_env);
-
- gen_store_fpr_D(dc, rd, dst);
-}
-#endif
-
-static void gen_ne_fop_DF(DisasContext *dc, int rd, int rs,
- void (*gen)(TCGv_i64, TCGv_ptr, TCGv_i32))
-{
- TCGv_i64 dst;
- TCGv_i32 src;
-
- src = gen_load_fpr_F(dc, rs);
- dst = gen_dest_fpr_D(dc, rd);
-
- gen(dst, tcg_env, src);
-
- gen_store_fpr_D(dc, rd, dst);
-}
-
static void gen_fop_FQ(DisasContext *dc, int rd, int rs,
void (*gen)(TCGv_i32, TCGv_ptr))
{
@@ -4855,6 +4825,29 @@ TRANS(FSQRTd, ALL, do_env_dd, a, gen_helper_fsqrtd)
TRANS(FxTOd, 64, do_env_dd, a, gen_helper_fxtod)
TRANS(FdTOx, 64, do_env_dd, a, gen_helper_fdtox)
+static bool do_env_df(DisasContext *dc, arg_r_r *a,
+ void (*func)(TCGv_i64, TCGv_env, TCGv_i32))
+{
+ TCGv_i64 dst;
+ TCGv_i32 src;
+
+ if (gen_trap_ifnofpu(dc)) {
+ return true;
+ }
+
+ gen_op_clear_ieee_excp_and_FTT();
+ dst = gen_dest_fpr_D(dc, a->rd);
+ src = gen_load_fpr_F(dc, a->rs);
+ func(dst, tcg_env, src);
+ gen_helper_check_ieee_exceptions(cpu_fsr, tcg_env);
+ gen_store_fpr_D(dc, a->rd, dst);
+ return advance_pc(dc);
+}
+
+TRANS(FiTOd, ALL, do_env_df, a, gen_helper_fitod)
+TRANS(FsTOd, ALL, do_env_df, a, gen_helper_fstod)
+TRANS(FsTOx, 64, do_env_df, a, gen_helper_fstox)
+
static bool do_env_qq(DisasContext *dc, arg_r_r *a,
void (*func)(TCGv_env))
{
@@ -5154,17 +5147,14 @@ static void disas_sparc_legacy(DisasContext *dc,
unsigned int insn)
case 0xc6: /* fdtos */
case 0xd2: /* fdtoi */
case 0x84: /* V9 fxtos */
+ case 0xc8: /* fitod */
+ case 0xc9: /* fstod */
+ case 0x81: /* V9 fstox */
g_assert_not_reached(); /* in decodetree */
case 0xc7: /* fqtos */
CHECK_FPU_FEATURE(dc, FLOAT128);
gen_fop_FQ(dc, rd, rs2, gen_helper_fqtos);
break;
- case 0xc8: /* fitod */
- gen_ne_fop_DF(dc, rd, rs2, gen_helper_fitod);
- break;
- case 0xc9: /* fstod */
- gen_ne_fop_DF(dc, rd, rs2, gen_helper_fstod);
- break;
case 0xcb: /* fqtod */
CHECK_FPU_FEATURE(dc, FLOAT128);
gen_fop_DQ(dc, rd, rs2, gen_helper_fqtod);
@@ -5198,9 +5188,6 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned
int insn)
CHECK_FPU_FEATURE(dc, FLOAT128);
gen_ne_fop_QQ(dc, rd, rs2, gen_helper_fabsq);
break;
- case 0x81: /* V9 fstox */
- gen_fop_DF(dc, rd, rs2, gen_helper_fstox);
- break;
case 0x83: /* V9 fqtox */
CHECK_FPU_FEATURE(dc, FLOAT128);
gen_fop_DQ(dc, rd, rs2, gen_helper_fqtox);
--
2.34.1
- [PATCH v2 64/90] target/sparc: Move FMOVD, FNEGD, FABSD, FSRC*D, FNOT*D to decodetree, (continued)
- [PATCH v2 64/90] target/sparc: Move FMOVD, FNEGD, FABSD, FSRC*D, FNOT*D to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 63/90] target/sparc: Move FMOVS, FNEGS, FABSS, FSRC*S, FNOT*S to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 59/90] target/sparc: Move EDGE* to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 60/90] target/sparc: Move ARRAY* to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 65/90] target/sparc: Use tcg_gen_vec_{add,sub}*, Richard Henderson, 2023/10/17
- [PATCH v2 68/90] target/sparc: Move PDIST to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 70/90] target/sparc: Move gen_fop_FF insns to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 73/90] target/sparc: Move gen_fop_FFF insns to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 75/90] target/sparc: Move gen_fop_QQQ insns to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 69/90] target/sparc: Move gen_gsr_fop_DDD insns to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 79/90] target/sparc: Move FiTOd, FsTOd, FsTOx to decodetree,
Richard Henderson <=
- [PATCH v2 72/90] target/sparc: Move FSQRTq to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 74/90] target/sparc: Move gen_fop_DDD insns to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 78/90] target/sparc: Move gen_fop_FD insns to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 76/90] target/sparc: Move FSMULD to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 77/90] target/sparc: Move FDMULQ to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 90/90] target/sparc: Remove disas_sparc_legacy, Richard Henderson, 2023/10/17
- [PATCH v2 81/90] target/sparc: Move FqTOd, FqTOx to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 84/90] target/sparc: Move FMOVq, FNEGq, FABSq to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 89/90] target/sparc: Convert FZERO, FONE to decodetree, Richard Henderson, 2023/10/17
- [PATCH v2 83/90] target/sparc: Move FdTOq, FxTOq to decodetree, Richard Henderson, 2023/10/17