Commit 496feddd authored Oct 28, 2015 by Peter Maydell

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging



target-i386: finally enable "check" mode by default

# gpg: Signature made Wed 28 Oct 2015 14:13:10 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: Enable "check" mode by default
  target-i386: Don't left shift negative constant

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents 739680da 15e41345

target-i386/cpu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3141,7 +3141,7 @@ static Property x86_cpu_properties[] = {
		DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false),
		DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false),
		DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false),
		DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, false),
		DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true),
		DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),
		DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true),
		DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),

target-i386/translate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2432,7 +2432,7 @@ static void gen_pusha(DisasContext *s)
		{
		int i;
		gen_op_movl_A0_reg(R_ESP);
		gen_op_addl_A0_im(-8 << s->dflag);
		gen_op_addl_A0_im(-(8 << s->dflag));
		if (!s->ss32)
		tcg_gen_ext16u_tl(cpu_A0, cpu_A0);
		tcg_gen_mov_tl(cpu_T[1], cpu_A0);