Re: [Qemu-devel] [PATCH] target-sparc: Fix order of function parameters

[Blue Swirl]

Thanks, applied.

On Mon, Oct 24, 2011 at 20:29, Stefan Weil <address@hidden> wrote:
> The MinGW-w64 gcc complains about wrong parameters for
> gen_helper_fpadd16_s and three other functions.
>
> gen_helper_fpadd16_s is declared like this (hidden in lots of macros):
>
> static inline void
>  gen_helper_fpadd16s(TCGv_i32 retval, TCGv_ptr arg1,
>                     TCGv_i32 arg2, TCGv_i32 arg3);
>
> So it looks like cpu_env should be the 2nd parameter.
>
> Please review this patch as I have no environment to test it
> (maybe the 1st parameter should be cpu_dst?).
>
> Cc: Blue Swirl <address@hidden>
> Signed-off-by: Stefan Weil <address@hidden>
> ---
>  target-sparc/translate.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/target-sparc/translate.c b/target-sparc/translate.c
> index ac27d64..bb5010f 100644
> --- a/target-sparc/translate.c
> +++ b/target-sparc/translate.c
> @@ -4012,7 +4012,7 @@ static void disas_sparc_insn(DisasContext * dc)
>                     break;
>                 case 0x051: /* VIS I fpadd16s */
>                     CHECK_FPU_FEATURE(dc, VIS1);
> -                    gen_helper_fpadd16s(cpu_env, cpu_fpr[rd],
> +                    gen_helper_fpadd16s(cpu_fpr[rd], cpu_env,
>                                         cpu_fpr[rs1], cpu_fpr[rs2]);
>                     gen_update_fprs_dirty(rd);
>                     break;
> @@ -4026,7 +4026,7 @@ static void disas_sparc_insn(DisasContext * dc)
>                     break;
>                 case 0x053: /* VIS I fpadd32s */
>                     CHECK_FPU_FEATURE(dc, VIS1);
> -                    gen_helper_fpadd32s(cpu_env, cpu_fpr[rd],
> +                    gen_helper_fpadd32s(cpu_fpr[rd], cpu_env,
>                                         cpu_fpr[rs1], cpu_fpr[rs2]);
>                     gen_update_fprs_dirty(rd);
>                     break;
> @@ -4040,7 +4040,7 @@ static void disas_sparc_insn(DisasContext * dc)
>                     break;
>                 case 0x055: /* VIS I fpsub16s */
>                     CHECK_FPU_FEATURE(dc, VIS1);
> -                    gen_helper_fpsub16s(cpu_env, cpu_fpr[rd],
> +                    gen_helper_fpsub16s(cpu_fpr[rd], cpu_env,
>                                         cpu_fpr[rs1], cpu_fpr[rs2]);
>                     gen_update_fprs_dirty(rd);
>                     break;
> @@ -4054,7 +4054,7 @@ static void disas_sparc_insn(DisasContext * dc)
>                     break;
>                 case 0x057: /* VIS I fpsub32s */
>                     CHECK_FPU_FEATURE(dc, VIS1);
> -                    gen_helper_fpsub32s(cpu_env, cpu_fpr[rd],
> +                    gen_helper_fpsub32s(cpu_fpr[rd], cpu_env,
>                                         cpu_fpr[rs1], cpu_fpr[rs2]);
>                     gen_update_fprs_dirty(rd);
>                     break;
> --
> 1.7.2.5
>
>