cec9135e9f
"bx_bool" which is always defined as Bit32u on all platforms. In Carbon
specific code, Boolean is still used because the Carbon header files
define it to unsigned char.
- this fixes bug [ 623152 ] MacOSX: Triple Exception Booting win95.
The bug was that some code in Bochs depends on Boolean to be a
32 bit value. (This should be fixed, but I don't know all the places
where it needs to be fixed yet.) Because Carbon defined Boolean as
an unsigned char, Bochs just followed along and used the unsigned char
definition to avoid compile problems. This exposed the dependency
on 32 bit Boolean on MacOS X only and led to major simulation problems,
that could only be reproduced and debugged on that platform.
- On the mailing list we debated whether to make all Booleans into "bool" or
our own type. I chose bx_bool for several reasons.
1. Unlike C++'s bool, we can guarantee that bx_bool is the same size on all
platforms, which makes it much less likely to have more platform-specific
simulation differences in the future. (I spent hours on a borrowed
MacOSX machine chasing bug 618388 before discovering that different sized
Booleans were the problem, and I don't want to repeat that.)
2. We still have at least one dependency on 32 bit Booleans which must be
fixed some time, but I don't want to risk introducing new bugs into the
simulation just before the 2.0 release.
Modified Files:
bochs.h config.h.in gdbstub.cc logio.cc main.cc pc_system.cc
pc_system.h plugin.cc plugin.h bios/rombios.c cpu/apic.cc
cpu/arith16.cc cpu/arith32.cc cpu/arith64.cc cpu/arith8.cc
cpu/cpu.cc cpu/cpu.h cpu/ctrl_xfer16.cc cpu/ctrl_xfer32.cc
cpu/ctrl_xfer64.cc cpu/data_xfer16.cc cpu/data_xfer32.cc
cpu/data_xfer64.cc cpu/debugstuff.cc cpu/exception.cc
cpu/fetchdecode.cc cpu/flag_ctrl_pro.cc cpu/init.cc
cpu/io_pro.cc cpu/lazy_flags.cc cpu/lazy_flags.h cpu/mult16.cc
cpu/mult32.cc cpu/mult64.cc cpu/mult8.cc cpu/paging.cc
cpu/proc_ctrl.cc cpu/segment_ctrl_pro.cc cpu/stack_pro.cc
cpu/tasking.cc debug/dbg_main.cc debug/debug.h debug/sim2.cc
disasm/dis_decode.cc disasm/disasm.h doc/docbook/Makefile
docs-html/cosimulation.html fpu/wmFPUemu_glue.cc
gui/amigaos.cc gui/beos.cc gui/carbon.cc gui/gui.cc gui/gui.h
gui/keymap.cc gui/keymap.h gui/macintosh.cc gui/nogui.cc
gui/rfb.cc gui/sdl.cc gui/siminterface.cc gui/siminterface.h
gui/term.cc gui/win32.cc gui/wx.cc gui/wxmain.cc gui/wxmain.h
gui/x.cc instrument/example0/instrument.cc
instrument/example0/instrument.h
instrument/example1/instrument.cc
instrument/example1/instrument.h
instrument/stubs/instrument.cc instrument/stubs/instrument.h
iodev/cdrom.cc iodev/cdrom.h iodev/cdrom_osx.cc iodev/cmos.cc
iodev/devices.cc iodev/dma.cc iodev/dma.h iodev/eth_arpback.cc
iodev/eth_packetmaker.cc iodev/eth_packetmaker.h
iodev/floppy.cc iodev/floppy.h iodev/guest2host.h
iodev/harddrv.cc iodev/harddrv.h iodev/ioapic.cc
iodev/ioapic.h iodev/iodebug.cc iodev/iodev.h
iodev/keyboard.cc iodev/keyboard.h iodev/ne2k.h
iodev/parallel.h iodev/pci.cc iodev/pci.h iodev/pic.h
iodev/pit.cc iodev/pit.h iodev/pit_wrap.cc iodev/pit_wrap.h
iodev/sb16.cc iodev/sb16.h iodev/serial.cc iodev/serial.h
iodev/vga.cc iodev/vga.h memory/memory.h memory/misc_mem.cc
96 lines
3.0 KiB
C++
96 lines
3.0 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// $Id: pci.h,v 1.12 2002-10-25 11:44:40 bdenney Exp $
|
|
/////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2002 MandrakeSoft S.A.
|
|
//
|
|
// MandrakeSoft S.A.
|
|
// 43, rue d'Aboukir
|
|
// 75002 Paris - France
|
|
// http://www.linux-mandrake.com/
|
|
// http://www.mandrakesoft.com/
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2 of the License, or (at your option) any later version.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
#if BX_PCI_SUPPORT
|
|
|
|
#define BX_MAX_PCI_DEVICES 20
|
|
|
|
typedef Bit32u (*bx_pci_read_handler_t)(void *, Bit8u, unsigned);
|
|
typedef void (*bx_pci_write_handler_t)(void *, Bit8u, Bit32u, unsigned);
|
|
|
|
#if BX_USE_PCI_SMF
|
|
# define BX_PCI_SMF static
|
|
# define BX_PCI_THIS bx_pci.
|
|
#else
|
|
# define BX_PCI_SMF
|
|
# define BX_PCI_THIS this->
|
|
#endif
|
|
|
|
|
|
typedef struct {
|
|
Bit32u confAddr;
|
|
Bit32u confData;
|
|
Bit8u pci_conf[256];
|
|
} bx_def440fx_t;
|
|
|
|
|
|
|
|
class bx_pci_c : public logfunctions {
|
|
|
|
public:
|
|
bx_pci_c(void);
|
|
~bx_pci_c(void);
|
|
BX_PCI_SMF void init(void);
|
|
BX_PCI_SMF void reset(unsigned type);
|
|
bx_bool register_pci_handlers(void *this_ptr, bx_pci_read_handler_t f1,
|
|
bx_pci_write_handler_t f2, Bit8u devfunc,
|
|
const char *name);
|
|
BX_PCI_SMF void print_i440fx_state( );
|
|
BX_PCI_SMF Bit8u rd_memType (Bit32u addr);
|
|
BX_PCI_SMF Bit8u wr_memType (Bit32u addr);
|
|
|
|
private:
|
|
Bit8u pci_handler_id[0x100]; // 256 devices/functions
|
|
struct {
|
|
bx_pci_read_handler_t read;
|
|
bx_pci_write_handler_t write;
|
|
void *this_ptr;
|
|
} pci_handler[BX_MAX_PCI_DEVICES];
|
|
unsigned num_pci_handles;
|
|
|
|
struct {
|
|
bx_def440fx_t i440fx;
|
|
} s;
|
|
|
|
static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);
|
|
static void write_handler(void *this_ptr, Bit32u address, Bit32u value, unsigned io_len);
|
|
static Bit32u pci_read_handler(void *this_ptr, Bit8u address, unsigned io_len);
|
|
static void pci_write_handler(void *this_ptr, Bit8u address, Bit32u value, unsigned io_len);
|
|
#if !BX_USE_PCI_SMF
|
|
Bit32u read(Bit32u address, unsigned io_len);
|
|
void write(Bit32u address, Bit32u value, unsigned io_len);
|
|
Bit32u pci_read(Bit8u address, unsigned io_len);
|
|
void pci_write(Bit8u address, Bit32u value, unsigned io_len);
|
|
#endif
|
|
};
|
|
|
|
#if BX_USE_PCI_SMF
|
|
extern bx_pci_c bx_pci;
|
|
#endif
|
|
|
|
#endif // #if BX_PCI_SUPPORT
|