Speed up compilation process.

bochs.h already not include iodev.h which reduces compilation dependences for almost all cpu and fpu files, now cpu files will not be recompiled if iodev includes was changed
This commit is contained in:
Stanislav Shwartsman 2004-06-19 15:20:15 +00:00
parent 163a93b120
commit 5873b26a82
88 changed files with 616 additions and 1153 deletions

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.139 2004-06-09 20:55:43 vruppert Exp $
// $Id: bochs.h,v 1.140 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -502,7 +502,6 @@ enum PCS_OP { PCS_CLEAR, PCS_SET, PCS_TOGGLE };
#include "gui/gui.h"
#include "gui/textconfig.h"
#include "gui/keymap.h"
#include "iodev/iodev.h"
@ -512,10 +511,6 @@ enum PCS_OP { PCS_CLEAR, PCS_SET, PCS_TOGGLE };
/* --- EXTERNS --- */
#if ( BX_PROVIDE_DEVICE_MODELS==1 )
BOCHSAPI extern bx_devices_c bx_devices;
#endif
#if BX_GUI_SIGHANDLER
extern bx_bool bx_gui_sighandler;
#endif

View File

@ -116,49 +116,43 @@ lexer.c: lexer.l
# dependencies generated by
# gcc -MM -I. -I.. -I../instrument/stubs *.c *.cc | sed 's/\.cc/.@CPP_SUFFIX@/g'
###########################################
lexer.o: lexer.c debug.h ../config.h ../osdep.h
lexer.o: lexer.c debug.h ../config.h ../osdep.h parser.h
parser.o: parser.c debug.h ../config.h ../osdep.h
crc.o: crc.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
../cpu/lazy_flags.h ../cpu/i387.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../iodev/iodev.h ../iodev/vga.h ../iodev/biosdev.h \
../iodev/cmos.h ../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h \
../iodev/cdrom.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/serial.h ../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
../iodev/guest2host.h ../iodev/slowdown_timer.h \
../instrument/stubs/instrument.h
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
../cpu/lazy_flags.h ../cpu/hostasm.h ../cpu/apic.h ../cpu/i387.h \
../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h ../fpu/control_w.h \
../cpu/xmm.h ../disasm/disasm.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../instrument/stubs/instrument.h
dbg_main.o: dbg_main.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h ../state_file.h \
../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/i387.h ../memory/memory.h \
../pc_system.h ../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h \
../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h ../iodev/vga.h \
../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h ../iodev/floppy.h \
../iodev/harddrv.h ../iodev/cdrom.h ../iodev/keyboard.h \
../iodev/parallel.h ../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h \
../iodev/pit82c54.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../instrument/stubs/instrument.h
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../state_file.h ../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/hostasm.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h ../iodev/iodev.h ../iodev/pci.h \
../iodev/pci2isa.h ../iodev/pci_ide.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/iodebug.h ../iodev/keyboard.h \
../iodev/parallel.h ../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h \
../iodev/pit82c54.h ../iodev/virt_timer.h ../iodev/serial.h \
../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
../iodev/guest2host.h ../iodev/slowdown_timer.h ../iodev/extfpuirq.h \
../iodev/gameport.h ../iodev/speaker.h
linux.o: linux.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
../cpu/lazy_flags.h ../cpu/i387.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../iodev/iodev.h ../iodev/vga.h ../iodev/biosdev.h \
../iodev/cmos.h ../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h \
../iodev/cdrom.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/serial.h ../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
../iodev/guest2host.h ../iodev/slowdown_timer.h \
../instrument/stubs/instrument.h
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
../cpu/lazy_flags.h ../cpu/hostasm.h ../cpu/apic.h ../cpu/i387.h \
../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h ../fpu/control_w.h \
../cpu/xmm.h ../disasm/disasm.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../instrument/stubs/instrument.h syscalls-linux.h
sim2.o: sim2.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
../cpu/lazy_flags.h ../cpu/i387.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../ltdl.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../iodev/iodev.h ../iodev/vga.h ../iodev/biosdev.h \
../iodev/cmos.h ../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h \
../iodev/cdrom.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/serial.h ../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
../iodev/guest2host.h ../iodev/slowdown_timer.h \
../instrument/stubs/instrument.h
../bxversion.h ../gui/siminterface.h ../state_file.h ../cpu/cpu.h \
../cpu/lazy_flags.h ../cpu/hostasm.h ../cpu/apic.h ../cpu/i387.h \
../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h ../fpu/control_w.h \
../cpu/xmm.h ../disasm/disasm.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../instrument/stubs/instrument.h

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.4 2004-01-17 08:36:29 danielg4 Exp $
// $Id: dbg_main.cc,v 1.5 2004-06-19 15:20:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -29,6 +29,7 @@ extern "C" {
}
#include "bochs.h"
#include "iodev/iodev.h"
#if BX_DEBUGGER
#define LOG_THIS genlog->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.1 2004-06-04 22:06:54 sshwarts Exp $
// $Id: config.cc,v 1.2 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -25,6 +25,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "bochs.h"
#include "iodev/iodev.h"
#include <assert.h>
#ifdef HAVE_LOCALE_H

View File

@ -25,7 +25,7 @@
#if BX_SUPPORT_3DNOW
static void prepare_softfloat_status_word
(softfloat_status_word_t &status, int rounding_mode)
(float_status_t &status, int rounding_mode)
{
status.float_exception_flags = 0; // clear exceptions before execution
status.float_nan_handling_mode = float_first_operand_nan;
@ -53,7 +53,7 @@ void BX_CPU_C::PI2FW_PqQq(bxInstruction_c *i)
read_virtual_qword(i->seg(), RMAddr(i), (Bit64u *) &op);
}
softfloat_status_word_t status_word;
float_status_t status_word;
prepare_softfloat_status_word(status_word, float_round_to_zero);
MMXUD0(result) =
@ -79,7 +79,7 @@ void BX_CPU_C::PI2FD_PqQq(bxInstruction_c *i)
read_virtual_qword(i->seg(), RMAddr(i), (Bit64u *) &op);
}
softfloat_status_word_t status_word;
float_status_t status_word;
prepare_softfloat_status_word(status_word, float_round_to_zero);
MMXUD0(result) =
@ -110,7 +110,7 @@ void BX_CPU_C::PF2ID_PqQq(bxInstruction_c *i)
read_virtual_qword(i->seg(), RMAddr(i), (Bit64u *) &op);
}
softfloat_status_word_t status_word;
float_status_t status_word;
prepare_softfloat_status_word(status_word, float_round_to_zero);
MMXSD0(result) =

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cpu.cc,v 1.83 2004-01-29 17:49:03 mcb30 Exp $
// $Id: cpu.cc,v 1.84 2004-06-19 15:20:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -28,6 +28,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_CPU_THIS_PTR
#if BX_USE_CPU_SMF

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: exception.cc,v 1.37 2004-04-08 20:57:33 cbothamy Exp $
// $Id: exception.cc,v 1.38 2004-06-19 15:20:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -28,6 +28,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_CPU_THIS_PTR
@ -880,7 +881,7 @@ BX_CPU_C::exception(unsigned vector, Bit16u error_code, bx_bool is_INT)
bx_guard.special_unwind_stack = true;
#endif
longjmp(BX_CPU_THIS_PTR jmp_buf_env, 1); // go back to main decode loop
}
}
/* careful not to get here with curr_exception[1]==DOUBLE_FAULT */
/* ...index on DOUBLE_FAULT below, will be out of bounds */

View File

@ -99,9 +99,6 @@ public:
#define IS_TAG_EMPTY(i) \
((BX_CPU_THIS_PTR the_i387.FPU_gettagi(i)) == FPU_Tag_Empty)
#define IS_IA_MASKED() \
(BX_CPU_THIS_PTR the_i387.get_control_word() & FPU_CW_Invalid)
#define BX_READ_FPU_REG(i) \
(BX_CPU_THIS_PTR the_i387.FPU_read_regi(i))
@ -174,9 +171,6 @@ BX_CPP_INLINE void i387_t::reset()
memset(st_space, 0, sizeof(floatx80)*8);
}
extern const floatx80 Const_Z;
extern const floatx80 Const_1;
#if BX_SUPPORT_MMX
typedef union bx_packed_mmx_reg_t {
@ -262,7 +256,8 @@ typedef union bx_packed_mmx_reg_t {
#pragma options align=mac68k
#endif
struct bx_mmx_reg_t {
Bit16u alignment1, alignment2, alignment3;
Bit32u alignment2;
Bit16u alignment1;
Bit16u exp; /* 2 byte FP-reg exponent */
BxPackedMmxRegister packed_mmx_register;
} GCC_ATTRIBUTE((aligned(16), packed));
@ -273,7 +268,8 @@ struct bx_mmx_reg_t {
struct bx_mmx_reg_t {
BxPackedMmxRegister packed_mmx_register;
Bit16u exp; /* 2 byte FP reg exponent */
Bit16u alignment1, alignment2, alignment3;
Bit16u alignment1;
Bit32u alignment2;
} GCC_ATTRIBUTE((aligned(16), packed));
#endif

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: io.cc,v 1.22 2004-03-02 20:48:48 sshwarts Exp $
// $Id: io.cc,v 1.23 2004-06-19 15:20:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -27,6 +27,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_CPU_THIS_PTR

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: io_pro.cc,v 1.14 2004-02-03 02:03:24 cbothamy Exp $
// $Id: io_pro.cc,v 1.15 2004-06-19 15:20:07 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -25,18 +25,12 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_CPU_THIS_PTR
Bit16u BX_CPP_AttrRegparmN(1)
BX_CPU_C::inp16(Bit16u addr)
{

View File

@ -78,8 +78,6 @@ dist-clean: clean
# dependencies generated by
# gcc -MM -I. -I.. -I../instrument/stubs -Istubs *.c *.cc | sed 's/\.cc/.@CPP_SUFFIX@/g'
###########################################
poly.o: poly.@CPP_SUFFIX@ softfloatx80.h softfloat.h ../config.h \
softfloat-specialize.h softfloat-macros.h softfloat-round-pack.h
f2xm1.o: f2xm1.@CPP_SUFFIX@ softfloatx80.h softfloat.h ../config.h \
softfloat-specialize.h softfloat-macros.h softfloat-round-pack.h
ferr.o: ferr.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
@ -88,16 +86,7 @@ ferr.o: ferr.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h
../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h ../fpu/control_w.h \
../cpu/xmm.h ../disasm/disasm.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../iodev/iodev.h ../iodev/pci.h ../iodev/pci2isa.h \
../iodev/pcivga.h ../iodev/vga.h ../iodev/ioapic.h ../iodev/biosdev.h \
../iodev/cmos.h ../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h \
../iodev/cdrom.h ../iodev/vmware3.h ../iodev/keyboard.h \
../iodev/parallel.h ../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h \
../iodev/pit82c54.h ../iodev/virt_timer.h ../iodev/serial.h \
../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
../iodev/guest2host.h ../iodev/slowdown_timer.h ../iodev/extfpuirq.h \
../iodev/gameport.h ../iodev/speaker.h ../instrument/stubs/instrument.h \
softfloat-specialize.h
../gui/keymap.h ../instrument/stubs/instrument.h softfloat-specialize.h
fpatan.o: fpatan.@CPP_SUFFIX@ softfloatx80.h softfloat.h ../config.h \
softfloat-specialize.h softfloat-macros.h softfloat-round-pack.h \
fpu_constant.h
@ -109,99 +98,60 @@ fpu.o: fpu.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.h \
../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h ../fpu/control_w.h \
../cpu/xmm.h ../disasm/disasm.h ../memory/memory.h ../pc_system.h \
../plugin.h ../extplugin.h ../gui/gui.h ../gui/textconfig.h \
../gui/keymap.h ../iodev/iodev.h ../iodev/pci.h ../iodev/pci2isa.h \
../iodev/pcivga.h ../iodev/vga.h ../iodev/ioapic.h ../iodev/biosdev.h \
../iodev/cmos.h ../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h \
../iodev/cdrom.h ../iodev/vmware3.h ../iodev/keyboard.h \
../gui/keymap.h ../instrument/stubs/instrument.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pci_ide.h ../iodev/pcivga.h \
../iodev/vga.h ../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h \
../iodev/dma.h ../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/iodebug.h ../iodev/keyboard.h \
../iodev/parallel.h ../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h \
../iodev/pit82c54.h ../iodev/virt_timer.h ../iodev/serial.h \
../iodev/unmapped.h ../iodev/eth.h ../iodev/ne2k.h \
../iodev/guest2host.h ../iodev/slowdown_timer.h ../iodev/extfpuirq.h \
../iodev/gameport.h ../iodev/speaker.h ../instrument/stubs/instrument.h
../iodev/gameport.h ../iodev/speaker.h
fpu_arith.o: fpu_arith.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../state_file.h ../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/hostasm.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h \
../iodev/speaker.h ../instrument/stubs/instrument.h
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h
fpu_compare.o: fpu_compare.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../state_file.h ../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/hostasm.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h \
../iodev/speaker.h ../instrument/stubs/instrument.h softfloatx80.h \
softfloat.h softfloat-specialize.h
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h softfloatx80.h softfloat.h \
softfloat-specialize.h
fpu_const.o: fpu_const.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../state_file.h ../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/hostasm.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h \
../iodev/speaker.h ../instrument/stubs/instrument.h softfloatx80.h \
softfloat.h softfloat-specialize.h
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h softfloatx80.h softfloat.h \
softfloat-specialize.h
fpu_load_store.o: fpu_load_store.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../state_file.h ../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/hostasm.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h \
../iodev/speaker.h ../instrument/stubs/instrument.h softfloatx80.h \
softfloat.h softfloat-specialize.h
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h softfloatx80.h softfloat.h \
softfloat-specialize.h
fpu_misc.o: fpu_misc.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../bx_debug/debug.h ../bxversion.h ../gui/siminterface.h \
../state_file.h ../cpu/cpu.h ../cpu/lazy_flags.h ../cpu/hostasm.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h \
../iodev/speaker.h ../instrument/stubs/instrument.h softfloatx80.h \
softfloat.h softfloat-specialize.h
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h softfloatx80.h softfloat.h \
softfloat-specialize.h
fpu_tags.o: fpu_tags.@CPP_SUFFIX@ softfloat.h ../config.h softfloat-specialize.h \
../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h ../fpu/status_w.h \
../fpu/control_w.h
@ -211,22 +161,15 @@ fpu_trans.o: fpu_trans.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
../cpu/apic.h ../cpu/i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
../fpu/status_w.h ../fpu/control_w.h ../cpu/xmm.h ../disasm/disasm.h \
../memory/memory.h ../pc_system.h ../plugin.h ../extplugin.h \
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h ../iodev/iodev.h \
../iodev/pci.h ../iodev/pci2isa.h ../iodev/pcivga.h ../iodev/vga.h \
../iodev/ioapic.h ../iodev/biosdev.h ../iodev/cmos.h ../iodev/dma.h \
../iodev/floppy.h ../iodev/harddrv.h ../iodev/cdrom.h \
../iodev/vmware3.h ../iodev/keyboard.h ../iodev/parallel.h \
../iodev/pic.h ../iodev/pit.h ../iodev/pit_wrap.h ../iodev/pit82c54.h \
../iodev/virt_timer.h ../iodev/serial.h ../iodev/unmapped.h \
../iodev/eth.h ../iodev/ne2k.h ../iodev/guest2host.h \
../iodev/slowdown_timer.h ../iodev/extfpuirq.h ../iodev/gameport.h \
../iodev/speaker.h ../instrument/stubs/instrument.h softfloatx80.h \
softfloat.h softfloat-specialize.h
../gui/gui.h ../gui/textconfig.h ../gui/keymap.h \
../instrument/stubs/instrument.h softfloatx80.h softfloat.h \
softfloat-specialize.h
fsincos.o: fsincos.@CPP_SUFFIX@ softfloatx80.h softfloat.h ../config.h \
softfloat-specialize.h softfloat-macros.h softfloat-round-pack.h \
fpu_constant.h
fyl2x.o: fyl2x.@CPP_SUFFIX@ softfloatx80.h softfloat.h ../config.h \
softfloat-specialize.h softfloat-macros.h softfloat-round-pack.h
poly.o: poly.@CPP_SUFFIX@ softfloat.h ../config.h
softfloat-round-pack.o: softfloat-round-pack.@CPP_SUFFIX@ softfloat.h ../config.h \
softfloat-round-pack.h softfloat-macros.h softfloat-specialize.h
softfloat-specialize.o: softfloat-specialize.@CPP_SUFFIX@ softfloat.h ../config.h \

View File

@ -25,6 +25,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_CPU_THIS_PTR

View File

@ -549,6 +549,8 @@ void BX_CPU_C::FTST(bxInstruction_c *i)
return;
}
extern const floatx80 Const_Z;
float_status_t status =
FPU_pre_exception_handling(BX_CPU_THIS_PTR the_i387.get_control_word());

View File

@ -115,6 +115,8 @@ void BX_CPU_C::FPTAN(bxInstruction_c *i)
return;
}
extern const floatx80 Const_1;
float_status_t status =
FPU_pre_exception_handling(BX_CPU_THIS_PTR the_i387.get_control_word() | FPU_PR_80_BITS);

View File

@ -425,6 +425,7 @@ floatx80 roundAndPackFloatx80(int roundingPrecision,
roundBits = zSig0 & roundMask;
if (isTiny && roundBits) float_raise(status, float_flag_underflow);
if (roundBits) float_raise(status, float_flag_inexact);
if (roundIncrement) set_float_rounding_up(status);
zSig0 += roundIncrement;
if ((Bit64s) zSig0 < 0) zExp = 1;
roundIncrement = roundMask + 1;
@ -435,6 +436,7 @@ floatx80 roundAndPackFloatx80(int roundingPrecision,
}
}
if (roundBits) float_raise(status, float_flag_inexact);
if (roundIncrement) set_float_rounding_up(status);
zSig0 += roundIncrement;
if (zSig0 < roundIncrement) {
++zExp;
@ -494,9 +496,10 @@ floatx80 roundAndPackFloatx80(int roundingPrecision,
}
}
if (increment) {
++zSig0;
zSig0++;
zSig0 &= ~(((Bit64u) (zSig1<<1) == 0) & roundNearestEven);
if ((Bit64s) zSig0 < 0) zExp = 1;
set_float_rounding_up(status);
}
return packFloatx80(zSign, zExp, zSig0);
}
@ -504,6 +507,7 @@ floatx80 roundAndPackFloatx80(int roundingPrecision,
if (zSig1) float_raise(status, float_flag_inexact);
if (increment) {
++zSig0;
set_float_rounding_up(status);
if (zSig0 == 0) {
++zExp;
zSig0 = BX_CONST64(0x8000000000000000);

View File

@ -152,6 +152,17 @@ BX_CPP_INLINE int get_float_nan_handling_mode(float_status_t &status)
return status.float_nan_handling_mode;
}
/*----------------------------------------------------------------------------
| Raise floating point precision lost up flag (floatx80 only).
*----------------------------------------------------------------------------*/
#ifdef FLOATX80
BX_CPP_INLINE void set_float_rounding_up(float_status_t &status)
{
status.float_precision_lost_up = 1;
}
#endif
/*----------------------------------------------------------------------------
| Returns 1 if the <flush-underflow-to-zero> feature is supported;
| otherwise returns 0.
@ -256,9 +267,8 @@ int float64_is_signaling_nan(float64);
#pragma options align=mac68k
#endif
struct floatx80 {
Bit16u align1;
Bit32u align1;
Bit16u align2;
Bit16u align3;
Bit16u exp;
Bit64u fraction;
} GCC_ATTRIBUTE((aligned(16), packed));
@ -270,8 +280,7 @@ struct floatx80 {
Bit64u fraction;
Bit16u exp;
Bit16u align1;
Bit16u align2;
Bit16u align3;
Bit32u align2;
} GCC_ATTRIBUTE((aligned(16), packed));
#endif

View File

@ -11,6 +11,7 @@
#define NEED_CPU_REG_SHORTCUTS 1
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS genlog->
#define IFDBG(x) x

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: amigaos.cc,v 1.19 2003-06-28 08:04:31 vruppert Exp $
// $Id: amigaos.cc,v 1.20 2004-06-19 15:20:08 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2000 MandrakeSoft S.A.
@ -31,6 +31,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_AMIGAOS
#include "icon_bochs.h"
#include "amigagui.h"

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: beos.cc,v 1.25 2003-06-28 08:04:31 vruppert Exp $
// $Id: beos.cc,v 1.26 2004-06-19 15:20:08 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -36,6 +36,7 @@
#include <string.h>
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_BEOS
#include <app/Application.h>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: carbon.cc,v 1.25 2004-02-14 06:33:29 danielg4 Exp $
// $Id: carbon.cc,v 1.26 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -43,6 +43,7 @@
#define Float32 KLUDGE_Float32
#define Float64 KLUDGE_Float64
#include "bochs.h"
#include "iodev.h"
#undef Float32
#undef Float64

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: gui.cc,v 1.77 2004-02-22 13:02:54 vruppert Exp $
// $Id: gui.cc,v 1.78 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -27,6 +27,7 @@
#include <signal.h>
#include "bochs.h"
#include "iodev.h"
#include "gui/bitmaps/floppya.h"
#include "gui/bitmaps/floppyb.h"
#include "gui/bitmaps/mouse.h"

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: macintosh.cc,v 1.23 2004-02-08 18:11:45 danielg4 Exp $
// $Id: macintosh.cc,v 1.24 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -37,6 +37,7 @@
// BOCHS INCLUDES
#include <MacTypes.h>
#include "bochs.h"
#include "iodev.h"
// decide whether to enable this file or not
#if BX_WITH_MACOS

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: rfb.cc,v 1.35 2004-04-13 19:07:36 vruppert Exp $
// $Id: rfb.cc,v 1.36 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2000 Psyon.Org!
@ -35,6 +35,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_RFB
#include "icon_bochs.h"

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: sdl.cc,v 1.51 2004-06-05 12:16:33 vruppert Exp $
// $Id: sdl.cc,v 1.52 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -32,6 +32,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_SDL
#include <stdlib.h>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.cc,v 1.106 2004-05-30 08:28:51 vruppert Exp $
// $Id: siminterface.cc,v 1.107 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// See siminterface.h for description of the siminterface concept.
@ -7,6 +7,7 @@
// the configuration user interface, and allows them to talk to each other.
#include "bochs.h"
#include "iodev.h"
bx_simulator_interface_c *SIM = NULL;
logfunctions *siminterface_log = NULL;

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: svga.cc,v 1.10 2004-02-20 18:29:58 vruppert Exp $
// $Id: svga.cc,v 1.11 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// This library is free software; you can redistribute it and/or
@ -24,6 +24,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_SVGA
#include <stdlib.h>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: win32.cc,v 1.82 2004-04-11 08:01:22 vruppert Exp $
// $Id: win32.cc,v 1.83 2004-06-19 15:20:09 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -34,6 +34,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_WIN32
#include "win32res.h"

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wx.cc,v 1.69 2004-04-10 20:58:42 vruppert Exp $
// $Id: wx.cc,v 1.70 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////
//
// wxWindows VGA display for Bochs. wx.cc implements a custom
@ -37,6 +37,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_WX
// For compilers that support precompilation, includes <wx/wx.h>.

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: x.cc,v 1.83 2004-04-11 10:58:09 vruppert Exp $
// $Id: x.cc,v 1.84 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,6 +33,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_WITH_X11
extern "C" {

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: biosdev.cc,v 1.7 2003-12-08 19:36:23 danielg4 Exp $
// $Id: biosdev.cc,v 1.8 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -43,7 +43,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
bx_biosdev_c *theBiosDevice;

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cdrom.cc,v 1.68 2004-05-30 19:20:53 sshwarts Exp $
// $Id: cdrom.cc,v 1.69 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -37,7 +37,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_SUPPORT_CDROM
#define LOG_THIS /* no SMF tricks here, not needed */
@ -472,7 +472,7 @@ cdrom_interface::cdrom_interface(char *dev)
void
cdrom_interface::init(void) {
BX_DEBUG(("Init $Id: cdrom.cc,v 1.68 2004-05-30 19:20:53 sshwarts Exp $"));
BX_DEBUG(("Init $Id: cdrom.cc,v 1.69 2004-06-19 15:20:10 sshwarts Exp $"));
BX_INFO(("file = '%s'",path));
}

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cdrom_amigaos.cc,v 1.5 2003-02-21 14:51:12 cisc Exp $
// $Id: cdrom_amigaos.cc,v 1.6 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2000 MandrakeSoft S.A.
@ -32,7 +32,7 @@
// for your OS if it is not supported yet.
#include "bochs.h"
#include "iodev.h"
#include "scsi_commands.h"
#include <exec/types.h>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: cmos.cc,v 1.44 2003-12-27 13:43:41 vruppert Exp $
// $Id: cmos.cc,v 1.45 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theCmosDevice->
@ -118,7 +118,7 @@ bx_cmos_c::~bx_cmos_c(void)
void
bx_cmos_c::init(void)
{
BX_DEBUG(("Init $Id: cmos.cc,v 1.44 2003-12-27 13:43:41 vruppert Exp $"));
BX_DEBUG(("Init $Id: cmos.cc,v 1.45 2004-06-19 15:20:10 sshwarts Exp $"));
// CMOS RAM & RTC
DEV_register_ioread_handler(this, read_handler, 0x0070, "CMOS RAM", 1);

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: devices.cc,v 1.67 2004-06-09 20:55:58 vruppert Exp $
// $Id: devices.cc,v 1.68 2004-06-19 15:20:10 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS bx_devices.
@ -106,7 +106,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
{
unsigned i;
BX_DEBUG(("Init $Id: devices.cc,v 1.67 2004-06-09 20:55:58 vruppert Exp $"));
BX_DEBUG(("Init $Id: devices.cc,v 1.68 2004-06-19 15:20:10 sshwarts Exp $"));
mem = newmem;
/* set no-default handlers, will be overwritten by the real default handler */

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dma.cc,v 1.30 2003-07-31 15:29:34 vruppert Exp $
// $Id: dma.cc,v 1.31 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -31,7 +31,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theDmaDevice->
@ -134,7 +134,7 @@ bx_dma_c::get_TC(void)
bx_dma_c::init(void)
{
unsigned c, i, j;
BX_DEBUG(("Init $Id: dma.cc,v 1.30 2003-07-31 15:29:34 vruppert Exp $"));
BX_DEBUG(("Init $Id: dma.cc,v 1.31 2004-06-19 15:20:11 sshwarts Exp $"));
/* 8237 DMA controller */

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth.cc,v 1.18 2004-01-16 15:53:43 danielg4 Exp $
// $Id: eth.cc,v 1.19 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -34,7 +34,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
#define LOG_THIS /* not needed */

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_arpback.cc,v 1.11 2002-11-20 19:06:22 bdenney Exp $
// $Id: eth_arpback.cc,v 1.12 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -36,7 +36,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined(ETH_ARPBACK)

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_fbsd.cc,v 1.26 2002-11-20 19:06:22 bdenney Exp $
// $Id: eth_fbsd.cc,v 1.27 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -53,7 +53,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined(ETH_FBSD)
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_linux.cc,v 1.14 2003-02-16 19:35:57 vruppert Exp $
// $Id: eth_linux.cc,v 1.15 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -45,7 +45,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined (ETH_LINUX)
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_null.cc,v 1.13 2002-11-20 19:06:23 bdenney Exp $
// $Id: eth_null.cc,v 1.14 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -36,7 +36,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_packetmaker.cc,v 1.8 2002-11-20 19:06:23 bdenney Exp $
// $Id: eth_packetmaker.cc,v 1.9 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
@ -7,7 +7,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT && defined(ETH_ARPBACK)

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_tap.cc,v 1.16 2003-10-02 11:33:41 danielg4 Exp $
// $Id: eth_tap.cc,v 1.17 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -84,7 +84,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_tuntap.cc,v 1.12 2004-01-18 06:15:38 danielg4 Exp $
// $Id: eth_tuntap.cc,v 1.13 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -86,7 +86,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_vde.cc,v 1.2 2004-01-16 15:15:49 danielg4 Exp $
// $Id: eth_vde.cc,v 1.3 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 Renzo Davoli
@ -26,7 +26,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -13,7 +13,7 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
#define LOG_THIS bx_devices.pluginNE2kDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: eth_win32.cc,v 1.17 2003-06-07 19:16:54 vruppert Exp $
// $Id: eth_win32.cc,v 1.18 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -41,7 +41,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
// windows.h included by bochs.h

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: extfpuirq.cc,v 1.5 2003-07-31 12:04:48 vruppert Exp $
// $Id: extfpuirq.cc,v 1.6 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theExternalFpuIrq->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: floppy.cc,v 1.73 2004-05-31 14:47:12 vruppert Exp $
// $Id: floppy.cc,v 1.74 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -52,7 +52,7 @@ extern "C" {
#include <linux/fd.h>
}
#endif
#include "bochs.h"
#include "iodev.h"
// windows.h included by bochs.h
#ifdef WIN32
extern "C" {
@ -132,7 +132,7 @@ bx_floppy_ctrl_c::init(void)
{
Bit8u i;
BX_DEBUG(("Init $Id: floppy.cc,v 1.73 2004-05-31 14:47:12 vruppert Exp $"));
BX_DEBUG(("Init $Id: floppy.cc,v 1.74 2004-06-19 15:20:11 sshwarts Exp $"));
DEV_dma_register_8bit_channel(2, dma_read, dma_write, "Floppy Drive");
DEV_register_irq(6, "Floppy Drive");
for (unsigned addr=0x03F2; addr<=0x03F7; addr++) {

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: gameport.cc,v 1.5 2003-12-29 21:48:56 cbothamy Exp $
// $Id: gameport.cc,v 1.6 2004-06-19 15:20:11 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 MandrakeSoft S.A.
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#ifdef __linux__

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: guest2host.cc,v 1.13 2002-12-06 18:48:07 bdenney Exp $
// $Id: guest2host.cc,v 1.14 2004-06-19 15:20:12 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -26,7 +26,7 @@
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS bx_g2h.
bx_g2h_c bx_g2h;
@ -52,7 +52,7 @@ bx_g2h_c::~bx_g2h_c(void)
void
bx_g2h_c::init(void)
{
BX_DEBUG(("Init $Id: guest2host.cc,v 1.13 2002-12-06 18:48:07 bdenney Exp $"));
BX_DEBUG(("Init $Id: guest2host.cc,v 1.14 2004-06-19 15:20:12 sshwarts Exp $"));
// Reserve a dword port for this interface
for (Bit32u addr=BX_G2H_PORT; addr<=(BX_G2H_PORT+3); addr++) {
bx_devices.register_io_read_handler(&bx_g2h,

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: harddrv.cc,v 1.120 2004-02-13 00:42:31 cbothamy Exp $
// $Id: harddrv.cc,v 1.121 2004-06-19 15:20:12 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -35,7 +35,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_HAVE_SYS_MMAN_H
#include <sys/mman.h>
@ -161,7 +161,7 @@ bx_hard_drive_c::init(void)
char string[5];
char sbtext[8];
BX_DEBUG(("Init $Id: harddrv.cc,v 1.120 2004-02-13 00:42:31 cbothamy Exp $"));
BX_DEBUG(("Init $Id: harddrv.cc,v 1.121 2004-06-19 15:20:12 sshwarts Exp $"));
for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
if (bx_options.ata[channel].Opresent->get() == 1) {

View File

@ -1,9 +1,10 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ioapic.cc,v 1.11 2002-11-19 05:47:45 bdenney Exp $
// $Id: ioapic.cc,v 1.12 2004-06-19 15:20:12 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
#include <stdio.h>
#include "bochs.h"
#include "iodev.h"
#if BX_SUPPORT_APIC
class bx_ioapic_c bx_ioapic;

View File

@ -1,8 +1,9 @@
/////////////////////////////////////////////////////////////////////////
// $Id: iodebug.cc,v 1.15 2002-11-19 05:47:45 bdenney Exp $
// $Id: iodebug.cc,v 1.16 2004-06-19 15:20:12 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
#include "bochs.h"
#include "iodev.h"
#if BX_IODEBUG_SUPPORT
@ -19,8 +20,6 @@ bx_iodebug_c *bx_iodebug_ptr;
} bx_iodebug_s;
// Constructor
bx_iodebug_c::bx_iodebug_c( void )
{
@ -29,19 +28,11 @@ bx_iodebug_c::bx_iodebug_c( void )
}
// Destructor
bx_iodebug_c::~bx_iodebug_c( void )
{
}
void bx_iodebug_c::init(void)
{
int i;
@ -63,34 +54,19 @@ void bx_iodebug_c::reset(unsigned type)
{
}
Bit32u bx_iodebug_c::read_handler(void *this_ptr, Bit32u addr, unsigned io_len)
{
bx_iodebug_ptr = (bx_iodebug_c *) this_ptr;
return( bx_iodebug_ptr->read(addr, io_len) );
}
Bit32u bx_iodebug_c::read( Bit32u addr, unsigned io_len )
{
if(bx_iodebug_s.enabled) return(0x8A00);
return(0);
}
void bx_iodebug_c::write_handler(void *this_ptr, Bit32u addr, Bit32u dvalue, unsigned io_len)
{
bx_iodebug_c *class_ptr = (bx_iodebug_c *) this_ptr;
@ -98,14 +74,8 @@ void bx_iodebug_c::write_handler(void *this_ptr, Bit32u addr, Bit32u dvalue, uns
}
void bx_iodebug_c::write( Bit32u addr, Bit32u dvalue, unsigned int io_len )
{
// fprintf(stderr, "IODEBUG addr: %4x\tdvalue: %8x\tio_len: %8x\n", (unsigned int)addr, (unsigned int)dvalue, io_len);
if( addr == 0x8A01 && io_len == 2 )
@ -189,12 +159,6 @@ void bx_iodebug_c::write( Bit32u addr, Bit32u dvalue, unsigned int io_len )
}
// Static function
void bx_iodebug_c::mem_write( BX_CPU_C *cpu, Bit32u addr, unsigned len, void *data)
{
@ -247,13 +211,6 @@ void bx_iodebug_c::mem_write( BX_CPU_C *cpu, Bit32u addr, unsigned len, void *da
}
}
void bx_iodebug_c::mem_read( BX_CPU_C *cpu, Bit32u addr, unsigned len, void *data)
{
Bit32u data32;
@ -304,12 +261,6 @@ void bx_iodebug_c::mem_read( BX_CPU_C *cpu, Bit32u addr, unsigned len, void *dat
}
}
unsigned int bx_iodebug_c::range_test( Bit32u addr, unsigned int len )
{
unsigned int i;
@ -331,10 +282,6 @@ unsigned int bx_iodebug_c::range_test( Bit32u addr, unsigned int len )
}
void bx_iodebug_c::add_range( Bit32u addr_start, Bit32u addr_end )
{
unsigned int i;
@ -351,4 +298,5 @@ void bx_iodebug_c::add_range( Bit32u addr_start, Bit32u addr_end )
}
// fprintf(stderr, "IODEBUG unable to register memory range, all slots taken\n");
}
#endif /* if BX_IODEBUG_SUPPORT */

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: iodev.h,v 1.42 2004-06-09 20:55:58 vruppert Exp $
// $Id: iodev.h,v 1.43 2004-06-19 15:20:12 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -26,7 +26,10 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#ifndef IODEV_H
#define IODEV_H
#include "bochs.h"
/* maximum number of emulated devices allowed. floppy, vga, etc...
you can increase this to anything below 256 since an 8-bit handle
@ -457,3 +460,9 @@ private:
#include "iodev/extfpuirq.h"
#include "iodev/gameport.h"
#include "iodev/speaker.h"
#if ( BX_PROVIDE_DEVICE_MODELS==1 )
BOCHSAPI extern bx_devices_c bx_devices;
#endif
#endif /* IODEV_H */

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: keyboard.cc,v 1.85 2004-04-08 21:21:22 cbothamy Exp $
// $Id: keyboard.cc,v 1.86 2004-06-19 15:20:12 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -52,7 +52,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#include <math.h>
#include "scancodes.h"
@ -125,7 +125,7 @@ bx_keyb_c::resetinternals(bx_bool powerup)
void
bx_keyb_c::init(void)
{
BX_DEBUG(("Init $Id: keyboard.cc,v 1.85 2004-04-08 21:21:22 cbothamy Exp $"));
BX_DEBUG(("Init $Id: keyboard.cc,v 1.86 2004-06-19 15:20:12 sshwarts Exp $"));
Bit32u i;
DEV_register_irq(1, "8042 Keyboard controller");

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ne2k.cc,v 1.58 2004-05-01 14:05:07 cbothamy Exp $
// $Id: ne2k.cc,v 1.59 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -32,7 +32,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_NE2K_SUPPORT
//Never completely fill the ne2k ring so that we never
@ -1275,7 +1275,7 @@ bx_ne2k_c::rx_frame(const void *buf, unsigned io_len)
void
bx_ne2k_c::init(void)
{
BX_DEBUG(("Init $Id: ne2k.cc,v 1.58 2004-05-01 14:05:07 cbothamy Exp $"));
BX_DEBUG(("Init $Id: ne2k.cc,v 1.59 2004-06-19 15:20:13 sshwarts Exp $"));
// Read in values from config file
BX_NE2K_THIS s.base_address = bx_options.ne2k.Oioaddr->get ();

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: parallel.cc,v 1.25 2004-01-27 21:38:51 vruppert Exp $
// $Id: parallel.cc,v 1.26 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -34,7 +34,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theParallelDevice->
bx_parallel_c *theParallelDevice = NULL;
@ -77,7 +77,7 @@ bx_parallel_c::init(void)
Bit8u irqs[BX_PARPORT_MAXDEV] = {7, 5};
char name[16];
BX_DEBUG(("Init $Id: parallel.cc,v 1.25 2004-01-27 21:38:51 vruppert Exp $"));
BX_DEBUG(("Init $Id: parallel.cc,v 1.26 2004-06-19 15:20:13 sshwarts Exp $"));
for (unsigned i=0; i<BX_N_PARALLEL_PORTS; i++) {
if (bx_options.par[i].Oenabled->get ()) {

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci.cc,v 1.30 2004-01-15 02:08:35 danielg4 Exp $
// $Id: pci.cc,v 1.31 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT
#define LOG_THIS thePciBridge->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci2isa.cc,v 1.11 2004-01-15 02:08:35 danielg4 Exp $
// $Id: pci2isa.cc,v 1.12 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT
#define LOG_THIS thePci2IsaBridge->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci_ide.cc,v 1.2 2004-06-09 22:05:28 vruppert Exp $
// $Id: pci_ide.cc,v 1.3 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT
#define LOG_THIS thePciIdeController->

View File

@ -26,7 +26,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_DEV_SUPPORT
#include "kernel_pcidev.h"

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pcipnic.cc,v 1.4 2004-03-26 03:22:46 mcb30 Exp $
// $Id: pcipnic.cc,v 1.5 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 Fen Systems Ltd.
@ -24,7 +24,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_PNIC_SUPPORT
#define LOG_THIS thePNICDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pciusb.cc,v 1.3 2003-02-06 19:09:24 vruppert Exp $
// $Id: pciusb.cc,v 1.4 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 MandrakeSoft S.A.
@ -35,7 +35,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_USB_SUPPORT
#define LOG_THIS theUSBDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pcivga.cc,v 1.3 2004-06-09 22:05:28 vruppert Exp $
// $Id: pcivga.cc,v 1.4 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002,2003 Mike Nordell
@ -33,7 +33,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_PCI_SUPPORT && BX_PCI_VGA_SUPPORT
#define LOG_THIS thePciVgaAdapter->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pic.cc,v 1.33 2003-08-05 09:19:36 akrisak Exp $
// $Id: pic.cc,v 1.34 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -31,7 +31,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS thePic->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pit.cc,v 1.17 2004-02-01 23:42:04 cbothamy Exp $
// $Id: pit.cc,v 1.18 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -26,7 +26,7 @@
#include "bochs.h"
#include "iodev.h"
#if (BX_USE_NEW_PIT==0)

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pit82c54.cc,v 1.24 2004-01-16 16:30:46 danielg4 Exp $
// $Id: pit82c54.cc,v 1.25 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
/*
@ -26,7 +26,7 @@
* write?
*/
#include "bochs.h"
#include "iodev.h"
#include "pit82c54.h"
#define LOG_THIS this->

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////
// $Id: pit_wrap.cc,v 1.54 2004-02-01 23:42:04 cbothamy Exp $
// $Id: pit_wrap.cc,v 1.55 2004-06-19 15:20:13 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -25,12 +25,12 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "bochs.h"
#include "iodev.h"
#if BX_USE_NEW_PIT
#include "pit_wrap.h"
#include "iodev.h"
//Important constant #defines:
#define USEC_PER_SECOND (1000000)

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: sb16.cc,v 1.39 2003-12-26 10:06:57 vruppert Exp $
// $Id: sb16.cc,v 1.40 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -31,7 +31,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if BX_SUPPORT_SB16
#define LOG_THIS theSB16Device->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: serial.cc,v 1.53 2004-03-28 12:41:12 vruppert Exp $
// $Id: serial.cc,v 1.54 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -37,7 +37,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theSerialDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: serial_raw.cc,v 1.15 2004-05-13 16:23:14 vruppert Exp $
// $Id: serial_raw.cc,v 1.16 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -30,7 +30,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if USE_RAW_SERIAL

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: slowdown_timer.cc,v 1.18 2004-02-06 22:28:00 danielg4 Exp $
// $Id: slowdown_timer.cc,v 1.19 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -25,7 +25,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
#include "bochs.h"
#include "iodev.h"
#include <errno.h>
//These need to stay printfs because they are useless in the log file.

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: soundlnx.cc,v 1.6 2002-12-24 10:12:26 vruppert Exp $
// $Id: soundlnx.cc,v 1.7 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -27,7 +27,7 @@
// This file (SOUNDLNX.CC) written and donated by Josef Drexler
#include "bochs.h"
#include "iodev.h"
#if (defined(linux) || defined(__FreeBSD__)) && BX_SUPPORT_SB16
#define LOG_THIS bx_sb16.

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: soundosx.cc,v 1.3 2004-02-18 20:10:19 danielg4 Exp $
// $Id: soundosx.cc,v 1.4 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
// This file (SOUNDOSX.CC) written and donated by Brian Huffman
@ -10,7 +10,7 @@
#define Float32 KLUDGE_Float32
#define Float64 KLUDGE_Float64
#endif
#include "bochs.h"
#include "iodev.h"
#undef Float32
#undef Float64

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: soundwin.cc,v 1.13 2003-04-05 08:26:49 vruppert Exp $
// $Id: soundwin.cc,v 1.14 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -31,7 +31,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#if defined(WIN32) && BX_SUPPORT_SB16
#define LOG_THIS bx_devices.pluginSB16Device->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: speaker.cc,v 1.1 2004-02-01 23:42:04 cbothamy Exp $
// $Id: speaker.cc,v 1.2 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright 2003 by David N. Welton <davidw@dedasys.com>.
@ -20,7 +20,8 @@
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#ifdef __linux__
#include <unistd.h>
#include <stdio.h>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: unmapped.cc,v 1.22 2003-08-10 17:19:49 akrisak Exp $
// $Id: unmapped.cc,v 1.23 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -31,7 +31,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theUnmappedDevice->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vga.cc,v 1.103 2004-06-06 17:01:12 vruppert Exp $
// $Id: vga.cc,v 1.104 2004-06-19 15:20:14 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -30,7 +30,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
#define LOG_THIS theVga->

View File

@ -1,5 +1,5 @@
////////////////////////////////////////////////////////////////////////
// $Id: virt_timer.cc,v 1.20 2004-02-06 22:28:00 danielg4 Exp $
// $Id: virt_timer.cc,v 1.21 2004-06-19 15:20:15 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -62,7 +62,7 @@
//
/////////////////////////////////////////////////////////////////////////
#include "bochs.h"
#include "iodev.h"
#define BX_USE_VIRTUAL_TIMERS 1
#define BX_VIRTUAL_TIMERS_REALTIME 1

View File

@ -27,7 +27,7 @@
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "bochs.h"
#include "iodev.h"
const off_t vmware3_image_t::INVALID_OFFSET=(off_t)-1;
/* Not very friendly... */

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: load32bitOShack.cc,v 1.14 2003-08-08 00:05:53 cbothamy Exp $
// $Id: load32bitOShack.cc,v 1.15 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -28,6 +28,7 @@
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS genlog->

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: logio.cc,v 1.45 2004-02-14 06:33:29 danielg4 Exp $
// $Id: logio.cc,v 1.46 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -26,7 +26,7 @@
#include "bochs.h"
#include "iodev/iodev.h"
#include <assert.h>
#include "state_file.h"

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.277 2004-06-04 22:06:55 sshwarts Exp $
// $Id: main.cc,v 1.278 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -26,6 +26,7 @@
#include "bochs.h"
#include "state_file.h"
#include "iodev/iodev.h"
#ifdef HAVE_LOCALE_H
#include <locale.h>

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: memory.cc,v 1.29 2004-06-06 17:01:19 vruppert Exp $
// $Id: memory.cc,v 1.30 2004-06-19 15:20:15 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -25,12 +25,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_MEM_THIS
#if BX_PROVIDE_CPU_MEMORY

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: misc_mem.cc,v 1.43 2004-06-06 17:01:19 vruppert Exp $
// $Id: misc_mem.cc,v 1.44 2004-06-19 15:20:15 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -29,17 +29,13 @@
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS BX_MEM(0)->
#if BX_PROVIDE_CPU_MEMORY
Bit32u
BX_MEM_C::get_memory_in_k(void)
Bit32u BX_MEM_C::get_memory_in_k(void)
{
return(BX_MEM_THIS megabytes * 1024);
}
@ -135,7 +131,7 @@ BX_MEM_C::~BX_MEM_C(void)
void
BX_MEM_C::init_memory(int memsize)
{
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.43 2004-06-06 17:01:19 vruppert Exp $"));
BX_DEBUG(("Init $Id: misc_mem.cc,v 1.44 2004-06-19 15:20:15 sshwarts Exp $"));
// you can pass 0 if memory has been allocated already through
// the constructor, or the desired size of memory if it hasn't
// BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes) ));

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pc_system.cc,v 1.36 2004-04-08 20:56:34 cbothamy Exp $
// $Id: pc_system.cc,v 1.37 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -27,6 +27,7 @@
#include "bochs.h"
#include "iodev/iodev.h"
#define LOG_THIS bx_pc_system.
#ifdef WIN32

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: plugin.cc,v 1.10 2004-01-19 21:43:50 cbothamy Exp $
// $Id: plugin.cc,v 1.11 2004-06-19 15:20:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// This file defines the plugin and plugin-device registration functions and
@ -13,6 +13,7 @@
/////////////////////////////////////////////////////////////////////////
#include "bochs.h"
#include "iodev/iodev.h"
#include "plugin.h"
#define LOG_THIS genlog->