Re: [PATCH v1 12/28] target/m68k: use gdb_get_reg helpers

[Philippe Mathieu-Daudé]

On 3/16/20 6:21 PM, Alex Bennée wrote:
> This is cleaner than poking memory directly and will make later
> clean-ups easier.
>
> Signed-off-by: Alex Bennée <address@hidden>
> Reviewed-by: Richard Henderson <address@hidden>
> Reviewed-by: Laurent Vivier <address@hidden>
>
> ---
> v3
>    - fix mem_buf references
>    - fix mem_buf + len cases
> ---
>   target/m68k/helper.c | 29 +++++++++++------------------
>   1 file changed, 11 insertions(+), 18 deletions(-)
>
> diff --git a/target/m68k/helper.c b/target/m68k/helper.c
> index baf7729af00..c23b70f854d 100644
> --- a/target/m68k/helper.c
> +++ b/target/m68k/helper.c
> @@ -72,19 +72,15 @@ static int cf_fpu_gdb_get_reg(CPUM68KState *env, uint8_t 
> *mem_buf, int n)
>   {
>       if (n < 8) {
>           float_status s;
> -        stfq_p(mem_buf, floatx80_to_float64(env->fregs[n].d, &s));
> -        return 8;
> +        return gdb_get_reg64(mem_buf, floatx80_to_float64(env->fregs[n].d, 
> &s));
>       }
>       switch (n) {
>       case 8: /* fpcontrol */
> -        stl_be_p(mem_buf, env->fpcr);
> -        return 4;
> +        return gdb_get_reg32(mem_buf, env->fpcr);
>       case 9: /* fpstatus */
> -        stl_be_p(mem_buf, env->fpsr);
> -        return 4;
> +        return gdb_get_reg32(mem_buf, env->fpsr);
>       case 10: /* fpiar, not implemented */
> -        memset(mem_buf, 0, 4);
> -        return 4;
> +        return gdb_get_reg32(mem_buf, 0);
>       }
>       return 0;
>   }
> @@ -112,21 +108,18 @@ static int cf_fpu_gdb_set_reg(CPUM68KState *env, uint8_t 
> *mem_buf, int n)
>   static int m68k_fpu_gdb_get_reg(CPUM68KState *env, uint8_t *mem_buf, int n)
>   {
>       if (n < 8) {
> -        stw_be_p(mem_buf, env->fregs[n].l.upper);
> -        memset(mem_buf + 2, 0, 2);
> -        stq_be_p(mem_buf + 4, env->fregs[n].l.lower);
> -        return 12;
> +        int len = gdb_get_reg16(mem_buf, env->fregs[n].l.upper);
> +        len += gdb_get_reg16(mem_buf + len, 0);
> +        len += gdb_get_reg64(mem_buf + len, env->fregs[n].l.lower);

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> +        return len;
>       }
>       switch (n) {
>       case 8: /* fpcontrol */
> -        stl_be_p(mem_buf, env->fpcr);
> -        return 4;
> +        return gdb_get_reg32(mem_buf, env->fpcr);
>       case 9: /* fpstatus */
> -        stl_be_p(mem_buf, env->fpsr);
> -        return 4;
> +        return gdb_get_reg32(mem_buf, env->fpsr);
>       case 10: /* fpiar, not implemented */
> -        memset(mem_buf, 0, 4);
> -        return 4;
> +        return gdb_get_reg32(mem_buf, 0);
>       }
>       return 0;
>   }