From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>
Subject: [Qemu-devel] [PULL 22/27] s390x/tcg: Refactor saving/restoring the bfp rounding mode
Date: Mon, 4 Mar 2019 13:02:05 +0100 [thread overview]
Message-ID: <20190304120210.31500-23-cohuck@redhat.com> (raw)
In-Reply-To: <20190304120210.31500-1-cohuck@redhat.com>
From: David Hildenbrand <david@redhat.com>
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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190218122710.23639-11-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
target/s390x/fpu_helper.c | 112 +++++++++++++++++++++++---------------
target/s390x/internal.h | 2 +
2 files changed, 71 insertions(+), 43 deletions(-)
diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c
index ed9c74c42004..8baca14650ec 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,11 @@ 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 +543,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 +556,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 +567,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 +578,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 +589,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 +600,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 +611,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 +622,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 +633,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 4db736b6acfd..7baf0e2404b4 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -318,6 +318,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
next prev parent reply other threads:[~2019-03-04 12:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 12:01 [Qemu-devel] [PULL 00/27] s390x updates Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 01/27] s390x: Use cpu_to_be64 in SIGP STORE ADDITIONAL STATUS Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 02/27] s390x: use a QEMU-style typedef + name for SIGP save area struct Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 03/27] s390x/tcg: Save vregs to extended mchk save area Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 04/27] s390x/vfio-ap: Implement hot plug/unplug of vfio-ap device Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 05/27] s390x/vfio-ap: document " Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 06/27] s390x/tcg: RXE has an optional M3 field Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 07/27] s390x/tcg: Simplify disassembler operands initialization Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 08/27] s390x/tcg: Clarify terminology in vec_reg_offset() Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 09/27] s390x/tcg: Factor out vec_full_reg_offset() Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 10/27] s390x/tcg: Factor out gen_addi_and_wrap_i64() from get_address() Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 11/27] s390x/tcg: Implement LOAD LENGTHENED short HFP to long HFP Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 12/27] s390x/tcg: Implement LOAD COUNT TO BLOCK BOUNDARY Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 13/27] s390x/tcg: Fix TEST DATA CLASS instructions Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 14/27] s390x/tcg: Fix rounding from float128 to uint64_t/uint32_t Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 15/27] s390x/tcg: Factor out conversion of softfloat exceptions Cornelia Huck
2019-03-04 12:01 ` [Qemu-devel] [PULL 16/27] s390x/tcg: Fix parts of IEEE exception handling Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 17/27] s390x/tcg: Hide IEEE underflows in some scenarios Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 18/27] s390x/tcg: Refactor SET FPC AND SIGNAL handling Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 19/27] s390x/tcg: Fix simulated-IEEE exceptions Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 20/27] s390x/tcg: Handle SET FPC AND LOAD FPC 3-bit BFP rounding modes Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 21/27] s390x/tcg: Check for exceptions in SET BFP ROUNDING MODE Cornelia Huck
2019-03-04 12:02 ` Cornelia Huck [this message]
2019-03-04 12:02 ` [Qemu-devel] [PULL 23/27] s390x/tcg: Prepare for IEEE-inexact-exception control (XxC) Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 24/27] s390x/tcg: Implement XxC and checks for most FP instructions Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 25/27] s390x/tcg: Implement rounding mode and XxC for LOAD ROUNDED Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 26/27] s390x/tcg: Handle all rounding modes overwritten by BFP instructions Cornelia Huck
2019-03-04 12:02 ` [Qemu-devel] [PULL 27/27] s390x: Add floating-point extension facility to "qemu" cpu model Cornelia Huck
2019-03-04 14:29 ` [Qemu-devel] [PULL 00/27] s390x updates Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190304120210.31500-23-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).