From 75a1d092f6432fd7383eee89d31c96e853aa96ae Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Tue, 9 Oct 2001 12:23:15 +0000 Subject: [PATCH] - I was dismayed to find that stack_return_from_v86 was terribly incomplete. It did an exception, and then the real code seemed to be commented out with an #if 0...#endif. I put a panic there, asking people to please report how they arrived at that condition, and enabled the #if 0 code. This was pointed out by luca abeni . --- bochs/cpu/vm8086.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bochs/cpu/vm8086.cc b/bochs/cpu/vm8086.cc index 314a36dfa..e9af72a7e 100644 --- a/bochs/cpu/vm8086.cc +++ b/bochs/cpu/vm8086.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: vm8086.cc,v 1.6 2001-10-03 13:10:37 bdenney Exp $ +// $Id: vm8086.cc,v 1.7 2001-10-09 12:23:15 bdenney Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2001 MandrakeSoft S.A. @@ -125,10 +125,11 @@ BX_CPU_C::stack_return_to_v86(Bit32u new_eip, Bit32u raw_cs_selector, void BX_CPU_C::stack_return_from_v86(BxInstruction_t *i) { - //BX_INFO(("stack_return_from_v86:")); - exception(BX_GP_EXCEPTION, 0, 0); - -#if 0 + BX_ERROR(("stack_return_from_v86 may not be implemented right!")); + BX_PANIC(("Please report that you have found a test case for stack_return_from_v86")); + //exception(BX_GP_EXCEPTION, 0, 0); + +#if 1 if (IOPL != 3) { // trap to virtual 8086 monitor BX_INFO(("stack_return_from_v86: IOPL != 3"));