[PATCH for-6.2 23/43] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu

Richard Henderson posted 43 patches 4 years, 6 months ago
[PATCH for-6.2 23/43] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu
Posted by Richard Henderson 4 years, 6 months ago
This crept in as either a cut-and-paste error, or rebase error.

Fixes: cfec388518d
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 accel/tcg/atomic_template.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
index 4427fab6df..4230ff2957 100644
--- a/accel/tcg/atomic_template.h
+++ b/accel/tcg/atomic_template.h
@@ -251,7 +251,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val,
                                          PAGE_WRITE, retaddr);
     uint16_t info = atomic_trace_st_pre(env, addr, oi);
 
-    val = BSWAP(val);
     val = BSWAP(val);
     atomic16_set(haddr, val);
     ATOMIC_MMU_CLEANUP;
-- 
2.25.1


Re: [PATCH for-6.1? 23/43] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu
Posted by Philippe Mathieu-Daudé 4 years, 6 months ago
On 7/29/21 2:46 AM, Richard Henderson wrote:
> This crept in as either a cut-and-paste error, or rebase error.
> 
> Fixes: cfec388518d
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  accel/tcg/atomic_template.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
> index 4427fab6df..4230ff2957 100644
> --- a/accel/tcg/atomic_template.h
> +++ b/accel/tcg/atomic_template.h
> @@ -251,7 +251,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val,
>                                           PAGE_WRITE, retaddr);
>      uint16_t info = atomic_trace_st_pre(env, addr, oi);
>  
> -    val = BSWAP(val);
>      val = BSWAP(val);
>      atomic16_set(haddr, val);
>      ATOMIC_MMU_CLEANUP;

Why not merge this for 6.1? Because old bug, no regression?

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Re: [PATCH for-6.1? 23/43] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu
Posted by Richard Henderson 4 years, 6 months ago
On 7/28/21 8:29 PM, Philippe Mathieu-Daudé wrote:
> On 7/29/21 2:46 AM, Richard Henderson wrote:
>> This crept in as either a cut-and-paste error, or rebase error.
>>
>> Fixes: cfec388518d
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>>   accel/tcg/atomic_template.h | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
>> index 4427fab6df..4230ff2957 100644
>> --- a/accel/tcg/atomic_template.h
>> +++ b/accel/tcg/atomic_template.h
>> @@ -251,7 +251,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val,
>>                                            PAGE_WRITE, retaddr);
>>       uint16_t info = atomic_trace_st_pre(env, addr, oi);
>>   
>> -    val = BSWAP(val);
>>       val = BSWAP(val);
>>       atomic16_set(haddr, val);
>>       ATOMIC_MMU_CLEANUP;
> 
> Why not merge this for 6.1? Because old bug, no regression?

Probably should.


r~