OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/hppa: Convert fp fused multiply-add insns 

Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Sven Schnelle <svens@stackframe.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2018-02-12 20:08:51 -08:00
parent 96927adb8d
commit c3bad4f839
2 changed files with 36 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/hppa/insns.decode
View File

@ -39,6 +39,10 @@
%rm64 1:1 16:5
%rt64 6:1 0:5
%ra64 7:1 21:5
%rb64 12:1 16:5
%rc64 8:1 13:3 9:2
%rc32 13:3 9:2
%im5_0 0:s1 1:4
%im5_16 16:s1 17:4
@ -338,3 +342,11 @@ blr 111010 l:5 x:5 010 00000000000 n:1 0
bv 111010 b:5 x:5 110 00000000000 n:1 0
bve 111010 b:5 00000 110 10000000000 n:1 - l=0
bve 111010 b:5 00000 111 10000000000 n:1 - l=2
####
# FP Fused Multiple-Add
####
fmpyfadd_f 101110 ..... ..... ... . 0 ... . . neg:1 ..... \
rm1=%ra64 rm2=%rb64 ra3=%rc64 t=%rt64
fmpyfadd_d 101110 rm1:5 rm2:5 ... 0 1 ..0 0 0 neg:1 t:5 ra3=%rc32

77
target/hppa/translate.c
View File

@ -876,14 +876,6 @@ static unsigned assemble_rb64(uint32_t insn)
return r1 * 32 + r0;
}
static unsigned assemble_rc64(uint32_t insn)
{
unsigned r2 = extract32(insn, 8, 1);
unsigned r1 = extract32(insn, 13, 3);
unsigned r0 = extract32(insn, 9, 2);
return r2 * 32 + r1 * 4 + r0;
}
static inline unsigned assemble_sr3(uint32_t insn)
{
unsigned s2 = extract32(insn, 13, 1);
@ -4041,67 +4033,50 @@ static bool trans_fmpysub_d(DisasContext *ctx, arg_mpyadd *a)
return do_fmpyadd_d(ctx, a, true);
}
static bool trans_fmpyfadd_s(DisasContext *ctx, uint32_t insn,
const DisasInsn *di)
static bool trans_fmpyfadd_f(DisasContext *ctx, arg_fmpyfadd_f *a)
{
unsigned rt = assemble_rt64(insn);
unsigned neg = extract32(insn, 5, 1);
unsigned rm1 = assemble_ra64(insn);
unsigned rm2 = assemble_rb64(insn);
unsigned ra3 = assemble_rc64(insn);
TCGv_i32 a, b, c;
TCGv_i32 x, y, z;
nullify_over(ctx);
a = load_frw0_i32(rm1);
b = load_frw0_i32(rm2);
c = load_frw0_i32(ra3);
x = load_frw0_i32(a->rm1);
y = load_frw0_i32(a->rm2);
z = load_frw0_i32(a->ra3);
if (neg) {
gen_helper_fmpynfadd_s(a, cpu_env, a, b, c);
if (a->neg) {
gen_helper_fmpynfadd_s(x, cpu_env, x, y, z);
} else {
gen_helper_fmpyfadd_s(a, cpu_env, a, b, c);
gen_helper_fmpyfadd_s(x, cpu_env, x, y, z);
}
tcg_temp_free_i32(b);
tcg_temp_free_i32(c);
save_frw_i32(rt, a);
tcg_temp_free_i32(a);
tcg_temp_free_i32(y);
tcg_temp_free_i32(z);
save_frw_i32(a->t, x);
tcg_temp_free_i32(x);
return nullify_end(ctx);
}
static bool trans_fmpyfadd_d(DisasContext *ctx, uint32_t insn,
const DisasInsn *di)
static bool trans_fmpyfadd_d(DisasContext *ctx, arg_fmpyfadd_d *a)
{
unsigned rt = extract32(insn, 0, 5);
unsigned neg = extract32(insn, 5, 1);
unsigned rm1 = extract32(insn, 21, 5);
unsigned rm2 = extract32(insn, 16, 5);
unsigned ra3 = assemble_rc64(insn);
TCGv_i64 a, b, c;
TCGv_i64 x, y, z;
nullify_over(ctx);
a = load_frd0(rm1);
b = load_frd0(rm2);
c = load_frd0(ra3);
x = load_frd0(a->rm1);
y = load_frd0(a->rm2);
z = load_frd0(a->ra3);
if (neg) {
gen_helper_fmpynfadd_d(a, cpu_env, a, b, c);
if (a->neg) {
gen_helper_fmpynfadd_d(x, cpu_env, x, y, z);
} else {
gen_helper_fmpyfadd_d(a, cpu_env, a, b, c);
gen_helper_fmpyfadd_d(x, cpu_env, x, y, z);
}
tcg_temp_free_i64(b);
tcg_temp_free_i64(c);
save_frd(rt, a);
tcg_temp_free_i64(a);
tcg_temp_free_i64(y);
tcg_temp_free_i64(z);
save_frd(a->t, x);
tcg_temp_free_i64(x);
return nullify_end(ctx);
}
static const DisasInsn table_fp_fused[] = {
{ 0xb8000000u, 0xfc000800u, trans_fmpyfadd_s },
{ 0xb8000800u, 0xfc0019c0u, trans_fmpyfadd_d }
};
static void translate_table_int(DisasContext *ctx, uint32_t insn,
const DisasInsn table[], size_t n)
{
@ -4137,10 +4112,6 @@ static void translate_one(DisasContext *ctx, uint32_t insn)
case 0x0E:
translate_table(ctx, insn, table_float_0e);
return;
case 0x2E:
translate_table(ctx, insn, table_fp_fused);
return;
}
gen_illegal(ctx);
}