Re: [Qemu-devel] [PULL 06/37] target-ppc: VXSQRT Should Not Be Set for NaNs

[Alexander Graf <agraf@suse.de>]

On 12.02.15 23:21, Maciej W. Rozycki wrote:
> On Wed, 7 Jan 2015, Alexander Graf wrote:
> 
>> diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c
>> index 7f74466..81db60f 100644
>> --- a/target-ppc/fpu_helper.c
>> +++ b/target-ppc/fpu_helper.c
>> @@ -920,14 +923,16 @@ uint64_t helper_fsqrt(CPUPPCState *env, uint64_t arg)
>>  
>>      farg.ll = arg;
>>  
>> -    if (unlikely(float64_is_neg(farg.d) && !float64_is_zero(farg.d))) {
>> -        /* Square root of a negative nonzero number */
>> -        farg.ll = fload_invalid_op_excp(env, POWERPC_EXCP_FP_VXSQRT, 1);
>> -    } else {
>> +    if (unlikely(float64_is_any_nan(farg.d))) {
>>          if (unlikely(float64_is_signaling_nan(farg.d))) {
>> -            /* sNaN square root */
>> +            /* sNaN reciprocal square root */
> 
>  This change to the comment looks accidental, compare the changes below.  
> Should it be reverted?  [Found this while resolving merge conflicts.]

Nicely spotted. Could you please cook up a small patch fixing it?


Thanks!

Alex