From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aa9E9-0002w6-KC for qemu-devel@nongnu.org; Sun, 28 Feb 2016 16:50:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aa9E8-0000Ig-Ep for qemu-devel@nongnu.org; Sun, 28 Feb 2016 16:50:09 -0500 Received: from smtp3-g21.free.fr ([2a01:e0c:1:1599::12]:58859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aa9E8-0000Ek-8f for qemu-devel@nongnu.org; Sun, 28 Feb 2016 16:50:08 -0500 From: =?UTF-8?Q?Herv=c3=a9_Poussineau?= Message-ID: <56D36B83.7000404@reactos.org> Date: Sun, 28 Feb 2016 22:49:55 +0100 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010409090907070605040305" Subject: [Qemu-devel] [QEMU] Windows XP / Windows 95 / MS-DOS 6 regressions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Richard Henderson , qemu-devel Cc: Paolo Bonzini This is a multi-part message in MIME format. --------------010409090907070605040305 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi, I currently see some regressions on Microsoft operating systems. 1) Windows XP bugchecks since commit: commit 7f0b7141b4c7deab51efd8ee1e83eab2d9b7a9ea Author: Richard Henderson Date: Mon Jul 6 17:29:59 2015 +0100 target-i386: Perform set/reset_inhibit_irq inline With helpers that can be reused for other things. Signed-off-by: Richard Henderson I'm starting QEMU with -cpu pentium2. Attached patch can be applied on master to work-around the problem. Another work-around is to start with -enable-kvm. 2) Windows 95 bugchecks since commit: commit d6a2914984c89fa0a3125b9842e0cbf68de79a3d Author: Richard Henderson Date: Thu Dec 17 11:19:19 2015 -0800 target-i386: Use gen_lea_v_seg in gen_lea_modrm Centralize handling of segment bases. Signed-off-by: Richard Henderson Message-Id: <1450379966-28198-4-git-send-email-rth@twiddle.net> Signed-off-by: Paolo Bonzini (with 88c73d16ad1b6c22a2ab082064d0d521f756296a and 4987783400667147ada01a= 5bdcce53f11b822888 cherry-picked) I'm starting QEMU with -cpu pentium. I've not searched for a work-around. 3) MS-DOS 6 freezes when loading himem.sys since commit: commit 1906b2af7c2345037d9b2fdf484b457b5acd09d1 Author: Richard Henderson Date: Thu Jul 2 13:59:21 2015 +0100 target-i386: Rearrange processing of 0F 01 Rather than nesting tests of OP, MOD, and RM, decode them all at once with a switch. Fixes incorrect decoding of AMD Pacifica extensions (aka vmrun et al) via op=3D=3D2 path. Signed-off-by: Richard Henderson I'm starting QEMU with -cpu 486. It works on master if I add -enable-kvm Herv=C3=A9 --------------010409090907070605040305 Content-Type: text/x-patch; name="0001-target-i386-partially-revert-Perform-set-reset_inhib.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-target-i386-partially-revert-Perform-set-reset_inhib.pa"; filename*1="tch" >>From 0e66ca87ac7c94219ab49cfbed6f586c51c697de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 28 Feb 2016 15:00:29 +0100 Subject: [PATCH] target-i386: partially revert 'Perform set/reset_inhibit_irq inline' This partially reverts commit 7f0b7141b4c7deab51efd8ee1e83eab2d9b7a9ea to fix Windows XP. --- target-i386/cc_helper.c | 5 +++++ target-i386/helper.h | 1 + target-i386/translate.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/target-i386/cc_helper.c b/target-i386/cc_helper.c index 83af223..e6f4fe9 100644 --- a/target-i386/cc_helper.c +++ b/target-i386/cc_helper.c @@ -383,3 +383,8 @@ void helper_sti_vm(CPUX86State *env) } } #endif + +void helper_set_inhibit_irq(CPUX86State *env) +{ + env->hflags |= HF_INHIBIT_IRQ_MASK; +} diff --git a/target-i386/helper.h b/target-i386/helper.h index e33451a..bdba6bd 100644 --- a/target-i386/helper.h +++ b/target-i386/helper.h @@ -70,6 +70,7 @@ DEF_HELPER_1(cli, void, env) DEF_HELPER_1(sti, void, env) DEF_HELPER_1(clac, void, env) DEF_HELPER_1(stac, void, env) +DEF_HELPER_1(set_inhibit_irq, void, env) DEF_HELPER_3(boundw, void, env, tl, int) DEF_HELPER_3(boundl, void, env, tl, int) DEF_HELPER_1(rsm, void, env) diff --git a/target-i386/translate.c b/target-i386/translate.c index 9171929..4ec94b9 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -6780,7 +6780,8 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, /* interruptions are enabled only the first insn after sti */ /* If several instructions disable interrupts, only the _first_ does it */ - gen_set_hflag(s, HF_INHIBIT_IRQ_MASK); + if (!(s->tb->flags & HF_INHIBIT_IRQ_MASK)) + gen_helper_set_inhibit_irq(cpu_env); /* give a chance to handle pending irqs */ gen_jmp_im(s->pc - s->cs_base); gen_eob(s); -- 2.1.4 --------------010409090907070605040305--