| Message ID | 56D36B83.7000404@reactos.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 28/02/2016 22:49, Hervé Poussineau wrote: > > > I currently see some regressions on Microsoft operating systems. > > 1) Windows XP bugchecks since commit: > commit 7f0b7141b4c7deab51efd8ee1e83eab2d9b7a9ea > Author: Richard Henderson <rth@twiddle.net> > 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 <rth@twiddle.net> > > 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. Ok, so let's go with the first one... The patch is incorrect because it looks at s->tb->flags. I'm posting a fix (mostly a revert) soon. Paolo
On 28/02/2016 22:49, Hervé Poussineau wrote: > > 3) MS-DOS 6 freezes when loading himem.sys since commit: > commit 1906b2af7c2345037d9b2fdf484b457b5acd09d1 > Author: Richard Henderson <rth@twiddle.net> > 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==2 path. > > Signed-off-by: Richard Henderson <rth@twiddle.net> > > I'm starting QEMU with -cpu 486. > It works on master if I add -enable-kvm Please test the other patch I've just sent. I have not looked at 2, but that patch seems to fix the Windows 98 setup CD for me besides fixing the problem with this commit. If it's not enough for your Windows 95 testcase, please try getting a trace with "-d in_asm,op_opt,int". Paolo
Le 01/03/2016 16:12, Paolo Bonzini a écrit : > > > On 28/02/2016 22:49, Hervé Poussineau wrote: >> >> 3) MS-DOS 6 freezes when loading himem.sys since commit: >> commit 1906b2af7c2345037d9b2fdf484b457b5acd09d1 >> Author: Richard Henderson <rth@twiddle.net> >> 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==2 path. >> >> Signed-off-by: Richard Henderson <rth@twiddle.net> >> >> I'm starting QEMU with -cpu 486. >> It works on master if I add -enable-kvm > > Please test the other patch I've just sent. I have not looked at 2, > but that patch seems to fix the Windows 98 setup CD for me besides > fixing the problem with this commit. > > If it's not enough for your Windows 95 testcase, please try getting a > trace with "-d in_asm,op_opt,int". Windows 95 still doesn't work, even with your two patches applied. The message is: "A fatal exception 0E has occurred at 0137:FD512607. The current application will be terminated. * Press any key to terminate the current application. * Press CTRL-ALT-DEL to restart your computer. You will lose any unsaved information in all applications. Press any key to continue." I can provide debug log by email if required. I also tested Windows 98. The first part setup correctly work, but doesn't work just after the reboot (for the first boot). The message is very similar to Windows 95. Hervé
On 01/03/2016 21:03, Hervé Poussineau wrote: > I also tested Windows 98. The first part setup correctly work, but > doesn't work just after the reboot (for the first boot). > The message is very similar to Windows 95. Indeed I stopped it after it got to the graphical part. I'll test again tomorrow, though perhaps Richard can beat me to it. Paolo
On 03/01/2016 12:03 PM, Hervé Poussineau wrote: > Windows 95 still doesn't work, even with your two patches applied. > > The message is: > > "A fatal exception 0E has occurred at 0137:FD512607. The current > application will be terminated. > > * Press any key to terminate the current application. > * Press CTRL-ALT-DEL to restart your computer. You will > lose any unsaved information in all applications. > > Press any key to continue." I get this same message (with 98) before all of the recent patches, i.e. testing a5af12871fd4601c44f08d9e49131e9ca13ef102. Of course, while I don't get this message from -enable-kvm, I'm still not able to boot 98 even with kvm. Which doesn't fill me with happy feelings about the state of the system, even though it's a fresh install. r~
Le 02/03/2016 05:05, Richard Henderson a écrit : > On 03/01/2016 12:03 PM, Hervé Poussineau wrote: >> Windows 95 still doesn't work, even with your two patches applied. >> >> The message is: >> >> "A fatal exception 0E has occurred at 0137:FD512607. The current >> application will be terminated. >> >> * Press any key to terminate the current application. >> * Press CTRL-ALT-DEL to restart your computer. You will >> lose any unsaved information in all applications. >> >> Press any key to continue." > > I get this same message (with 98) before all of the recent patches, > i.e. testing a5af12871fd4601c44f08d9e49131e9ca13ef102. > > Of course, while I don't get this message from -enable-kvm, I'm still not able to boot 98 even with kvm. Which doesn't fill me with happy feelings about the state of the system, even though it's a > fresh install. > I just reconfirmed that d6a2914984c89fa0a3125b9842e0cbf68de79a3d~1 + 88c73d16ad1b6c22a2ab082064d0d521f756296a works, while d6a2914984c89fa0a3125b9842e0cbf68de79a3d + 88c73d16ad1b6c22a2ab082064d0d521f756296a bugchecks. a5af12871fd4601c44f08d9e49131e9ca13ef102 that you tested is after d6a2914984c89fa0a3125b9842e0cbf68de79a3d which broke Windows 9x, that's why you're seeing it broken. It also has been a long time that Windows 9x doesn't work with -enable-kvm. Maybe even always... Hervé
On 02/03/2016 09:06, Hervé Poussineau wrote: > I just reconfirmed that > d6a2914984c89fa0a3125b9842e0cbf68de79a3d~1 + > 88c73d16ad1b6c22a2ab082064d0d521f756296a works, > while > d6a2914984c89fa0a3125b9842e0cbf68de79a3d + > 88c73d16ad1b6c22a2ab082064d0d521f756296a bugchecks. > > a5af12871fd4601c44f08d9e49131e9ca13ef102 that you tested is after > d6a2914984c89fa0a3125b9842e0cbf68de79a3d which broke Windows 9x, that's > why you're seeing it broken. > > It also has been a long time that Windows 9x doesn't work with > -enable-kvm. Maybe even always... That's a different problem, Windows 9x doesn't like too fast clocks (similar to the Borland Pascal divide overflow found in several DOS games). TCG slows it down enough that it doesn't complain. Paolo
From 0e66ca87ac7c94219ab49cfbed6f586c51c697de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org> 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
Hi, I currently see some regressions on Microsoft operating systems. 1) Windows XP bugchecks since commit: commit 7f0b7141b4c7deab51efd8ee1e83eab2d9b7a9ea Author: Richard Henderson <rth@twiddle.net> 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 <rth@twiddle.net> 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 <rth@twiddle.net> 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 <rth@twiddle.net> Message-Id: <1450379966-28198-4-git-send-email-rth@twiddle.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (with 88c73d16ad1b6c22a2ab082064d0d521f756296a and 4987783400667147ada01a5bdcce53f11b822888 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 <rth@twiddle.net> 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==2 path. Signed-off-by: Richard Henderson <rth@twiddle.net> I'm starting QEMU with -cpu 486. It works on master if I add -enable-kvm Hervé