Re: [Qemu-devel] [PATCH 23/31] target/s390x: Use unwind data for helper_lctlg

[Thomas Huth]

On 23.05.2017 05:03, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <address@hidden>
> ---
>  target/s390x/mem_helper.c | 8 ++++----
>  target/s390x/translate.c  | 1 -
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
> index 902290c..26960e4 100644
> --- a/target/s390x/mem_helper.c
> +++ b/target/s390x/mem_helper.c
> @@ -821,20 +821,20 @@ void HELPER(cdsg)(CPUS390XState *env, uint64_t addr,
>  #if !defined(CONFIG_USER_ONLY)
>  void HELPER(lctlg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3)
>  {
> +    uintptr_t ra = GETPC();
>      S390CPU *cpu = s390_env_get_cpu(env);
>      bool PERchanged = false;
> -    int i;
>      uint64_t src = a2;
> -    uint64_t val;
> +    uint32_t i;
>  
>      for (i = r1;; i = (i + 1) % 16) {
> -        val = cpu_ldq_data(env, src);
> +        uint64_t val = cpu_ldq_data_ra(env, src, ra);
>          if (env->cregs[i] != val && i >= 9 && i <= 11) {
>              PERchanged = true;
>          }
>          env->cregs[i] = val;
>          HELPER_LOG("load ctl %d from 0x%" PRIx64 " == 0x%" PRIx64 "\n",
> -                   i, src, env->cregs[i]);
> +                   i, src, val);

I think you should mention in the patch description that you've fixed
the HELPER_LOG here, too. Apart from that:

Reviewed-by: Thomas Huth <address@hidden>