Hi Hans, On Tue, May 03, 2011 at 01:03:40PM +0200, Hans de Goede wrote: > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index a13599d..e9e8d54 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -950,7 +950,7 @@ static int kvm_get_xsave(CPUState *env) > @@ -966,7 +966,7 @@ static int kvm_get_xsave(CPUState *env) > cwd = (uint16_t)xsave->region[0]; > swd = (uint16_t)(xsave->region[0] >> 16); > twd = (uint16_t)xsave->region[1]; > - fop = (uint16_t)(xsave->region[1] >> 16); > + /* fop = (uint16_t)(xsave->region[1] >> 16); */
Wouldn't it be better to drop this line?
> env->fpstt = (swd >> 11) & 7;
> env->fpus = swd;
> env->fpuc = cwd;
> diff --git a/tcg/tcg.c b/tcg/tcg.c
> index 8748c05..11a8daf 100644
> --- a/tcg/tcg.c
> +++ b/tcg/tcg.c
> @@ -585,7 +585,7 @@ void tcg_register_helper(void *func, const char *name)
> void tcg_gen_callN(TCGContext *s, TCGv_ptr func, unsigned int flags,
> int sizemask, TCGArg ret, int nargs, TCGArg *args)
> {
> -#ifdef TCG_TARGET_I386
> +#if defined TCG_TARGET_I386 && TCG_TARGET_REG_BITS < 64
This function uses #if defined(TCG_TARGET_I386) in other places, so I'd use
parentheses here for consistency.
> int call_type;
> #endif
> int i;
> @@ -612,7 +612,7 @@ void tcg_gen_callN(TCGContext *s, TCGv_ptr func, unsigned
> int flags,
>
> *gen_opc_ptr++ = INDEX_op_call;
> nparam = gen_opparam_ptr++;
> -#ifdef TCG_TARGET_I386
> +#if defined TCG_TARGET_I386 && TCG_TARGET_REG_BITS < 64
Same here.
Apart from that, I also need this patch to be able to build qemu on fedora
15 :)
Christophe
pgpOAaUcYjwZI.pgp
Description: PGP signature
