Re: [Qemu-devel] [PATCH 7/8] target-sh4: factorize fmov implementation

[Peter Maydell]

On 21 December 2013 16:59, Aurelien Jarno <address@hidden> wrote:
> Signed-off-by: Aurelien Jarno <address@hidden>
> ---
>  target-sh4/translate.c |   31 ++++++++++++++-----------------
>  1 file changed, 14 insertions(+), 17 deletions(-)
>
> diff --git a/target-sh4/translate.c b/target-sh4/translate.c
> index 26b45c1..23d51c6 100644
> --- a/target-sh4/translate.c
> +++ b/target-sh4/translate.c
> @@ -1024,23 +1024,20 @@ static void _decode_opc(DisasContext * ctx)
>         return;
>      case 0xf00b: /* fmov {F,D,X}Rm,@-Rn - FPSCR: Nothing */
>         CHECK_FPU_ENABLED
> -        if (ctx->flags & FPSCR_SZ) {
> -           TCGv addr = tcg_temp_new_i32();
> -           int fr = XREG(B7_4);
> -           tcg_gen_subi_i32(addr, REG(B11_8), 4);
> -           tcg_gen_qemu_st32(cpu_fregs[fr+1], addr, ctx->memidx);
> -           tcg_gen_subi_i32(addr, addr, 4);
> -           tcg_gen_qemu_st32(cpu_fregs[fr  ], addr, ctx->memidx);
> -           tcg_gen_mov_i32(REG(B11_8), addr);
> -           tcg_temp_free(addr);
> -       } else {
> -           TCGv addr;
> -           addr = tcg_temp_new_i32();
> -           tcg_gen_subi_i32(addr, REG(B11_8), 4);
> -           tcg_gen_qemu_st32(cpu_fregs[FREG(B7_4)], addr, ctx->memidx);
> -           tcg_gen_mov_i32(REG(B11_8), addr);
> -           tcg_temp_free(addr);
> -       }
> +        {
> +            const int fr = XREG(B7_4);
> +            TCGv addr = tcg_temp_new_i32();
> +            tcg_gen_subi_i32(addr, REG(B11_8), 4);
> +            if (ctx->flags & FPSCR_SZ) {
> +                tcg_gen_qemu_st32(cpu_fregs[fr+1], addr, ctx->memidx);
> +                tcg_gen_subi_i32(addr, addr, 4);
> +                tcg_gen_qemu_st32(cpu_fregs[fr], addr, ctx->memidx);
> +            } else {
> +                tcg_gen_qemu_st32(cpu_fregs[fr], addr, ctx->memidx);
> +            }
> +            tcg_gen_mov_i32(REG(B11_8), addr);
> +            tcg_temp_free(addr);
> +        }
>         return;
>      case 0xf006: /* fmov @(R0,Rm),{F,D,X}Rm - FPSCR: Nothing */
>         CHECK_FPU_ENABLED

Isn't this going to conflict with the "update to new qemu ld/st ops"
patch you posted earlier?

thanks
-- PMM