diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-28 15:08:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-28 15:08:36 +0000 |
| commit | 496fedddce9a575111df4f912fb9e361037531ed (patch) | |
| tree | dc425903d3488edaaf362fbfca628a2c1aa4da18 /target-i386 | |
| parent | 739680da59de8531a280e9360aae756b6134a3ec (diff) | |
| parent | 15e41345906d29a319cc9cdf566347bf79134d24 (diff) | |
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>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 2 | ||||
| -rw-r--r-- | target-i386/translate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c1a9e09743..9280bfc7d8 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -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), diff --git a/target-i386/translate.c b/target-i386/translate.c index 764b1e44b7..862f8e09fb 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -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); |