* [PATCH] target/hppa: Set FPCR exception flag bits for non-trapped exceptions
@ 2025-10-17 8:53 Peter Maydell
2025-10-22 19:00 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2025-10-17 8:53 UTC (permalink / raw)
To: qemu-devel; +Cc: Richard Henderson, Helge Deller
In commit ebd394948de4e8 ("target/hppa: Fix FPE exceptions") when
we added the code for setting up the registers correctly on trapping
FP exceptions, we accidentally broke the handling of the flag bits
for non-trapping exceptions.
In update_fr0_op() we incorrectly zero out the flag bits and the C
bit, so any fp operation would clear previously set flag bits. We
also stopped setting the flag bits when the fp operation raises
an exception and the trap is not enabled.
Adjust the code so that we set the Flag bits for every exception that
happened and where the trap is not enabled. (This is the correct
behaviour for the case where an instruction triggers two exceptions,
one of which traps and one of which does not; that can only happen
for inexact + underflow or inexact + overflow.)
Cc: qemu-stable@nongnu.org
Fixes: ebd394948de4e8 ("target/hppa: Fix FPE exceptions")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3158
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/hppa/fpu_helper.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/target/hppa/fpu_helper.c b/target/hppa/fpu_helper.c
index 45353202fae..2d272730f60 100644
--- a/target/hppa/fpu_helper.c
+++ b/target/hppa/fpu_helper.c
@@ -94,7 +94,8 @@ static void update_fr0_op(CPUHPPAState *env, uintptr_t ra)
{
uint32_t soft_exp = get_float_exception_flags(&env->fp_status);
uint32_t hard_exp = 0;
- uint32_t shadow = env->fr0_shadow & 0x3ffffff;
+ uint32_t shadow = env->fr0_shadow;
+ uint32_t to_flag = 0;
uint32_t fr1 = 0;
if (likely(soft_exp == 0)) {
@@ -122,6 +123,10 @@ static void update_fr0_op(CPUHPPAState *env, uintptr_t ra)
fr1 |= hard_exp << (R_FPSR_FLAGS_SHIFT - R_FPSR_ENABLES_SHIFT);
}
}
+ /* Set the Flag bits for every exception that was not enabled */
+ to_flag = hard_exp & ~shadow;
+ shadow |= to_flag << (R_FPSR_FLAGS_SHIFT - R_FPSR_ENABLES_SHIFT);
+
env->fr0_shadow = shadow;
env->fr[0] = (uint64_t)shadow << 32 | fr1;
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] target/hppa: Set FPCR exception flag bits for non-trapped exceptions
2025-10-17 8:53 [PATCH] target/hppa: Set FPCR exception flag bits for non-trapped exceptions Peter Maydell
@ 2025-10-22 19:00 ` Philippe Mathieu-Daudé
2025-10-25 15:24 ` Helge Deller
0 siblings, 1 reply; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-10-22 19:00 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Richard Henderson, Helge Deller, Gabriel Brookman
Cc'ing Gabriel
On 17/10/25 10:53, Peter Maydell wrote:
> In commit ebd394948de4e8 ("target/hppa: Fix FPE exceptions") when
> we added the code for setting up the registers correctly on trapping
> FP exceptions, we accidentally broke the handling of the flag bits
> for non-trapping exceptions.
>
> In update_fr0_op() we incorrectly zero out the flag bits and the C
> bit, so any fp operation would clear previously set flag bits. We
> also stopped setting the flag bits when the fp operation raises
> an exception and the trap is not enabled.
>
> Adjust the code so that we set the Flag bits for every exception that
> happened and where the trap is not enabled. (This is the correct
> behaviour for the case where an instruction triggers two exceptions,
> one of which traps and one of which does not; that can only happen
> for inexact + underflow or inexact + overflow.)
>
> Cc: qemu-stable@nongnu.org
> Fixes: ebd394948de4e8 ("target/hppa: Fix FPE exceptions")
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3158
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> target/hppa/fpu_helper.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/target/hppa/fpu_helper.c b/target/hppa/fpu_helper.c
> index 45353202fae..2d272730f60 100644
> --- a/target/hppa/fpu_helper.c
> +++ b/target/hppa/fpu_helper.c
> @@ -94,7 +94,8 @@ static void update_fr0_op(CPUHPPAState *env, uintptr_t ra)
> {
> uint32_t soft_exp = get_float_exception_flags(&env->fp_status);
> uint32_t hard_exp = 0;
> - uint32_t shadow = env->fr0_shadow & 0x3ffffff;
> + uint32_t shadow = env->fr0_shadow;
> + uint32_t to_flag = 0;
> uint32_t fr1 = 0;
>
> if (likely(soft_exp == 0)) {
> @@ -122,6 +123,10 @@ static void update_fr0_op(CPUHPPAState *env, uintptr_t ra)
> fr1 |= hard_exp << (R_FPSR_FLAGS_SHIFT - R_FPSR_ENABLES_SHIFT);
> }
> }
> + /* Set the Flag bits for every exception that was not enabled */
> + to_flag = hard_exp & ~shadow;
> + shadow |= to_flag << (R_FPSR_FLAGS_SHIFT - R_FPSR_ENABLES_SHIFT);
> +
> env->fr0_shadow = shadow;
> env->fr[0] = (uint64_t)shadow << 32 | fr1;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] target/hppa: Set FPCR exception flag bits for non-trapped exceptions
2025-10-22 19:00 ` Philippe Mathieu-Daudé
@ 2025-10-25 15:24 ` Helge Deller
0 siblings, 0 replies; 3+ messages in thread
From: Helge Deller @ 2025-10-25 15:24 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Richard Henderson, Gabriel Brookman, Philippe Mathieu-Daudé
On 10/22/25 21:00, Philippe Mathieu-Daudé wrote:
> On 17/10/25 10:53, Peter Maydell wrote:
>> In commit ebd394948de4e8 ("target/hppa: Fix FPE exceptions") when
>> we added the code for setting up the registers correctly on trapping
>> FP exceptions, we accidentally broke the handling of the flag bits
>> for non-trapping exceptions.
>>
>> In update_fr0_op() we incorrectly zero out the flag bits and the C
>> bit, so any fp operation would clear previously set flag bits. We
>> also stopped setting the flag bits when the fp operation raises
>> an exception and the trap is not enabled.
>>
>> Adjust the code so that we set the Flag bits for every exception that
>> happened and where the trap is not enabled. (This is the correct
>> behaviour for the case where an instruction triggers two exceptions,
>> one of which traps and one of which does not; that can only happen
>> for inexact + underflow or inexact + overflow.)
>>
>> Cc: qemu-stable@nongnu.org
>> Fixes: ebd394948de4e8 ("target/hppa: Fix FPE exceptions")
>> Resolves:
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Helge Deller <deller@gmx.de>
Tested-by: Helge Deller <deller@gmx.de>
Thanks!
Helge
>> ---
>> target/hppa/fpu_helper.c | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/target/hppa/fpu_helper.c b/target/hppa/fpu_helper.c
>> index 45353202fae..2d272730f60 100644
>> --- a/target/hppa/fpu_helper.c
>> +++ b/target/hppa/fpu_helper.c
>> @@ -94,7 +94,8 @@ static void update_fr0_op(CPUHPPAState *env, uintptr_t ra)
>> {
>> uint32_t soft_exp = get_float_exception_flags(&env->fp_status);
>> uint32_t hard_exp = 0;
>> - uint32_t shadow = env->fr0_shadow & 0x3ffffff;
>> + uint32_t shadow = env->fr0_shadow;
>> + uint32_t to_flag = 0;
>> uint32_t fr1 = 0;
>> if (likely(soft_exp == 0)) {
>> @@ -122,6 +123,10 @@ static void update_fr0_op(CPUHPPAState *env, uintptr_t ra)
>> fr1 |= hard_exp << (R_FPSR_FLAGS_SHIFT - R_FPSR_ENABLES_SHIFT);
>> }
>> }
>> + /* Set the Flag bits for every exception that was not enabled */
>> + to_flag = hard_exp & ~shadow;
>> + shadow |= to_flag << (R_FPSR_FLAGS_SHIFT - R_FPSR_ENABLES_SHIFT);
>> +
>> env->fr0_shadow = shadow;
>> env->fr[0] = (uint64_t)shadow << 32 | fr1;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-10-25 15:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-17 8:53 [PATCH] target/hppa: Set FPCR exception flag bits for non-trapped exceptions Peter Maydell
2025-10-22 19:00 ` Philippe Mathieu-Daudé
2025-10-25 15:24 ` Helge Deller
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).