mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean soft_int code

Browse Source
This commit is contained in:
Stanislav Shwartsman 2004-03-26 18:41:12 +00:00
parent 6441d290f8
commit 9c4fd5ff36
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bochs/cpu/soft_int.cc
View File

@ -1,6 +1,4 @@
/////////////////////////////////////////////////////////////////////////
// $Id: soft_int.cc,v 1.18 2003-10-04 20:48:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
//
@ -34,14 +32,13 @@
BX_CPU_C::BOUND_GvMa(bxInstruction_c *i)
{
#if BX_CPU_LEVEL < 2
BX_PANIC(("BOUND_GvMa: not supported on 8086!"));
BX_PANIC(("BOUND: not supported on 8086!"));
#else
if (i->modC0()) {
/* undefined opcode exception */
BX_PANIC(("bound: op2 must be memory reference"));
BX_PANIC(("BOUND: op2 must be memory reference"));
UndefinedOpcode(i);
}
}
if (i->os32L()) {
Bit32s bound_min, bound_max;
@ -49,31 +46,28 @@ BX_CPU_C::BOUND_GvMa(bxInstruction_c *i)
op1_32 = BX_READ_32BIT_REG(i->nnn());
read_virtual_dword(i->seg(), RMAddr(i), (Bit32u *) &bound_min);
read_virtual_dword(i->seg(), RMAddr(i), (Bit32u *) &bound_min);
read_virtual_dword(i->seg(), RMAddr(i)+4, (Bit32u *) &bound_max);
/* ??? */
if ( (op1_32 < bound_min) || (op1_32 > bound_max) ) {
if (op1_32 < bound_min || op1_32 > bound_max) {
BX_INFO(("BOUND: fails bounds test"));
exception(5, 0, 0);
}
exception(BX_BR_EXCEPTION, 0, 0);
}
}
else {
Bit16s bound_min, bound_max;
Bit16s op1_16;
op1_16 = BX_READ_16BIT_REG(i->nnn());
read_virtual_word(i->seg(), RMAddr(i), (Bit16u *) &bound_min);
read_virtual_word(i->seg(), RMAddr(i), (Bit16u *) &bound_min);
read_virtual_word(i->seg(), RMAddr(i)+2, (Bit16u *) &bound_max);
/* ??? */
if ( (op1_16 < bound_min) || (op1_16 > bound_max) ) {
if (op1_16 < bound_min || op1_16 > bound_max) {
BX_INFO(("BOUND: fails bounds test"));
exception(5, 0, 0);
}
exception(BX_BR_EXCEPTION, 0, 0);
}
}
#endif
}
@ -106,7 +100,6 @@ BX_CPU_C::INT3(bxInstruction_c *i)
BX_CPU_THIS_PTR show_flag |= Flag_int;
#endif
//BX_PANIC(("INT3: bailing"));
interrupt(3, 1, 0, 0);
BX_INSTR_FAR_BRANCH(BX_CPU_ID, BX_INSTR_IS_INT,
BX_CPU_THIS_PTR sregs[BX_SEG_REG_CS].selector.value,
@ -117,18 +110,14 @@ BX_CPU_C::INT3(bxInstruction_c *i)
void
BX_CPU_C::INT_Ib(bxInstruction_c *i)
{
Bit8u imm8;
#if BX_DEBUGGER
BX_CPU_THIS_PTR show_flag |= Flag_int;
#endif
imm8 = i->Ib();
Bit8u imm8 = i->Ib();
if (v8086_mode() && (BX_CPU_THIS_PTR get_IOPL()<3)) {
//BX_INFO(("int_ib: v8086: IOPL<3"));
if (v8086_mode() && (BX_CPU_THIS_PTR get_IOPL()<3))
exception(BX_GP_EXCEPTION, 0, 0);
}
#ifdef SHOW_EXIT_STATUS
if ( (imm8 == 0x21) && (AH == 0x4c) ) {
@ -146,7 +135,6 @@ if ( (imm8 == 0x21) && (AH == 0x4c) ) {
void
BX_CPU_C::INTO(bxInstruction_c *i)
{
#if BX_DEBUGGER
BX_CPU_THIS_PTR show_flag |= Flag_int;
#endif