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

fixed warning

Browse Source 
unify names of debugger dump methods
This commit is contained in:
Stanislav Shwartsman 2009-04-21 20:27:35 +00:00
parent 9408acde0d
commit 23326d86b6
11 changed files with 167 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.186 2009-04-14 09:45:22 sshwarts Exp $
// $Id: dbg_main.cc,v 1.187 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -3227,7 +3227,7 @@ void bx_dbg_info_ne2k(int page, int reg)
*/
void bx_dbg_info_pic()
{
DEV_pic_show_pic_state();
DEV_pic_debug_dump();
}
/*
@ -3236,7 +3236,7 @@ void bx_dbg_info_pic()
*/
void bx_dbg_info_vga()
{
DEV_vga_dump_status();
DEV_vga_debug_dump();
}
/*
@ -3247,7 +3247,7 @@ void bx_dbg_info_pci()
{
#if BX_SUPPORT_PCI
if (SIM->get_param_bool(BXPN_I440FX_SUPPORT)->get()) {
DEV_pci_print_i440fx_state();
DEV_pci_debug_dump();
}
else {
dbg_printf("PCI support is disabled in .bochsrc\n");

10
bochs/iodev/iodev.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: iodev.h,v 1.115 2009-04-10 14:41:29 vruppert Exp $
// $Id: iodev.h,v 1.116 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -75,6 +75,9 @@ class BOCHSAPI bx_devmodel_c : public logfunctions {
virtual void reset(unsigned type) {}
virtual void register_state(void) {}
virtual void after_restore_state(void) {}
#if BX_DEBUGGER
virtual void debug_dump(void) {}
#endif
};
//////////////////////////////////////////////////////////////////////
@ -231,9 +234,6 @@ public:
virtual Bit8u IAC(void) {
STUBFUNC(pic, IAC); return 0;
}
virtual void show_pic_state(void) {
STUBFUNC(pic, show_pic_state);
}
};
class BOCHSAPI bx_vga_stub_c : public bx_devmodel_c {
@ -258,7 +258,6 @@ public:
virtual Bit8u get_actl_palette_idx(Bit8u index) {
return 0;
}
virtual void dump_status(void) {}
virtual bx_bool vbe_set_base_addr(Bit32u *addr, Bit8u *pci_conf) {
return 0;
}
@ -290,7 +289,6 @@ public:
virtual Bit8u rd_memType(Bit32u addr) { return 0; }
virtual Bit8u wr_memType(Bit32u addr) { return 0; }
virtual void print_i440fx_state(void) {}
};
class BOCHSAPI bx_pci2isa_stub_c : public bx_devmodel_c, public bx_pci_device_stub_c {

234
bochs/iodev/ne2k.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ne2k.cc,v 1.106 2009-04-21 17:53:29 vruppert Exp $
// $Id: ne2k.cc,v 1.107 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1416,7 +1416,7 @@ void bx_ne2k_c::init(void)
Bit8u macaddr[6];
bx_list_c *base;
BX_DEBUG(("Init $Id: ne2k.cc,v 1.106 2009-04-21 17:53:29 vruppert Exp $"));
BX_DEBUG(("Init $Id: ne2k.cc,v 1.107 2009-04-21 20:27:35 sshwarts Exp $"));
// Read in values from config interface
base = (bx_list_c*) SIM->get_param(BXPN_NE2K);
@ -1634,39 +1634,39 @@ void bx_ne2k_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
#define BX_LOW_BYTE(x) (0x00ff & (x))
#define BX_DUPLICATE(n) if (brief && num!=n) break;
void bx_ne2k_c::print_info (FILE *fp, int page, int reg, int brief)
void bx_ne2k_c::print_info(FILE *fp, int page, int reg, int brief)
{
int i;
int n = 0;
if (page < 0) {
for (page=0; page<=2; page++)
theNE2kDevice->print_info (fp, page, reg, 1);
theNE2kDevice->print_info(fp, page, reg, 1);
// tell them how to use this command
dbg_printf ("\nHow to use the info ne2k command:\n");
dbg_printf ("info ne2k - show all registers\n");
dbg_printf ("info ne2k page N - show registers in page N\n");
dbg_printf ("info ne2k page N reg M - show just one register\n");
dbg_printf("\nHow to use the info ne2k command:\n");
dbg_printf("info ne2k - show all registers\n");
dbg_printf("info ne2k page N - show registers in page N\n");
dbg_printf("info ne2k page N reg M - show just one register\n");
return;
}
if (page > 2) {
dbg_printf ("NE2K has only pages 0, 1, and 2. Page %d is out of range.\n", page);
dbg_printf("NE2K has only pages 0, 1, and 2. Page %d is out of range.\n", page);
return;
}
if (reg < 0) {
dbg_printf ("NE2K registers, page %d\n", page);
dbg_printf ("----------------------\n");
dbg_printf("NE2K registers, page %d\n", page);
dbg_printf("----------------------\n");
for (reg=0; reg<=15; reg++)
theNE2kDevice->print_info (fp, page, reg, 1);
dbg_printf ("----------------------\n");
dbg_printf("----------------------\n");
return;
}
if (reg > 15) {
dbg_printf ("NE2K has only registers 0-15 (0x0-0xf). Register %d is out of range.\n", reg);
dbg_printf("NE2K has only registers 0-15 (0x0-0xf). Register %d is out of range.\n", reg);
return;
}
if (!brief) {
dbg_printf ("NE2K Info - page %d, register 0x%02x\n", page, reg);
dbg_printf ("----------------------------------\n");
dbg_printf("NE2K Info - page %d, register 0x%02x\n", page, reg);
dbg_printf("----------------------------------\n");
}
int num = page*0x100 + reg;
switch (num) {
@ -1674,129 +1674,129 @@ void bx_ne2k_c::print_info (FILE *fp, int page, int reg, int brief)
case 0x0100:
case 0x0200:
dbg_printf ("CR (Command register):\n ");
SHOW_FIELD (CR, stop);
SHOW_FIELD (CR, start);
SHOW_FIELD (CR, tx_packet);
SHOW_FIELD (CR, rdma_cmd);
SHOW_FIELD (CR, pgsel);
dbg_printf ("\n");
SHOW_FIELD(CR, stop);
SHOW_FIELD(CR, start);
SHOW_FIELD(CR, tx_packet);
SHOW_FIELD(CR, rdma_cmd);
SHOW_FIELD(CR, pgsel);
dbg_printf("\n");
break;
case 0x0003:
dbg_printf ("BNRY = Boundary Pointer = 0x%02x\n", BX_NE2K_THIS s.bound_ptr);
dbg_printf("BNRY = Boundary Pointer = 0x%02x\n", BX_NE2K_THIS s.bound_ptr);
break;
case 0x0004:
dbg_printf ("TSR (Transmit Status Register), read-only:\n ");
SHOW_FIELD (TSR, tx_ok);
SHOW_FIELD (TSR, reserved);
SHOW_FIELD (TSR, collided);
SHOW_FIELD (TSR, aborted);
SHOW_FIELD (TSR, no_carrier);
SHOW_FIELD (TSR, fifo_ur);
SHOW_FIELD (TSR, cd_hbeat);
SHOW_FIELD (TSR, ow_coll);
dbg_printf ("\n");
dbg_printf("TSR (Transmit Status Register), read-only:\n ");
SHOW_FIELD(TSR, tx_ok);
SHOW_FIELD(TSR, reserved);
SHOW_FIELD(TSR, collided);
SHOW_FIELD(TSR, aborted);
SHOW_FIELD(TSR, no_carrier);
SHOW_FIELD(TSR, fifo_ur);
SHOW_FIELD(TSR, cd_hbeat);
SHOW_FIELD(TSR, ow_coll);
dbg_printf("\n");
// fall through into TPSR, no break line.
case 0x0204:
dbg_printf ("TPSR = Transmit Page Start = 0x%02x\n", BX_NE2K_THIS s.tx_page_start);
dbg_printf("TPSR = Transmit Page Start = 0x%02x\n", BX_NE2K_THIS s.tx_page_start);
break;
case 0x0005:
case 0x0006: BX_DUPLICATE(0x0005);
dbg_printf ("NCR = Number of Collisions Register (read-only) = 0x%02x\n", BX_NE2K_THIS s.num_coll);
dbg_printf ("TBCR1,TBCR0 = Transmit Byte Count = %02x %02x\n",
BX_HIGH_BYTE (BX_NE2K_THIS s.tx_bytes),
BX_LOW_BYTE (BX_NE2K_THIS s.tx_bytes));
dbg_printf ("FIFO = %02x\n", BX_NE2K_THIS s.fifo);
dbg_printf("NCR = Number of Collisions Register (read-only) = 0x%02x\n", BX_NE2K_THIS s.num_coll);
dbg_printf("TBCR1,TBCR0 = Transmit Byte Count = %02x %02x\n",
BX_HIGH_BYTE(BX_NE2K_THIS s.tx_bytes),
BX_LOW_BYTE(BX_NE2K_THIS s.tx_bytes));
dbg_printf("FIFO = %02x\n", BX_NE2K_THIS s.fifo);
break;
case 0x0007:
dbg_printf ("ISR (Interrupt Status Register):\n ");
SHOW_FIELD (ISR, pkt_rx);
SHOW_FIELD (ISR, pkt_tx);
SHOW_FIELD (ISR, rx_err);
SHOW_FIELD (ISR, tx_err);
SHOW_FIELD (ISR, overwrite);
SHOW_FIELD (ISR, cnt_oflow);
SHOW_FIELD (ISR, rdma_done);
SHOW_FIELD (ISR, reset);
dbg_printf ("\n");
dbg_printf("ISR (Interrupt Status Register):\n ");
SHOW_FIELD(ISR, pkt_rx);
SHOW_FIELD(ISR, pkt_tx);
SHOW_FIELD(ISR, rx_err);
SHOW_FIELD(ISR, tx_err);
SHOW_FIELD(ISR, overwrite);
SHOW_FIELD(ISR, cnt_oflow);
SHOW_FIELD(ISR, rdma_done);
SHOW_FIELD(ISR, reset);
dbg_printf("\n");
break;
case 0x0008:
case 0x0009: BX_DUPLICATE(0x0008);
dbg_printf ("CRDA1,0 = Current remote DMA address = %02x %02x\n",
BX_HIGH_BYTE (BX_NE2K_THIS s.remote_dma),
BX_LOW_BYTE (BX_NE2K_THIS s.remote_dma));
dbg_printf ("RSAR1,0 = Remote start address = %02x %02x\n",
dbg_printf("CRDA1,0 = Current remote DMA address = %02x %02x\n",
BX_HIGH_BYTE(BX_NE2K_THIS s.remote_dma),
BX_LOW_BYTE(BX_NE2K_THIS s.remote_dma));
dbg_printf("RSAR1,0 = Remote start address = %02x %02x\n",
BX_HIGH_BYTE(s.remote_start),
BX_LOW_BYTE(s.remote_start));
break;
case 0x000a:
case 0x000b: BX_DUPLICATE(0x000a);
dbg_printf ("RCBR1,0 = Remote byte count = %02x\n", BX_NE2K_THIS s.remote_bytes);
dbg_printf("RCBR1,0 = Remote byte count = %02x\n", BX_NE2K_THIS s.remote_bytes);
break;
case 0x000c:
dbg_printf ("RSR (Receive Status Register), read-only:\n ");
SHOW_FIELD (RSR, rx_ok);
SHOW_FIELD (RSR, bad_crc);
SHOW_FIELD (RSR, bad_falign);
SHOW_FIELD (RSR, fifo_or);
SHOW_FIELD (RSR, rx_missed);
SHOW_FIELD (RSR, rx_mbit);
SHOW_FIELD (RSR, rx_disabled);
SHOW_FIELD (RSR, deferred);
dbg_printf ("\n");
dbg_printf("RSR (Receive Status Register), read-only:\n ");
SHOW_FIELD(RSR, rx_ok);
SHOW_FIELD(RSR, bad_crc);
SHOW_FIELD(RSR, bad_falign);
SHOW_FIELD(RSR, fifo_or);
SHOW_FIELD(RSR, rx_missed);
SHOW_FIELD(RSR, rx_mbit);
SHOW_FIELD(RSR, rx_disabled);
SHOW_FIELD(RSR, deferred);
dbg_printf("\n");
// fall through into RCR
case 0x020c:
dbg_printf ("RCR (Receive Configuration Register):\n ");
SHOW_FIELD (RCR, errors_ok);
SHOW_FIELD (RCR, runts_ok);
SHOW_FIELD (RCR, broadcast);
SHOW_FIELD (RCR, multicast);
SHOW_FIELD (RCR, promisc);
SHOW_FIELD (RCR, monitor);
SHOW_FIELD (RCR, reserved);
dbg_printf ("\n");
dbg_printf("RCR (Receive Configuration Register):\n ");
SHOW_FIELD(RCR, errors_ok);
SHOW_FIELD(RCR, runts_ok);
SHOW_FIELD(RCR, broadcast);
SHOW_FIELD(RCR, multicast);
SHOW_FIELD(RCR, promisc);
SHOW_FIELD(RCR, monitor);
SHOW_FIELD(RCR, reserved);
dbg_printf("\n");
break;
case 0x000d:
dbg_printf ("CNTR0 = Tally Counter 0 (Frame alignment errors) = %02x\n",
dbg_printf("CNTR0 = Tally Counter 0 (Frame alignment errors) = %02x\n",
BX_NE2K_THIS s.tallycnt_0);
// fall through into TCR
case 0x020d:
dbg_printf ("TCR (Transmit Configuration Register):\n ");
SHOW_FIELD (TCR, crc_disable);
SHOW_FIELD (TCR, loop_cntl);
SHOW_FIELD (TCR, ext_stoptx);
SHOW_FIELD (TCR, coll_prio);
SHOW_FIELD (TCR, reserved);
dbg_printf ("\n");
dbg_printf("TCR (Transmit Configuration Register):\n ");
SHOW_FIELD(TCR, crc_disable);
SHOW_FIELD(TCR, loop_cntl);
SHOW_FIELD(TCR, ext_stoptx);
SHOW_FIELD(TCR, coll_prio);
SHOW_FIELD(TCR, reserved);
dbg_printf("\n");
break;
case 0x000e:
dbg_printf ("CNTR1 = Tally Counter 1 (CRC Errors) = %02x\n",
dbg_printf("CNTR1 = Tally Counter 1 (CRC Errors) = %02x\n",
BX_NE2K_THIS s.tallycnt_1);
// fall through into DCR
case 0x020e:
dbg_printf ("DCR (Data Configuration Register):\n ");
SHOW_FIELD (DCR, wdsize);
SHOW_FIELD (DCR, endian);
SHOW_FIELD (DCR, longaddr);
SHOW_FIELD (DCR, loop);
SHOW_FIELD (DCR, auto_rx);
SHOW_FIELD (DCR, fifo_size);
dbg_printf ("\n");
dbg_printf("DCR (Data Configuration Register):\n ");
SHOW_FIELD(DCR, wdsize);
SHOW_FIELD(DCR, endian);
SHOW_FIELD(DCR, longaddr);
SHOW_FIELD(DCR, loop);
SHOW_FIELD(DCR, auto_rx);
SHOW_FIELD(DCR, fifo_size);
dbg_printf("\n");
break;
case 0x000f:
dbg_printf ("CNTR2 = Tally Counter 2 (Missed Packet Errors) = %02x\n",
dbg_printf("CNTR2 = Tally Counter 2 (Missed Packet Errors) = %02x\n",
BX_NE2K_THIS s.tallycnt_2);
// fall through into IMR
case 0x020f:
dbg_printf ("IMR (Interrupt Mask Register)\n ");
SHOW_FIELD (IMR, rx_inte);
SHOW_FIELD (IMR, tx_inte);
SHOW_FIELD (IMR, rxerr_inte);
SHOW_FIELD (IMR, txerr_inte);
SHOW_FIELD (IMR, overw_inte);
SHOW_FIELD (IMR, cofl_inte);
SHOW_FIELD (IMR, rdma_inte);
SHOW_FIELD (IMR, reserved);
dbg_printf ("\n");
dbg_printf("IMR (Interrupt Mask Register)\n ");
SHOW_FIELD(IMR, rx_inte);
SHOW_FIELD(IMR, tx_inte);
SHOW_FIELD(IMR, rxerr_inte);
SHOW_FIELD(IMR, txerr_inte);
SHOW_FIELD(IMR, overw_inte);
SHOW_FIELD(IMR, cofl_inte);
SHOW_FIELD(IMR, rdma_inte);
SHOW_FIELD(IMR, reserved);
dbg_printf("\n");
break;
case 0x0101:
case 0x0102: BX_DUPLICATE(0x0101);
@ -1804,13 +1804,13 @@ void bx_ne2k_c::print_info (FILE *fp, int page, int reg, int brief)
case 0x0104: BX_DUPLICATE(0x0101);
case 0x0105: BX_DUPLICATE(0x0101);
case 0x0106: BX_DUPLICATE(0x0101);
dbg_printf ("MAC address registers are located at page 1, registers 1-6.\n");
dbg_printf ("The MAC address is ");
dbg_printf("MAC address registers are located at page 1, registers 1-6.\n");
dbg_printf("The MAC address is ");
for (i=0; i<=5; i++)
dbg_printf ("%02x%c", BX_NE2K_THIS s.physaddr[i], i<5?':' : '\n');
dbg_printf("%02x%c", BX_NE2K_THIS s.physaddr[i], i<5?':' : '\n');
break;
case 0x0107:
dbg_printf ("Current page is 0x%02x\n", BX_NE2K_THIS s.curr_page);
dbg_printf("Current page is 0x%02x\n", BX_NE2K_THIS s.curr_page);
break;
case 0x0108:
case 0x0109: BX_DUPLICATE(0x0108);
@ -1820,29 +1820,29 @@ void bx_ne2k_c::print_info (FILE *fp, int page, int reg, int brief)
case 0x010D: BX_DUPLICATE(0x0108);
case 0x010E: BX_DUPLICATE(0x0108);
case 0x010F: BX_DUPLICATE(0x0108);
dbg_printf ("MAR0-7 (Multicast address registers 0-7) are set to:\n");
for (i=0; i<8; i++) dbg_printf ("%02x ", BX_NE2K_THIS s.mchash[i]);
dbg_printf ("\nMAR0 is listed first.\n");
dbg_printf("MAR0-7 (Multicast address registers 0-7) are set to:\n");
for (i=0; i<8; i++) dbg_printf("%02x ", BX_NE2K_THIS s.mchash[i]);
dbg_printf("\nMAR0 is listed first.\n");
break;
case 0x0001:
case 0x0002: BX_DUPLICATE(0x0001);
case 0x0201: BX_DUPLICATE(0x0001);
case 0x0202: BX_DUPLICATE(0x0001);
dbg_printf ("PSTART = Page start register = %02x\n", BX_NE2K_THIS s.page_start);
dbg_printf ("PSTOP = Page stop register = %02x\n", BX_NE2K_THIS s.page_stop);
dbg_printf ("Local DMA address = %02x %02x\n",
dbg_printf("PSTART = Page start register = %02x\n", BX_NE2K_THIS s.page_start);
dbg_printf("PSTOP = Page stop register = %02x\n", BX_NE2K_THIS s.page_stop);
dbg_printf("Local DMA address = %02x %02x\n",
BX_HIGH_BYTE(BX_NE2K_THIS s.local_dma),
BX_LOW_BYTE(BX_NE2K_THIS s.local_dma));
break;
case 0x0203:
dbg_printf ("Remote Next Packet Pointer = %02x\n", BX_NE2K_THIS s.rempkt_ptr);
dbg_printf("Remote Next Packet Pointer = %02x\n", BX_NE2K_THIS s.rempkt_ptr);
break;
case 0x0205:
dbg_printf ("Local Next Packet Pointer = %02x\n", BX_NE2K_THIS s.localpkt_ptr);
dbg_printf("Local Next Packet Pointer = %02x\n", BX_NE2K_THIS s.localpkt_ptr);
break;
case 0x0206:
case 0x0207: BX_DUPLICATE(0x0206);
dbg_printf ("Address Counter= %02x %02x\n",
dbg_printf("Address Counter= %02x %02x\n",
BX_HIGH_BYTE(BX_NE2K_THIS s.address_cnt),
BX_LOW_BYTE(BX_NE2K_THIS s.address_cnt));
break;
@ -1852,14 +1852,14 @@ void bx_ne2k_c::print_info (FILE *fp, int page, int reg, int brief)
case 0x020B: BX_DUPLICATE(0x0208);
if (!brief) dbg_printf ("Reserved\n");
case 0xffff:
dbg_printf ("IMR (Interrupt Mask Register):\n ");
dbg_printf ("\n");
dbg_printf("IMR (Interrupt Mask Register):\n ");
dbg_printf("\n");
break;
default:
dbg_printf ("NE2K info: sorry, page %d register %d cannot be displayed.\n", page, reg);
dbg_printf("NE2K info: sorry, page %d register %d cannot be displayed.\n", page, reg);
}
if (!brief)
dbg_printf ("\n");
dbg_printf("\n");
}
#else

6
bochs/iodev/pci.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci.cc,v 1.62 2009-04-21 17:53:29 vruppert Exp $
// $Id: pci.cc,v 1.63 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -63,7 +63,7 @@ bx_pci_bridge_c::bx_pci_bridge_c()
bx_pci_bridge_c::~bx_pci_bridge_c()
{
print_i440fx_state();
debug_dump();
BX_DEBUG(("Exit"));
}
@ -461,7 +461,7 @@ Bit8u bx_pci_bridge_c::wr_memType(Bit32u addr)
return(0); // keep compiler happy
}
void bx_pci_bridge_c::print_i440fx_state()
void bx_pci_bridge_c::debug_dump()
{
int i;

11
bochs/iodev/pci.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci.h,v 1.29 2009-02-08 09:05:52 vruppert Exp $
// $Id: pci.h,v 1.30 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -71,13 +71,16 @@ public:
bx_write_handler_t f2, Bit32u *addr,
Bit8u *pci_conf, unsigned size,
const Bit8u *iomask, const char *name);
virtual void print_i440fx_state(void);
virtual Bit8u rd_memType (Bit32u addr);
virtual Bit8u wr_memType (Bit32u addr);
virtual Bit8u rd_memType(Bit32u addr);
virtual Bit8u wr_memType(Bit32u addr);
virtual Bit32u pci_read_handler(Bit8u address, unsigned io_len);
virtual void pci_write_handler(Bit8u address, Bit32u value, unsigned io_len);
#if BX_DEBUGGER
virtual void debug_dump(void);
#endif
private:
Bit8u pci_handler_id[0x100]; // 256 devices/functions
struct {

24
bochs/iodev/pic.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pic.cc,v 1.54 2009-02-22 10:44:50 vruppert Exp $
// $Id: pic.cc,v 1.55 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -872,16 +872,16 @@ Bit8u bx_pic_c::IAC(void)
return(vector);
}
void bx_pic_c::show_pic_state(void)
#if BX_DEBUGGER
void bx_pic_c::debug_dump(void)
{
#if defined(BX_DEBUGGER) && (BX_DEBUGGER == 1)
dbg_printf("s.master_pic.imr = %02x\n", BX_PIC_THIS s.master_pic.imr);
dbg_printf("s.master_pic.isr = %02x\n", BX_PIC_THIS s.master_pic.isr);
dbg_printf("s.master_pic.irr = %02x\n", BX_PIC_THIS s.master_pic.irr);
dbg_printf("s.master_pic.irq = %02x\n", BX_PIC_THIS s.master_pic.irq);
dbg_printf("s.slave_pic.imr = %02x\n", BX_PIC_THIS s.slave_pic.imr);
dbg_printf("s.slave_pic.isr = %02x\n", BX_PIC_THIS s.slave_pic.isr);
dbg_printf("s.slave_pic.irr = %02x\n", BX_PIC_THIS s.slave_pic.irr);
dbg_printf("s.slave_pic.irq = %02x\n", BX_PIC_THIS s.slave_pic.irq);
#endif
dbg_printf("s.master_pic.imr = %02x\n", BX_PIC_THIS s.master_pic.imr);
dbg_printf("s.master_pic.isr = %02x\n", BX_PIC_THIS s.master_pic.isr);
dbg_printf("s.master_pic.irr = %02x\n", BX_PIC_THIS s.master_pic.irr);
dbg_printf("s.master_pic.irq = %02x\n", BX_PIC_THIS s.master_pic.irq);
dbg_printf("s.slave_pic.imr = %02x\n", BX_PIC_THIS s.slave_pic.imr);
dbg_printf("s.slave_pic.isr = %02x\n", BX_PIC_THIS s.slave_pic.isr);
dbg_printf("s.slave_pic.irr = %02x\n", BX_PIC_THIS s.slave_pic.irr);
dbg_printf("s.slave_pic.irq = %02x\n", BX_PIC_THIS s.slave_pic.irq);
}
#endif

6
bochs/iodev/pic.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pic.h,v 1.21 2009-02-08 09:05:52 vruppert Exp $
// $Id: pic.h,v 1.22 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -77,7 +77,9 @@ public:
virtual void raise_irq(unsigned irq_no);
virtual void set_mode(bx_bool ma_sl, Bit8u mode);
virtual Bit8u IAC(void);
virtual void show_pic_state(void);
#if BX_DEBUGGER
virtual void debug_dump(void);
#endif
virtual void register_state(void);
private:

5
bochs/iodev/scsi_device.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: scsi_device.cc,v 1.19 2009-04-21 15:37:17 vruppert Exp $
// $Id: scsi_device.cc,v 1.20 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2007 Volker Ruppert
@ -735,7 +735,6 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun)
BX_INFO(("Verify"));
break;
case 0x23: {
// USBMASS-UFI10.pdf  rev 1.0  Section 4.10
BX_INFO(("READ FORMAT CAPACITIES (MMC)"));
@ -785,7 +784,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun)
return -len;
} else {
if (!r->sector_count)
r->sector_count = -1;
r->sector_count = (Bit32u) -1;
return len;
}
}

4
bochs/iodev/vga.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vga.cc,v 1.163 2009-04-10 11:10:32 vruppert Exp $
// $Id: vga.cc,v 1.164 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -2828,7 +2828,7 @@ Bit8u bx_vga_c::get_actl_palette_idx(Bit8u index)
return BX_VGA_THIS s.attribute_ctrl.palette_reg[index];
}
void bx_vga_c::dump_status(void)
void bx_vga_c::debug_dump(void)
{
#if BX_DEBUGGER
dbg_printf("s.misc_output.color_emulation = %u\n",

11
bochs/iodev/vga.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: vga.h,v 1.71 2009-04-10 14:41:29 vruppert Exp $
// $Id: vga.h,v 1.72 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -139,14 +139,17 @@ public:
virtual Bit8u mem_read(bx_phy_address addr);
virtual void mem_write(bx_phy_address addr, Bit8u value);
virtual void trigger_timer(void *this_ptr);
virtual void dump_status(void);
virtual void register_state(void);
virtual void after_restore_state(void);
#if BX_DEBUGGER
virtual void debug_dump(void);
#endif
#if BX_SUPPORT_VBE
virtual bx_bool vbe_set_base_addr(Bit32u *addr, Bit8u *pci_conf);
BX_VGA_SMF Bit8u vbe_mem_read(bx_phy_address addr) BX_CPP_AttrRegparmN(1);
BX_VGA_SMF void vbe_mem_write(bx_phy_address addr, Bit8u value) BX_CPP_AttrRegparmN(2);
BX_VGA_SMF Bit8u vbe_mem_read(bx_phy_address addr) BX_CPP_AttrRegparmN(1);
BX_VGA_SMF void vbe_mem_write(bx_phy_address addr, Bit8u value) BX_CPP_AttrRegparmN(2);
#endif
virtual void redraw_area(unsigned x0, unsigned y0,

9
bochs/plugin.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: plugin.h,v 1.79 2009-04-10 14:41:29 vruppert Exp $
// $Id: plugin.h,v 1.80 2009-04-21 20:27:35 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2009 The Bochs Project
@ -120,6 +120,7 @@ extern "C" {
#define DEV_reset_devices(type) {bx_devices.reset(type); }
#define DEV_register_state() {bx_devices.register_state(); }
#define DEV_after_restore_state() {bx_devices.after_restore_state(); }
#define DEV_register_timer(a,b,c,d,e,f) bx_pc_system.register_timer(a,b,c,d,e,f)
#define DEV_mouse_enabled_changed(en) (bx_devices.mouse_enabled_changed(en))
#define DEV_mouse_motion(dx, dy, state) (bx_devices.mouse_motion(dx, dy, 0, state))
@ -197,7 +198,7 @@ extern "C" {
#define DEV_pic_raise_irq(b) (bx_devices.pluginPicDevice->raise_irq(b))
#define DEV_pic_set_mode(a,b) (bx_devices.pluginPicDevice->set_mode(a,b))
#define DEV_pic_iac() (bx_devices.pluginPicDevice->IAC())
#define DEV_pic_show_pic_state() (bx_devices.pluginPicDevice->show_pic_state())
#define DEV_pic_debug_dump() (bx_devices.pluginPicDevice->debug_dump())
///////// VGA macros
#define DEV_vga_mem_read(addr) (bx_devices.pluginVgaDevice->mem_read(addr))
@ -209,7 +210,7 @@ extern "C" {
#define DEV_vga_refresh() \
(bx_devices.pluginVgaDevice->trigger_timer(bx_devices.pluginVgaDevice))
#define DEV_vga_get_actl_pal_idx(index) (bx_devices.pluginVgaDevice->get_actl_palette_idx(index))
#define DEV_vga_dump_status() (bx_devices.pluginVgaDevice->dump_status())
#define DEV_vga_debug_dump() (bx_devices.pluginVgaDevice->debug_dump())
#define DEV_vbe_set_base_addr(a,b) (bx_devices.pluginVgaDevice->vbe_set_base_addr(a,b))
///////// PCI macros
@ -223,7 +224,7 @@ extern "C" {
(bx_devices.pluginPciBridge->pci_set_base_io(a,b,c,d,e,f,g,h))
#define DEV_pci_rd_memtype(addr) bx_devices.pluginPciBridge->rd_memType(addr)
#define DEV_pci_wr_memtype(addr) bx_devices.pluginPciBridge->wr_memType(addr)
#define DEV_pci_print_i440fx_state() bx_devices.pluginPciBridge->print_i440fx_state()
#define DEV_pci_debug_dump() bx_devices.pluginPciBridge->debug_dump()
#define DEV_ide_bmdma_present() bx_devices.pluginPciIdeController->bmdma_present()
#define DEV_ide_bmdma_set_irq(a) bx_devices.pluginPciIdeController->bmdma_set_irq(a)
#define DEV_acpi_generate_smi(a) bx_devices.pluginACPIController->generate_smi(a)