Re: [Qemu-devel] [PATCH 01/32] ppc: Fix fault PC reporting for lve*/stve* VMX instructions

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 3257 bytes --]

On Wed, Jul 27, 2016 at 08:20:55AM +1000, Benjamin Herrenschmidt wrote:
> We forgot to do gen_update_nip() for these like we do with other
> helpers. Fix this, but in a more efficient way by passing the RA
> to the accessors instead so the overhead is only taken on faults.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

As a bugfix, I've applied this to ppc-for-2.7.

> ---
>  target-ppc/mem_helper.c | 21 +++++++++++----------
>  1 file changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
> index e4de86b..e4ed377 100644
> --- a/target-ppc/mem_helper.c
> +++ b/target-ppc/mem_helper.c
> @@ -232,16 +232,16 @@ target_ulong helper_lscbx(CPUPPCState *env, target_ulong addr, uint32_t reg,
>                                                                  \
>          if (needs_byteswap(env)) {                              \
>              r->element[LO_IDX ? index : (adjust - index)] =     \
> -                swap(access(env, addr));                        \
> +                swap(access(env, addr, GETPC()));               \
>          } else {                                                \
>              r->element[LO_IDX ? index : (adjust - index)] =     \
> -                access(env, addr);                              \
> +                access(env, addr, GETPC());                     \
>          }                                                       \
>      }
>  #define I(x) (x)
> -LVE(lvebx, cpu_ldub_data, I, u8)
> -LVE(lvehx, cpu_lduw_data, bswap16, u16)
> -LVE(lvewx, cpu_ldl_data, bswap32, u32)
> +LVE(lvebx, cpu_ldub_data_ra, I, u8)
> +LVE(lvehx, cpu_lduw_data_ra, bswap16, u16)
> +LVE(lvewx, cpu_ldl_data_ra, bswap32, u32)
>  #undef I
>  #undef LVE
>  
> @@ -259,16 +259,17 @@ LVE(lvewx, cpu_ldl_data, bswap32, u32)
>                                                                          \
>          if (needs_byteswap(env)) {                                      \
>              access(env, addr, swap(r->element[LO_IDX ? index :          \
> -                                              (adjust - index)]));      \
> +                                              (adjust - index)]),       \
> +                        GETPC());                                       \
>          } else {                                                        \
>              access(env, addr, r->element[LO_IDX ? index :               \
> -                                         (adjust - index)]);            \
> +                                         (adjust - index)], GETPC());   \
>          }                                                               \
>      }
>  #define I(x) (x)
> -STVE(stvebx, cpu_stb_data, I, u8)
> -STVE(stvehx, cpu_stw_data, bswap16, u16)
> -STVE(stvewx, cpu_stl_data, bswap32, u32)
> +STVE(stvebx, cpu_stb_data_ra, I, u8)
> +STVE(stvehx, cpu_stw_data_ra, bswap16, u16)
> +STVE(stvewx, cpu_stl_data_ra, bswap32, u32)
>  #undef I
>  #undef LVE
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]