Re: [Qemu-devel] [PATCH] target-i386: Fix compilation with --enable-debug

[Andreas Färber]

Am 29.06.2012 22:38, schrieb Stefan Weil:
> commit c4baa0503d9623f1ce891f525ccd140c598bc29a improved SSE table
> type safety which now raises compiler errors when latest QEMU was
> configured with --enable-debug.
> 
> Fix this by splitting the SSE tables even further to separate
> helper functions with different signatures.
> 
> Instead of crashing by calling address 0, the code now jumps to
> label illegal_op.
> 
> Signed-off-by: Stefan Weil <address@hidden>
> ---
>  target-i386/translate.c |   59 
> +++++++++++++++++++++++++++--------------------
>  1 file changed, 34 insertions(+), 25 deletions(-)
> 
> diff --git a/target-i386/translate.c b/target-i386/translate.c
> index a902f4a..a00a6a1 100644
> --- a/target-i386/translate.c
> +++ b/target-i386/translate.c
> @@ -2947,25 +2947,34 @@ static const SSEFunc_0_pp sse_op_table2[3 * 8][2] = {
>      [16 + 7] = { NULL, gen_helper_pslldq_xmm },
>  };
>  
> -static const SSEFunc_0_pi sse_op_table3a[4] = {
> +static const SSEFunc_0_pi sse_op_table3ai[] = {
>      gen_helper_cvtsi2ss,
> -    gen_helper_cvtsi2sd,
> -    X86_64_ONLY(gen_helper_cvtsq2ss),
> -    X86_64_ONLY(gen_helper_cvtsq2sd),
> +    gen_helper_cvtsi2sd
>  };

If you left the commas in, the patch would be easier to read. ;)

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg