We want to reuse this in the context of vector instructions. So use
better matching names and introduce s390_restore_bfp_rounding_mode().
While at it, add proper newlines.
Signed-off-by: David Hildenbrand <da...@redhat.com>
---
target/s390x/fpu_helper.c | 113 +++++++++++++++++++++++---------------
target/s390x/internal.h | 2 +
2 files changed, 72 insertions(+), 43 deletions(-)
diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c
index a6c67527cd..518fb6365a 100644
--- a/target/s390x/fpu_helper.c
+++ b/target/s390x/fpu_helper.c
@@ -372,7 +372,7 @@ uint32_t HELPER(cxb)(CPUS390XState *env, uint64_t ah,
uint64_t al,
return float_comp_to_cc(env, cmp);
}
-static int swap_round_mode(CPUS390XState *env, int m3)
+int s390_swap_bfp_rounding_mode(CPUS390XState *env, int m3)
{
int ret = env->fpu_status.float_rounding_mode;
switch (m3) {
@@ -401,12 +401,18 @@ static int swap_round_mode(CPUS390XState *env, int m3)
return ret;
}
+void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode)
+{
+ set_float_rounding_mode(old_mode, &env->fpu_status);
+}
+
/* convert 64-bit int to 32-bit float */
uint64_t HELPER(cegb)(CPUS390XState *env, int64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float32 ret = int64_to_float32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -414,9 +420,10 @@ uint64_t HELPER(cegb)(CPUS390XState *env, int64_t v2,
uint32_t m3)
/* convert 64-bit int to 64-bit float */
uint64_t HELPER(cdgb)(CPUS390XState *env, int64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float64 ret = int64_to_float64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -424,9 +431,10 @@ uint64_t HELPER(cdgb)(CPUS390XState *env, int64_t v2,
uint32_t m3)
/* convert 64-bit int to 128-bit float */
uint64_t HELPER(cxgb)(CPUS390XState *env, int64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float128 ret = int64_to_float128(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return RET128(ret);
}
@@ -434,9 +442,10 @@ uint64_t HELPER(cxgb)(CPUS390XState *env, int64_t v2,
uint32_t m3)
/* convert 64-bit uint to 32-bit float */
uint64_t HELPER(celgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float32 ret = uint64_to_float32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -444,9 +453,10 @@ uint64_t HELPER(celgb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 64-bit uint to 64-bit float */
uint64_t HELPER(cdlgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float64 ret = uint64_to_float64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -454,9 +464,10 @@ uint64_t HELPER(cdlgb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 64-bit uint to 128-bit float */
uint64_t HELPER(cxlgb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float128 ret = uint64_to_float128(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return RET128(ret);
}
@@ -464,9 +475,10 @@ uint64_t HELPER(cxlgb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 32-bit float to 64-bit int */
uint64_t HELPER(cgeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
int64_t ret = float32_to_int64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -474,9 +486,10 @@ uint64_t HELPER(cgeb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 64-bit float to 64-bit int */
uint64_t HELPER(cgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
int64_t ret = float64_to_int64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -484,10 +497,11 @@ uint64_t HELPER(cgdb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 128-bit float to 64-bit int */
uint64_t HELPER(cgxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
float128 v2 = make_float128(h, l);
int64_t ret = float128_to_int64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -495,9 +509,10 @@ uint64_t HELPER(cgxb)(CPUS390XState *env, uint64_t h,
uint64_t l, uint32_t m3)
/* convert 32-bit float to 32-bit int */
uint64_t HELPER(cfeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
int32_t ret = float32_to_int32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -505,9 +520,10 @@ uint64_t HELPER(cfeb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 64-bit float to 32-bit int */
uint64_t HELPER(cfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
int32_t ret = float64_to_int32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -515,10 +531,12 @@ uint64_t HELPER(cfdb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 128-bit float to 32-bit int */
uint64_t HELPER(cfxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float128 v2 = make_float128(h, l);
int32_t ret = float128_to_int32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -526,11 +544,12 @@ uint64_t HELPER(cfxb)(CPUS390XState *env, uint64_t h,
uint64_t l, uint32_t m3)
/* convert 32-bit float to 64-bit uint */
uint64_t HELPER(clgeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
uint64_t ret;
+
v2 = float32_to_float64(v2, &env->fpu_status);
ret = float64_to_uint64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -538,9 +557,10 @@ uint64_t HELPER(clgeb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 64-bit float to 64-bit uint */
uint64_t HELPER(clgdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
uint64_t ret = float64_to_uint64(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -548,9 +568,10 @@ uint64_t HELPER(clgdb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 128-bit float to 64-bit uint */
uint64_t HELPER(clgxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
uint64_t ret = float128_to_uint64(make_float128(h, l), &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -558,9 +579,10 @@ uint64_t HELPER(clgxb)(CPUS390XState *env, uint64_t h,
uint64_t l, uint32_t m3)
/* convert 32-bit float to 32-bit uint */
uint64_t HELPER(clfeb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
uint32_t ret = float32_to_uint32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -568,9 +590,10 @@ uint64_t HELPER(clfeb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 64-bit float to 32-bit uint */
uint64_t HELPER(clfdb)(CPUS390XState *env, uint64_t v2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
uint32_t ret = float64_to_uint32(v2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -578,9 +601,10 @@ uint64_t HELPER(clfdb)(CPUS390XState *env, uint64_t v2,
uint32_t m3)
/* convert 128-bit float to 32-bit uint */
uint64_t HELPER(clfxb)(CPUS390XState *env, uint64_t h, uint64_t l, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
uint32_t ret = float128_to_uint32(make_float128(h, l), &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -588,9 +612,10 @@ uint64_t HELPER(clfxb)(CPUS390XState *env, uint64_t h,
uint64_t l, uint32_t m3)
/* round to integer 32-bit */
uint64_t HELPER(fieb)(CPUS390XState *env, uint64_t f2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float32 ret = float32_round_to_int(f2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -598,9 +623,10 @@ uint64_t HELPER(fieb)(CPUS390XState *env, uint64_t f2,
uint32_t m3)
/* round to integer 64-bit */
uint64_t HELPER(fidb)(CPUS390XState *env, uint64_t f2, uint32_t m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float64 ret = float64_round_to_int(f2, &env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return ret;
}
@@ -608,10 +634,11 @@ uint64_t HELPER(fidb)(CPUS390XState *env, uint64_t f2,
uint32_t m3)
/* round to integer 128-bit */
uint64_t HELPER(fixb)(CPUS390XState *env, uint64_t ah, uint64_t al, uint32_t
m3)
{
- int hold = swap_round_mode(env, m3);
+ int old_mode = s390_swap_bfp_rounding_mode(env, m3);
+
float128 ret = float128_round_to_int(make_float128(ah, al),
&env->fpu_status);
- set_float_rounding_mode(hold, &env->fpu_status);
+ s390_restore_bfp_rounding_mode(env, old_mode);
handle_exceptions(env, GETPC());
return RET128(ret);
}
diff --git a/target/s390x/internal.h b/target/s390x/internal.h
index e1c0b1bd3b..122fe037bc 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -315,6 +315,8 @@ uint32_t set_cc_nz_f128(float128 v);
#define S390_IEEE_MASK_INEXACT 0x08
#define S390_IEEE_MASK_QUANTUM 0x04
uint8_t s390_softfloat_exc_to_ieee(unsigned int exc);
+int s390_swap_bfp_rounding_mode(CPUS390XState *env, int m3);
+void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode);
/* gdbstub.c */
--
2.17.2
