SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc: Move floating-point arithmetic instructions to decodetree.

Browse Source 
This patch moves the below instructions to decodetree specification :

    f{add, sub, mul, div, re, rsqrte, madd, msub, nmadd, nmsub}[s][.] : A-form
    ft{div, sqrt}                                                     : X-form

With this patch, all the floating-point arithmetic instructions have been
moved to decodetree.
The changes were verified by validating that the tcg ops generated by those
instructions remain the same, which were captured with the '-d in_asm,op' flag.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Chinmay Rath <rathc@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Chinmay Rath 2024-03-15 12:14:22 +05:30 committed by Nicholas Piggin
parent 5747926fec
commit 177fcc06dc
5 changed files with 192 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
target/ppc/fpu_helper.c
View File

@ -673,7 +673,7 @@ static uint64_t do_fmadds(CPUPPCState *env, float64 a, float64 b,
uint64_t helper_##op(CPUPPCState *env, uint64_t arg1, \ uint64_t helper_##op(CPUPPCState *env, uint64_t arg1, \
uint64_t arg2, uint64_t arg3) \ uint64_t arg2, uint64_t arg3) \
{ return do_fmadd(env, arg1, arg2, arg3, madd_flags, GETPC()); } \ { return do_fmadd(env, arg1, arg2, arg3, madd_flags, GETPC()); } \
uint64_t helper_##op##s(CPUPPCState *env, uint64_t arg1, \ uint64_t helper_##op##S(CPUPPCState *env, uint64_t arg1, \
uint64_t arg2, uint64_t arg3) \ uint64_t arg2, uint64_t arg3) \
{ return do_fmadds(env, arg1, arg2, arg3, madd_flags, GETPC()); } { return do_fmadds(env, arg1, arg2, arg3, madd_flags, GETPC()); }
@ -682,10 +682,10 @@ static uint64_t do_fmadds(CPUPPCState *env, float64 a, float64 b,
#define NMADD_FLGS float_muladd_negate_result #define NMADD_FLGS float_muladd_negate_result
#define NMSUB_FLGS (float_muladd_negate_c | float_muladd_negate_result) #define NMSUB_FLGS (float_muladd_negate_c | float_muladd_negate_result)
FPU_FMADD(fmadd, MADD_FLGS) FPU_FMADD(FMADD, MADD_FLGS)
FPU_FMADD(fnmadd, NMADD_FLGS) FPU_FMADD(FNMADD, NMADD_FLGS)
FPU_FMADD(fmsub, MSUB_FLGS) FPU_FMADD(FMSUB, MSUB_FLGS)
FPU_FMADD(fnmsub, NMSUB_FLGS) FPU_FMADD(FNMSUB, NMSUB_FLGS)
/* frsp - frsp. */ /* frsp - frsp. */
static uint64_t do_frsp(CPUPPCState *env, uint64_t arg, uintptr_t retaddr) static uint64_t do_frsp(CPUPPCState *env, uint64_t arg, uintptr_t retaddr)
@ -778,18 +778,18 @@ float64 helper_##name(CPUPPCState *env, float64 arg1, float64 arg2) \
return ret; \ return ret; \
} }
FPU_FRE(fre, float64_div) FPU_FRE(FRE, float64_div)
FPU_FRE(fres, float64r32_div) FPU_FRE(FRES, float64r32_div)
FPU_FRSQRTE(frsqrte, float64_div) FPU_FRSQRTE(FRSQRTE, float64_div)
FPU_FRSQRTE(frsqrtes, float64r32_div) FPU_FRSQRTE(FRSQRTES, float64r32_div)
FPU_HELPER(fadd, float64_add, addsub_flags_handler) FPU_HELPER(FADD, float64_add, addsub_flags_handler)
FPU_HELPER(fadds, float64r32_add, addsub_flags_handler) FPU_HELPER(FADDS, float64r32_add, addsub_flags_handler)
FPU_HELPER(fsub, float64_sub, addsub_flags_handler) FPU_HELPER(FSUB, float64_sub, addsub_flags_handler)
FPU_HELPER(fsubs, float64r32_sub, addsub_flags_handler) FPU_HELPER(FSUBS, float64r32_sub, addsub_flags_handler)
FPU_HELPER(fmul, float64_mul, mul_flags_handler) FPU_HELPER(FMUL, float64_mul, mul_flags_handler)
FPU_HELPER(fmuls, float64r32_mul, mul_flags_handler) FPU_HELPER(FMULS, float64r32_mul, mul_flags_handler)
FPU_HELPER(fdiv, float64_div, div_flags_handler) FPU_HELPER(FDIV, float64_div, div_flags_handler)
FPU_HELPER(fdivs, float64r32_div, div_flags_handler) FPU_HELPER(FDIVS, float64r32_div, div_flags_handler)
/* fsel - fsel. */ /* fsel - fsel. */
uint64_t helper_FSEL(uint64_t a, uint64_t b, uint64_t c) uint64_t helper_FSEL(uint64_t a, uint64_t b, uint64_t c)
@ -806,7 +806,7 @@ uint64_t helper_FSEL(uint64_t a, uint64_t b, uint64_t c)
} }
} }
uint32_t helper_ftdiv(uint64_t fra, uint64_t frb) uint32_t helper_FTDIV(uint64_t fra, uint64_t frb)
{ {
int fe_flag = 0; int fe_flag = 0;
int fg_flag = 0; int fg_flag = 0;
@ -842,7 +842,7 @@ uint32_t helper_ftdiv(uint64_t fra, uint64_t frb)
return 0x8 | (fg_flag ? 4 : 0) | (fe_flag ? 2 : 0); return 0x8 | (fg_flag ? 4 : 0) | (fe_flag ? 2 : 0);
} }
uint32_t helper_ftsqrt(uint64_t frb) uint32_t helper_FTSQRT(uint64_t frb)
{ {
int fe_flag = 0; int fe_flag = 0;
int fg_flag = 0; int fg_flag = 0;

44
target/ppc/helper.h
View File

@ -110,32 +110,32 @@ DEF_HELPER_2(friz, i64, env, i64)
DEF_HELPER_2(frip, i64, env, i64) DEF_HELPER_2(frip, i64, env, i64)
DEF_HELPER_2(frim, i64, env, i64) DEF_HELPER_2(frim, i64, env, i64)
DEF_HELPER_3(fadd, f64, env, f64, f64) DEF_HELPER_3(FADD, f64, env, f64, f64)
DEF_HELPER_3(fadds, f64, env, f64, f64) DEF_HELPER_3(FADDS, f64, env, f64, f64)
DEF_HELPER_3(fsub, f64, env, f64, f64) DEF_HELPER_3(FSUB, f64, env, f64, f64)
DEF_HELPER_3(fsubs, f64, env, f64, f64) DEF_HELPER_3(FSUBS, f64, env, f64, f64)
DEF_HELPER_3(fmul, f64, env, f64, f64) DEF_HELPER_3(FMUL, f64, env, f64, f64)
DEF_HELPER_3(fmuls, f64, env, f64, f64) DEF_HELPER_3(FMULS, f64, env, f64, f64)
DEF_HELPER_3(fdiv, f64, env, f64, f64) DEF_HELPER_3(FDIV, f64, env, f64, f64)
DEF_HELPER_3(fdivs, f64, env, f64, f64) DEF_HELPER_3(FDIVS, f64, env, f64, f64)
DEF_HELPER_4(fmadd, i64, env, i64, i64, i64) DEF_HELPER_4(FMADD, i64, env, i64, i64, i64)
DEF_HELPER_4(fmsub, i64, env, i64, i64, i64) DEF_HELPER_4(FMSUB, i64, env, i64, i64, i64)
DEF_HELPER_4(fnmadd, i64, env, i64, i64, i64) DEF_HELPER_4(FNMADD, i64, env, i64, i64, i64)
DEF_HELPER_4(fnmsub, i64, env, i64, i64, i64) DEF_HELPER_4(FNMSUB, i64, env, i64, i64, i64)
DEF_HELPER_4(fmadds, i64, env, i64, i64, i64) DEF_HELPER_4(FMADDS, i64, env, i64, i64, i64)
DEF_HELPER_4(fmsubs, i64, env, i64, i64, i64) DEF_HELPER_4(FMSUBS, i64, env, i64, i64, i64)
DEF_HELPER_4(fnmadds, i64, env, i64, i64, i64) DEF_HELPER_4(FNMADDS, i64, env, i64, i64, i64)
DEF_HELPER_4(fnmsubs, i64, env, i64, i64, i64) DEF_HELPER_4(FNMSUBS, i64, env, i64, i64, i64)
DEF_HELPER_2(FSQRT, f64, env, f64) DEF_HELPER_2(FSQRT, f64, env, f64)
DEF_HELPER_2(FSQRTS, f64, env, f64) DEF_HELPER_2(FSQRTS, f64, env, f64)
DEF_HELPER_2(fre, i64, env, i64) DEF_HELPER_2(FRE, i64, env, i64)
DEF_HELPER_2(fres, i64, env, i64) DEF_HELPER_2(FRES, i64, env, i64)
DEF_HELPER_2(frsqrte, i64, env, i64) DEF_HELPER_2(FRSQRTE, i64, env, i64)
DEF_HELPER_2(frsqrtes, i64, env, i64) DEF_HELPER_2(FRSQRTES, i64, env, i64)
DEF_HELPER_FLAGS_3(FSEL, TCG_CALL_NO_RWG_SE, i64, i64, i64, i64) DEF_HELPER_FLAGS_3(FSEL, TCG_CALL_NO_RWG_SE, i64, i64, i64, i64)
DEF_HELPER_FLAGS_2(ftdiv, TCG_CALL_NO_RWG_SE, i32, i64, i64) DEF_HELPER_FLAGS_2(FTDIV, TCG_CALL_NO_RWG_SE, i32, i64, i64)
DEF_HELPER_FLAGS_1(ftsqrt, TCG_CALL_NO_RWG_SE, i32, i64) DEF_HELPER_FLAGS_1(FTSQRT, TCG_CALL_NO_RWG_SE, i32, i64)
#define dh_alias_avr ptr #define dh_alias_avr ptr
#define dh_ctype_avr ppc_avr_t * #define dh_ctype_avr ppc_avr_t *

42
target/ppc/insn32.decode
View File

@ -20,6 +20,12 @@
&A frt fra frb frc rc:bool &A frt fra frb frc rc:bool
@A ...... frt:5 fra:5 frb:5 frc:5 ..... rc:1 &A @A ...... frt:5 fra:5 frb:5 frc:5 ..... rc:1 &A
&A_tab frt fra frb rc:bool
@A_tab ...... frt:5 fra:5 frb:5 ..... ..... rc:1 &A_tab
&A_tac frt fra frc rc:bool
@A_tac ...... frt:5 fra:5 ..... frc:5 ..... rc:1 &A_tac
&A_tb frt frb rc:bool &A_tb frt frb rc:bool
@A_tb ...... frt:5 ..... frb:5 ..... ..... rc:1 &A_tb @A_tb ...... frt:5 ..... frb:5 ..... ..... rc:1 &A_tb
@ -124,6 +130,9 @@
&X_bf bf ra rb &X_bf bf ra rb
@X_bf ...... bf:3 .. ra:5 rb:5 .......... . &X_bf @X_bf ...... bf:3 .. ra:5 rb:5 .......... . &X_bf
&X_bf_b bf rb
@X_bf_b ...... bf:3 .. ..... rb:5 .......... . &X_bf_b
@X_bf_ap_bp ...... bf:3 .. ....0 ....0 .......... . &X_bf ra=%x_frap rb=%x_frbp @X_bf_ap_bp ...... bf:3 .. ....0 ....0 .......... . &X_bf ra=%x_frap rb=%x_frbp
@X_bf_a_bp ...... bf:3 .. ra:5 ....0 .......... . &X_bf rb=%x_frbp @X_bf_a_bp ...... bf:3 .. ra:5 ....0 .......... . &X_bf rb=%x_frbp
@ -400,9 +409,42 @@ STFDUX 011111 ..... ...... .... 1011110111 - @X
### Floating-Point Arithmetic Instructions ### Floating-Point Arithmetic Instructions
FADD 111111 ..... ..... ..... ----- 10101 . @A_tab
FADDS 111011 ..... ..... ..... ----- 10101 . @A_tab
FSUB 111111 ..... ..... ..... ----- 10100 . @A_tab
FSUBS 111011 ..... ..... ..... ----- 10100 . @A_tab
FMUL 111111 ..... ..... ----- ..... 11001 . @A_tac
FMULS 111011 ..... ..... ----- ..... 11001 . @A_tac
FDIV 111111 ..... ..... ..... ----- 10010 . @A_tab
FDIVS 111011 ..... ..... ..... ----- 10010 . @A_tab
FSQRT 111111 ..... ----- ..... ----- 10110 . @A_tb FSQRT 111111 ..... ----- ..... ----- 10110 . @A_tb
FSQRTS 111011 ..... ----- ..... ----- 10110 . @A_tb FSQRTS 111011 ..... ----- ..... ----- 10110 . @A_tb
FRE 111111 ..... ----- ..... ----- 11000 . @A_tb
FRES 111011 ..... ----- ..... ----- 11000 . @A_tb
FRSQRTE 111111 ..... ----- ..... ----- 11010 . @A_tb
FRSQRTES 111011 ..... ----- ..... ----- 11010 . @A_tb
FTDIV 111111 ... -- ..... ..... 0010000000 - @X_bf
FTSQRT 111111 ... -- ----- ..... 0010100000 - @X_bf_b
FMADD 111111 ..... ..... ..... ..... 11101 . @A
FMADDS 111011 ..... ..... ..... ..... 11101 . @A
FMSUB 111111 ..... ..... ..... ..... 11100 . @A
FMSUBS 111011 ..... ..... ..... ..... 11100 . @A
FNMADD 111111 ..... ..... ..... ..... 11111 . @A
FNMADDS 111011 ..... ..... ..... ..... 11111 . @A
FNMSUB 111111 ..... ..... ..... ..... 11110 . @A
FNMSUBS 111011 ..... ..... ..... ..... 11110 . @A
### Floating-Point Select Instruction ### Floating-Point Select Instruction
FSEL 111111 ..... ..... ..... ..... 10111 . @A FSEL 111111 ..... ..... ..... ..... 10111 . @A

285
target/ppc/translate/fp-impl.c.inc
View File

@ -30,96 +30,73 @@ static void gen_set_cr1_from_fpscr(DisasContext *ctx)
#endif #endif
/*** Floating-Point arithmetic ***/ /*** Floating-Point arithmetic ***/
#define _GEN_FLOAT_ACB(name, op1, op2, set_fprf, type) \ static bool do_helper_acb(DisasContext *ctx, arg_A *a,
static void gen_f##name(DisasContext *ctx) \ void (*helper)(TCGv_i64, TCGv_ptr, TCGv_i64,
{ \ TCGv_i64, TCGv_i64))
TCGv_i64 t0; \ {
TCGv_i64 t1; \ TCGv_i64 t0, t1, t2, t3;
TCGv_i64 t2; \ REQUIRE_INSNS_FLAGS(ctx, FLOAT);
TCGv_i64 t3; \ REQUIRE_FPU(ctx);
if (unlikely(!ctx->fpu_enabled)) { \ t0 = tcg_temp_new_i64();
gen_exception(ctx, POWERPC_EXCP_FPU); \ t1 = tcg_temp_new_i64();
return; \ t2 = tcg_temp_new_i64();
} \ t3 = tcg_temp_new_i64();
t0 = tcg_temp_new_i64(); \ gen_reset_fpstatus();
t1 = tcg_temp_new_i64(); \ get_fpr(t0, a->fra);
t2 = tcg_temp_new_i64(); \ get_fpr(t1, a->frc);
t3 = tcg_temp_new_i64(); \ get_fpr(t2, a->frb);
gen_reset_fpstatus(); \ helper(t3, tcg_env, t0, t1, t2);
get_fpr(t0, rA(ctx->opcode)); \ set_fpr(a->frt, t3);
get_fpr(t1, rC(ctx->opcode)); \ gen_compute_fprf_float64(t3);
get_fpr(t2, rB(ctx->opcode)); \ if (unlikely(a->rc)) {
gen_helper_f##name(t3, tcg_env, t0, t1, t2); \ gen_set_cr1_from_fpscr(ctx);
set_fpr(rD(ctx->opcode), t3); \ }
if (set_fprf) { \ return true;
gen_compute_fprf_float64(t3); \
} \
if (unlikely(Rc(ctx->opcode) != 0)) { \
gen_set_cr1_from_fpscr(ctx); \
} \
} }
#define GEN_FLOAT_ACB(name, op2, set_fprf, type) \ static bool do_helper_ab(DisasContext *ctx, arg_A_tab *a,
_GEN_FLOAT_ACB(name, 0x3F, op2, set_fprf, type); \ void (*helper)(TCGv_i64, TCGv_ptr, TCGv_i64,
_GEN_FLOAT_ACB(name##s, 0x3B, op2, set_fprf, type); TCGv_i64))
{
#define _GEN_FLOAT_AB(name, op1, op2, inval, set_fprf, type) \ TCGv_i64 t0, t1, t2;
static void gen_f##name(DisasContext *ctx) \ REQUIRE_INSNS_FLAGS(ctx, FLOAT);
{ \ REQUIRE_FPU(ctx);
TCGv_i64 t0; \ t0 = tcg_temp_new_i64();
TCGv_i64 t1; \ t1 = tcg_temp_new_i64();
TCGv_i64 t2; \ t2 = tcg_temp_new_i64();
if (unlikely(!ctx->fpu_enabled)) { \ gen_reset_fpstatus();
gen_exception(ctx, POWERPC_EXCP_FPU); \ get_fpr(t0, a->fra);
return; \ get_fpr(t1, a->frb);
} \ helper(t2, tcg_env, t0, t1);
t0 = tcg_temp_new_i64(); \ set_fpr(a->frt, t2);
t1 = tcg_temp_new_i64(); \ gen_compute_fprf_float64(t2);
t2 = tcg_temp_new_i64(); \ if (unlikely(a->rc)) {
gen_reset_fpstatus(); \ gen_set_cr1_from_fpscr(ctx);
get_fpr(t0, rA(ctx->opcode)); \ }
get_fpr(t1, rB(ctx->opcode)); \ return true;
gen_helper_f##name(t2, tcg_env, t0, t1); \
set_fpr(rD(ctx->opcode), t2); \
if (set_fprf) { \
gen_compute_fprf_float64(t2); \
} \
if (unlikely(Rc(ctx->opcode) != 0)) { \
gen_set_cr1_from_fpscr(ctx); \
} \
} }
#define GEN_FLOAT_AB(name, op2, inval, set_fprf, type) \
_GEN_FLOAT_AB(name, 0x3F, op2, inval, set_fprf, type); \
_GEN_FLOAT_AB(name##s, 0x3B, op2, inval, set_fprf, type);
#define _GEN_FLOAT_AC(name, op1, op2, inval, set_fprf, type) \ static bool do_helper_ac(DisasContext *ctx, arg_A_tac *a,
static void gen_f##name(DisasContext *ctx) \ void (*helper)(TCGv_i64, TCGv_ptr, TCGv_i64,
{ \ TCGv_i64))
TCGv_i64 t0; \ {
TCGv_i64 t1; \ TCGv_i64 t0, t1, t2;
TCGv_i64 t2; \ REQUIRE_INSNS_FLAGS(ctx, FLOAT);
if (unlikely(!ctx->fpu_enabled)) { \ REQUIRE_FPU(ctx);
gen_exception(ctx, POWERPC_EXCP_FPU); \ t0 = tcg_temp_new_i64();
return; \ t1 = tcg_temp_new_i64();
} \ t2 = tcg_temp_new_i64();
t0 = tcg_temp_new_i64(); \ gen_reset_fpstatus();
t1 = tcg_temp_new_i64(); \ get_fpr(t0, a->fra);
t2 = tcg_temp_new_i64(); \ get_fpr(t1, a->frc);
gen_reset_fpstatus(); \ helper(t2, tcg_env, t0, t1);
get_fpr(t0, rA(ctx->opcode)); \ set_fpr(a->frt, t2);
get_fpr(t1, rC(ctx->opcode)); \ gen_compute_fprf_float64(t2);
gen_helper_f##name(t2, tcg_env, t0, t1); \ if (unlikely(a->rc)) {
set_fpr(rD(ctx->opcode), t2); \ gen_set_cr1_from_fpscr(ctx);
if (set_fprf) { \ }
gen_compute_fprf_float64(t2); \ return true;
} \
if (unlikely(Rc(ctx->opcode) != 0)) { \
gen_set_cr1_from_fpscr(ctx); \
} \
} }
#define GEN_FLOAT_AC(name, op2, inval, set_fprf, type) \
_GEN_FLOAT_AC(name, 0x3F, op2, inval, set_fprf, type); \
_GEN_FLOAT_AC(name##s, 0x3B, op2, inval, set_fprf, type);
#define GEN_FLOAT_B(name, op2, op3, set_fprf, type) \ #define GEN_FLOAT_B(name, op2, op3, set_fprf, type) \
static void gen_f##name(DisasContext *ctx) \ static void gen_f##name(DisasContext *ctx) \
@ -145,64 +122,22 @@ static void gen_f##name(DisasContext *ctx) \
} \ } \
} }
#define GEN_FLOAT_BS(name, op1, op2, set_fprf, type) \ static bool do_helper_bs(DisasContext *ctx, arg_A_tb *a,
static void gen_f##name(DisasContext *ctx) \ void (*helper)(TCGv_i64, TCGv_ptr, TCGv_i64))
{ \
TCGv_i64 t0; \
TCGv_i64 t1; \
if (unlikely(!ctx->fpu_enabled)) { \
gen_exception(ctx, POWERPC_EXCP_FPU); \
return; \
} \
t0 = tcg_temp_new_i64(); \
t1 = tcg_temp_new_i64(); \
gen_reset_fpstatus(); \
get_fpr(t0, rB(ctx->opcode)); \
gen_helper_f##name(t1, tcg_env, t0); \
set_fpr(rD(ctx->opcode), t1); \
if (set_fprf) { \
gen_compute_fprf_float64(t1); \
} \
if (unlikely(Rc(ctx->opcode) != 0)) { \
gen_set_cr1_from_fpscr(ctx); \
} \
}
/* fadd - fadds */
GEN_FLOAT_AB(add, 0x15, 0x000007C0, 1, PPC_FLOAT);
/* fdiv - fdivs */
GEN_FLOAT_AB(div, 0x12, 0x000007C0, 1, PPC_FLOAT);
/* fmul - fmuls */
GEN_FLOAT_AC(mul, 0x19, 0x0000F800, 1, PPC_FLOAT);
/* fre */
GEN_FLOAT_BS(re, 0x3F, 0x18, 1, PPC_FLOAT_EXT);
/* fres */
GEN_FLOAT_BS(res, 0x3B, 0x18, 1, PPC_FLOAT_FRES);
/* frsqrte */
GEN_FLOAT_BS(rsqrte, 0x3F, 0x1A, 1, PPC_FLOAT_FRSQRTE);
/* frsqrtes */
static void gen_frsqrtes(DisasContext *ctx)
{ {
TCGv_i64 t0; TCGv_i64 t0, t1;
TCGv_i64 t1; REQUIRE_FPU(ctx);
if (unlikely(!ctx->fpu_enabled)) {
gen_exception(ctx, POWERPC_EXCP_FPU);
return;
}
t0 = tcg_temp_new_i64(); t0 = tcg_temp_new_i64();
t1 = tcg_temp_new_i64(); t1 = tcg_temp_new_i64();
gen_reset_fpstatus(); gen_reset_fpstatus();
get_fpr(t0, rB(ctx->opcode)); get_fpr(t0, a->frb);
gen_helper_frsqrtes(t1, tcg_env, t0); helper(t1, tcg_env, t0);
set_fpr(rD(ctx->opcode), t1); set_fpr(a->frt, t1);
gen_compute_fprf_float64(t1); gen_compute_fprf_float64(t1);
if (unlikely(Rc(ctx->opcode) != 0)) { if (unlikely(a->rc)) {
gen_set_cr1_from_fpscr(ctx); gen_set_cr1_from_fpscr(ctx);
} }
return true;
} }
static bool trans_FSEL(DisasContext *ctx, arg_A *a) static bool trans_FSEL(DisasContext *ctx, arg_A *a)
@ -228,10 +163,6 @@ static bool trans_FSEL(DisasContext *ctx, arg_A *a)
return true; return true;
} }
/* fsub - fsubs */
GEN_FLOAT_AB(sub, 0x14, 0x000007C0, 1, PPC_FLOAT);
/* Optional: */
static bool do_helper_fsqrt(DisasContext *ctx, arg_A_tb *a, static bool do_helper_fsqrt(DisasContext *ctx, arg_A_tb *a,
void (*helper)(TCGv_i64, TCGv_ptr, TCGv_i64)) void (*helper)(TCGv_i64, TCGv_ptr, TCGv_i64))
{ {
@ -254,19 +185,33 @@ static bool do_helper_fsqrt(DisasContext *ctx, arg_A_tb *a,
return true; return true;
} }
TRANS(FADD, do_helper_ab, gen_helper_FADD);
TRANS(FADDS, do_helper_ab, gen_helper_FADDS);
TRANS(FSUB, do_helper_ab, gen_helper_FSUB);
TRANS(FSUBS, do_helper_ab, gen_helper_FSUBS);
TRANS(FDIV, do_helper_ab, gen_helper_FDIV);
TRANS(FDIVS, do_helper_ab, gen_helper_FDIVS);
TRANS(FMUL, do_helper_ac, gen_helper_FMUL);
TRANS(FMULS, do_helper_ac, gen_helper_FMULS);
TRANS(FMADD, do_helper_acb, gen_helper_FMADD);
TRANS(FMADDS, do_helper_acb, gen_helper_FMADDS);
TRANS(FMSUB, do_helper_acb, gen_helper_FMSUB);
TRANS(FMSUBS, do_helper_acb, gen_helper_FMSUBS);
TRANS(FNMADD, do_helper_acb, gen_helper_FNMADD);
TRANS(FNMADDS, do_helper_acb, gen_helper_FNMADDS);
TRANS(FNMSUB, do_helper_acb, gen_helper_FNMSUB);
TRANS(FNMSUBS, do_helper_acb, gen_helper_FNMSUBS);
TRANS_FLAGS(FLOAT_EXT, FRE, do_helper_bs, gen_helper_FRE);
TRANS_FLAGS(FLOAT_FRES, FRES, do_helper_bs, gen_helper_FRES);
TRANS_FLAGS(FLOAT_FRSQRTE, FRSQRTE, do_helper_bs, gen_helper_FRSQRTE);
TRANS_FLAGS(FLOAT_FRSQRTES, FRSQRTES, do_helper_bs, gen_helper_FRSQRTES);
TRANS(FSQRT, do_helper_fsqrt, gen_helper_FSQRT); TRANS(FSQRT, do_helper_fsqrt, gen_helper_FSQRT);
TRANS(FSQRTS, do_helper_fsqrt, gen_helper_FSQRTS); TRANS(FSQRTS, do_helper_fsqrt, gen_helper_FSQRTS);
/*** Floating-Point multiply-and-add ***/
/* fmadd - fmadds */
GEN_FLOAT_ACB(madd, 0x1D, 1, PPC_FLOAT);
/* fmsub - fmsubs */
GEN_FLOAT_ACB(msub, 0x1C, 1, PPC_FLOAT);
/* fnmadd - fnmadds */
GEN_FLOAT_ACB(nmadd, 0x1F, 1, PPC_FLOAT);
/* fnmsub - fnmsubs */
GEN_FLOAT_ACB(nmsub, 0x1E, 1, PPC_FLOAT);
/*** Floating-Point round & convert ***/ /*** Floating-Point round & convert ***/
/* fctiw */ /* fctiw */
GEN_FLOAT_B(ctiw, 0x0E, 0x00, 0, PPC_FLOAT); GEN_FLOAT_B(ctiw, 0x0E, 0x00, 0, PPC_FLOAT);
@ -304,35 +249,30 @@ GEN_FLOAT_B(rip, 0x08, 0x0E, 1, PPC_FLOAT_EXT);
/* frim */ /* frim */
GEN_FLOAT_B(rim, 0x08, 0x0F, 1, PPC_FLOAT_EXT); GEN_FLOAT_B(rim, 0x08, 0x0F, 1, PPC_FLOAT_EXT);
static void gen_ftdiv(DisasContext *ctx) static bool trans_FTDIV(DisasContext *ctx, arg_X_bf *a)
{ {
TCGv_i64 t0; TCGv_i64 t0, t1;
TCGv_i64 t1; REQUIRE_INSNS_FLAGS2(ctx, FP_TST_ISA206);
if (unlikely(!ctx->fpu_enabled)) { REQUIRE_FPU(ctx);
gen_exception(ctx, POWERPC_EXCP_FPU);
return;
}
t0 = tcg_temp_new_i64(); t0 = tcg_temp_new_i64();
t1 = tcg_temp_new_i64(); t1 = tcg_temp_new_i64();
get_fpr(t0, rA(ctx->opcode)); get_fpr(t0, a->ra);
get_fpr(t1, rB(ctx->opcode)); get_fpr(t1, a->rb);
gen_helper_ftdiv(cpu_crf[crfD(ctx->opcode)], t0, t1); gen_helper_FTDIV(cpu_crf[a->bf], t0, t1);
return true;
} }
static void gen_ftsqrt(DisasContext *ctx) static bool trans_FTSQRT(DisasContext *ctx, arg_X_bf_b *a)
{ {
TCGv_i64 t0; TCGv_i64 t0;
if (unlikely(!ctx->fpu_enabled)) { REQUIRE_INSNS_FLAGS2(ctx, FP_TST_ISA206);
gen_exception(ctx, POWERPC_EXCP_FPU); REQUIRE_FPU(ctx);
return;
}
t0 = tcg_temp_new_i64(); t0 = tcg_temp_new_i64();
get_fpr(t0, rB(ctx->opcode)); get_fpr(t0, a->rb);
gen_helper_ftsqrt(cpu_crf[crfD(ctx->opcode)], t0); gen_helper_FTSQRT(cpu_crf[a->bf], t0);
return true;
} }
/*** Floating-Point compare ***/ /*** Floating-Point compare ***/
/* fcmpo */ /* fcmpo */
@ -1111,14 +1051,7 @@ TRANS(STFDX, do_lsfp_X, false, true, false)
TRANS(STFDUX, do_lsfp_X, true, true, false) TRANS(STFDUX, do_lsfp_X, true, true, false)
TRANS(PSTFD, do_lsfp_PLS_D, false, true, false) TRANS(PSTFD, do_lsfp_PLS_D, false, true, false)
#undef _GEN_FLOAT_ACB
#undef GEN_FLOAT_ACB
#undef _GEN_FLOAT_AB
#undef GEN_FLOAT_AB
#undef _GEN_FLOAT_AC
#undef GEN_FLOAT_AC
#undef GEN_FLOAT_B #undef GEN_FLOAT_B
#undef GEN_FLOAT_BS
#undef GEN_LDF #undef GEN_LDF
#undef GEN_LDUF #undef GEN_LDUF

31
target/ppc/translate/fp-ops.c.inc
View File

@ -1,36 +1,6 @@
#define _GEN_FLOAT_ACB(name, op, op1, op2, isfloat, set_fprf, type) \
GEN_HANDLER(f##name, op1, op2, 0xFF, 0x00000000, type)
#define GEN_FLOAT_ACB(name, op2, set_fprf, type) \
_GEN_FLOAT_ACB(name, name, 0x3F, op2, 0, set_fprf, type), \
_GEN_FLOAT_ACB(name##s, name, 0x3B, op2, 1, set_fprf, type)
#define _GEN_FLOAT_AB(name, op, op1, op2, inval, isfloat, set_fprf, type) \
GEN_HANDLER(f##name, op1, op2, 0xFF, inval, type)
#define GEN_FLOAT_AB(name, op2, inval, set_fprf, type) \
_GEN_FLOAT_AB(name, name, 0x3F, op2, inval, 0, set_fprf, type), \
_GEN_FLOAT_AB(name##s, name, 0x3B, op2, inval, 1, set_fprf, type)
#define _GEN_FLOAT_AC(name, op, op1, op2, inval, isfloat, set_fprf, type) \
GEN_HANDLER(f##name, op1, op2, 0xFF, inval, type)
#define GEN_FLOAT_AC(name, op2, inval, set_fprf, type) \
_GEN_FLOAT_AC(name, name, 0x3F, op2, inval, 0, set_fprf, type), \
_GEN_FLOAT_AC(name##s, name, 0x3B, op2, inval, 1, set_fprf, type)
#define GEN_FLOAT_B(name, op2, op3, set_fprf, type) \ #define GEN_FLOAT_B(name, op2, op3, set_fprf, type) \
GEN_HANDLER(f##name, 0x3F, op2, op3, 0x001F0000, type) GEN_HANDLER(f##name, 0x3F, op2, op3, 0x001F0000, type)
#define GEN_FLOAT_BS(name, op1, op2, set_fprf, type) \
GEN_HANDLER(f##name, op1, op2, 0xFF, 0x001F07C0, type)
GEN_FLOAT_AB(add, 0x15, 0x000007C0, 1, PPC_FLOAT),
GEN_FLOAT_AB(div, 0x12, 0x000007C0, 1, PPC_FLOAT),
GEN_FLOAT_AC(mul, 0x19, 0x0000F800, 1, PPC_FLOAT),
GEN_FLOAT_BS(re, 0x3F, 0x18, 1, PPC_FLOAT_EXT),
GEN_FLOAT_BS(res, 0x3B, 0x18, 1, PPC_FLOAT_FRES),
GEN_FLOAT_BS(rsqrte, 0x3F, 0x1A, 1, PPC_FLOAT_FRSQRTE),
GEN_FLOAT_AB(sub, 0x14, 0x000007C0, 1, PPC_FLOAT),
GEN_FLOAT_ACB(madd, 0x1D, 1, PPC_FLOAT),
GEN_FLOAT_ACB(msub, 0x1C, 1, PPC_FLOAT),
GEN_FLOAT_ACB(nmadd, 0x1F, 1, PPC_FLOAT),
GEN_FLOAT_ACB(nmsub, 0x1E, 1, PPC_FLOAT),
GEN_HANDLER_E(ftdiv, 0x3F, 0x00, 0x04, 1, PPC_NONE, PPC2_FP_TST_ISA206),
GEN_HANDLER_E(ftsqrt, 0x3F, 0x00, 0x05, 1, PPC_NONE, PPC2_FP_TST_ISA206),
GEN_FLOAT_B(ctiw, 0x0E, 0x00, 0, PPC_FLOAT), GEN_FLOAT_B(ctiw, 0x0E, 0x00, 0, PPC_FLOAT),
GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206), GEN_HANDLER_E(fctiwu, 0x3F, 0x0E, 0x04, 0, PPC_NONE, PPC2_FP_CVT_ISA206),
GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT), GEN_FLOAT_B(ctiwz, 0x0F, 0x00, 0, PPC_FLOAT),
@ -61,7 +31,6 @@ GEN_STXF(stfiw, st32fiw, 0x17, 0x1E, PPC_FLOAT_STFIWX)
GEN_HANDLER_E(stfdepx, 0x1F, 0x1F, 0x16, 0x00000001, PPC_NONE, PPC2_BOOKE206), GEN_HANDLER_E(stfdepx, 0x1F, 0x1F, 0x16, 0x00000001, PPC_NONE, PPC2_BOOKE206),
GEN_HANDLER_E(stfdpx, 0x1F, 0x17, 0x1C, 0x00200001, PPC_NONE, PPC2_ISA205), GEN_HANDLER_E(stfdpx, 0x1F, 0x17, 0x1C, 0x00200001, PPC_NONE, PPC2_ISA205),
GEN_HANDLER(frsqrtes, 0x3B, 0x1A, 0xFF, 0x001F07C0, PPC_FLOAT_FRSQRTES),
GEN_HANDLER(fcmpo, 0x3F, 0x00, 0x01, 0x00600001, PPC_FLOAT), GEN_HANDLER(fcmpo, 0x3F, 0x00, 0x01, 0x00600001, PPC_FLOAT),
GEN_HANDLER(fcmpu, 0x3F, 0x00, 0x00, 0x00600001, PPC_FLOAT), GEN_HANDLER(fcmpu, 0x3F, 0x00, 0x00, 0x00600001, PPC_FLOAT),
GEN_HANDLER(fabs, 0x3F, 0x08, 0x08, 0x001F0000, PPC_FLOAT), GEN_HANDLER(fabs, 0x3F, 0x08, 0x08, 0x001F0000, PPC_FLOAT),