[Qemu-devel] [PATCH v4 0/1] target/m68k, linux-user: manage FP registers in ucontext

[Qemu-devel] [PATCH v4 0/1] target/m68k, linux-user: manage FP registers in ucontext

[Laurent Vivier]

v3:
    rebase and add R-b from rth
    should also fix patchew errors as the missing commits
    are now in the master

v2:
    add missing cpu_m68k_set_fpcr() to update FPU internal state

The v1 was in the v5 of the series "target-m68k: implement 680x0 FPU"

Laurent Vivier (1):
  target/m68k,linux-user: manage FP registers in ucontext

 linux-user/signal.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

-- 
2.13.5

[Qemu-devel] [PATCH v4 1/1] target/m68k, linux-user: manage FP registers in ucontext

[Laurent Vivier]

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <rth@twiddle.net>
---
 linux-user/signal.c | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/linux-user/signal.c b/linux-user/signal.c
index cc0c3fcee9..7a238aaea1 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -5704,6 +5704,24 @@ give_sigsegv:
     force_sigsegv(sig);
 }
 
+static inline void target_rt_save_fpu_state(struct target_ucontext *uc,
+                                           CPUM68KState *env)
+{
+    int i;
+    target_fpregset_t *fpregs = &uc->tuc_mcontext.fpregs;
+
+    __put_user(env->fpcr, &fpregs->f_fpcntl[0]);
+    __put_user(env->fpsr, &fpregs->f_fpcntl[1]);
+    /* fpiar is not emulated */
+
+    for (i = 0; i < 8; i++) {
+        uint32_t high = env->fregs[i].d.high << 16;
+        __put_user(high, &fpregs->f_fpregs[i * 3]);
+        __put_user(env->fregs[i].d.low,
+                   (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]);
+    }
+}
+
 static inline int target_rt_setup_ucontext(struct target_ucontext *uc,
                                            CPUM68KState *env)
 {
@@ -5730,9 +5748,32 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc,
     __put_user(env->pc, &gregs[16]);
     __put_user(sr, &gregs[17]);
 
+    target_rt_save_fpu_state(uc, env);
+
     return 0;
 }
 
+static inline void target_rt_restore_fpu_state(CPUM68KState *env,
+                                               struct target_ucontext *uc)
+{
+    int i;
+    target_fpregset_t *fpregs = &uc->tuc_mcontext.fpregs;
+    uint32_t fpcr;
+
+    __get_user(fpcr, &fpregs->f_fpcntl[0]);
+    cpu_m68k_set_fpcr(env, fpcr);
+    __get_user(env->fpsr, &fpregs->f_fpcntl[1]);
+    /* fpiar is not emulated */
+
+    for (i = 0; i < 8; i++) {
+        uint32_t high;
+        __get_user(high, &fpregs->f_fpregs[i * 3]);
+        env->fregs[i].d.high = high >> 16;
+        __get_user(env->fregs[i].d.low,
+                   (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]);
+    }
+}
+
 static inline int target_rt_restore_ucontext(CPUM68KState *env,
                                              struct target_ucontext *uc)
 {
@@ -5764,6 +5805,8 @@ static inline int target_rt_restore_ucontext(CPUM68KState *env,
     __get_user(temp, &gregs[17]);
     cpu_m68k_set_ccr(env, temp);
 
+    target_rt_restore_fpu_state(env, uc);
+
     return 0;
 
 badframe:
-- 
2.13.5

Re: [Qemu-devel] [PATCH v4 1/1] target/m68k, linux-user: manage FP registers in ucontext

[Riku Voipio]

On Thu, Sep 14, 2017 at 06:35:05PM +0200, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> Reviewed-by: Richard Henderson <rth@twiddle.net>

Applied to linux-user que, thnanks

> ---
>  linux-user/signal.c | 43 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/linux-user/signal.c b/linux-user/signal.c
> index cc0c3fcee9..7a238aaea1 100644
> --- a/linux-user/signal.c
> +++ b/linux-user/signal.c
> @@ -5704,6 +5704,24 @@ give_sigsegv:
>      force_sigsegv(sig);
>  }
>  
> +static inline void target_rt_save_fpu_state(struct target_ucontext *uc,
> +                                           CPUM68KState *env)
> +{
> +    int i;
> +    target_fpregset_t *fpregs = &uc->tuc_mcontext.fpregs;
> +
> +    __put_user(env->fpcr, &fpregs->f_fpcntl[0]);
> +    __put_user(env->fpsr, &fpregs->f_fpcntl[1]);
> +    /* fpiar is not emulated */
> +
> +    for (i = 0; i < 8; i++) {
> +        uint32_t high = env->fregs[i].d.high << 16;
> +        __put_user(high, &fpregs->f_fpregs[i * 3]);
> +        __put_user(env->fregs[i].d.low,
> +                   (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]);
> +    }
> +}
> +
>  static inline int target_rt_setup_ucontext(struct target_ucontext *uc,
>                                             CPUM68KState *env)
>  {
> @@ -5730,9 +5748,32 @@ static inline int target_rt_setup_ucontext(struct target_ucontext *uc,
>      __put_user(env->pc, &gregs[16]);
>      __put_user(sr, &gregs[17]);
>  
> +    target_rt_save_fpu_state(uc, env);
> +
>      return 0;
>  }
>  
> +static inline void target_rt_restore_fpu_state(CPUM68KState *env,
> +                                               struct target_ucontext *uc)
> +{
> +    int i;
> +    target_fpregset_t *fpregs = &uc->tuc_mcontext.fpregs;
> +    uint32_t fpcr;
> +
> +    __get_user(fpcr, &fpregs->f_fpcntl[0]);
> +    cpu_m68k_set_fpcr(env, fpcr);
> +    __get_user(env->fpsr, &fpregs->f_fpcntl[1]);
> +    /* fpiar is not emulated */
> +
> +    for (i = 0; i < 8; i++) {
> +        uint32_t high;
> +        __get_user(high, &fpregs->f_fpregs[i * 3]);
> +        env->fregs[i].d.high = high >> 16;
> +        __get_user(env->fregs[i].d.low,
> +                   (uint64_t *)&fpregs->f_fpregs[i * 3 + 1]);
> +    }
> +}
> +
>  static inline int target_rt_restore_ucontext(CPUM68KState *env,
>                                               struct target_ucontext *uc)
>  {
> @@ -5764,6 +5805,8 @@ static inline int target_rt_restore_ucontext(CPUM68KState *env,
>      __get_user(temp, &gregs[17]);
>      cpu_m68k_set_ccr(env, temp);
>  
> +    target_rt_restore_fpu_state(env, uc);
> +
>      return 0;
>  
>  badframe:
> -- 
> 2.13.5
>