ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/tcg: Simplify vflr64() handling 

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210608092337.12221-10-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2021-06-08 11:23:20 +02:00 committed by Cornelia Huck
parent 860b707bbb
commit 977e43d977
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/s390x/helper.h
View File

@ -263,7 +263,6 @@ DEF_HELPER_FLAGS_5(gvec_vfd64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, i32)
DEF_HELPER_FLAGS_4(gvec_vfi64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_4(gvec_vfi64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32)
DEF_HELPER_FLAGS_4(gvec_vfll32, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_4(gvec_vfll32, TCG_CALL_NO_WG, void, ptr, cptr, env, i32)
DEF_HELPER_FLAGS_4(gvec_vflr64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32) DEF_HELPER_FLAGS_4(gvec_vflr64, TCG_CALL_NO_WG, void, ptr, cptr, env, i32)
DEF_HELPER_FLAGS_4(gvec_vflr64s, TCG_CALL_NO_WG, void, ptr, cptr, env, i32)
DEF_HELPER_FLAGS_5(gvec_vfm64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, i32) DEF_HELPER_FLAGS_5(gvec_vfm64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, i32)
DEF_HELPER_FLAGS_6(gvec_vfma64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, cptr, env, i32) DEF_HELPER_FLAGS_6(gvec_vfma64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, cptr, env, i32)
DEF_HELPER_FLAGS_6(gvec_vfms64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, cptr, env, i32) DEF_HELPER_FLAGS_6(gvec_vfms64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, cptr, env, i32)

3
target/s390x/translate_vx.c.inc
View File

@ -2531,7 +2531,6 @@ static DisasJumpType op_vcdg(DisasContext *s, DisasOps *o)
const uint8_t fpf = get_field(s, m3); const uint8_t fpf = get_field(s, m3);
const uint8_t m4 = get_field(s, m4); const uint8_t m4 = get_field(s, m4);
const uint8_t erm = get_field(s, m5); const uint8_t erm = get_field(s, m5);
const bool se = extract32(m4, 3, 1);
gen_helper_gvec_2_ptr *fn; gen_helper_gvec_2_ptr *fn;
if (fpf != FPF_LONG || extract32(m4, 0, 2) || erm > 7 || erm == 2) { if (fpf != FPF_LONG || extract32(m4, 0, 2) || erm > 7 || erm == 2) {
@ -2556,7 +2555,7 @@ static DisasJumpType op_vcdg(DisasContext *s, DisasOps *o)
fn = gen_helper_gvec_vfi64; fn = gen_helper_gvec_vfi64;
break; break;
case 0xc5: case 0xc5:
fn = se ? gen_helper_gvec_vflr64s : gen_helper_gvec_vflr64; fn = gen_helper_gvec_vflr64;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();

29
target/s390x/vec_fpu_helper.c
View File

@ -311,9 +311,12 @@ void HELPER(gvec_vfll32)(void *v1, const void *v2, CPUS390XState *env,
*(S390Vector *)v1 = tmp; *(S390Vector *)v1 = tmp;
} }
static void vflr64(S390Vector *v1, const S390Vector *v2, CPUS390XState *env, void HELPER(gvec_vflr64)(void *v1, const void *v2, CPUS390XState *env,
bool s, bool XxC, uint8_t erm, uintptr_t retaddr) uint32_t desc)
{ {
const uint8_t erm = extract32(simd_data(desc), 4, 4);
const bool s = extract32(simd_data(desc), 3, 1);
const bool XxC = extract32(simd_data(desc), 2, 1);
uint8_t vxc, vec_exc = 0; uint8_t vxc, vec_exc = 0;
S390Vector tmp = {}; S390Vector tmp = {};
int i, old_mode; int i, old_mode;
@ -332,26 +335,8 @@ static void vflr64(S390Vector *v1, const S390Vector *v2, CPUS390XState *env,
} }
} }
s390_restore_bfp_rounding_mode(env, old_mode); s390_restore_bfp_rounding_mode(env, old_mode);
handle_ieee_exc(env, vxc, vec_exc, retaddr); handle_ieee_exc(env, vxc, vec_exc, GETPC());
*v1 = tmp; *(S390Vector *)v1 = tmp;
}
void HELPER(gvec_vflr64)(void *v1, const void *v2, CPUS390XState *env,
uint32_t desc)
{
const uint8_t erm = extract32(simd_data(desc), 4, 4);
const bool XxC = extract32(simd_data(desc), 2, 1);
vflr64(v1, v2, env, false, XxC, erm, GETPC());
}
void HELPER(gvec_vflr64s)(void *v1, const void *v2, CPUS390XState *env,
uint32_t desc)
{
const uint8_t erm = extract32(simd_data(desc), 4, 4);
const bool XxC = extract32(simd_data(desc), 2, 1);
vflr64(v1, v2, env, true, XxC, erm, GETPC());
} }
static void vfma64(S390Vector *v1, const S390Vector *v2, const S390Vector *v3, static void vfma64(S390Vector *v1, const S390Vector *v2, const S390Vector *v3,