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

- bx_dbg cleanup in the floppy and unmapped code (using BX_DEBUG now)

Browse Source
This commit is contained in:
Volker Ruppert 2009-04-24 14:57:25 +00:00
parent 2a268ecd5b
commit 3a3b3f5b07
4 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/bochs.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: bochs.h,v 1.245 2009-04-24 08:16:06 sshwarts Exp $
// $Id: bochs.h,v 1.246 2009-04-24 14:57:24 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -431,13 +431,11 @@ int bx_gdbstub_check(unsigned int eip);
#endif
typedef struct {
bx_bool floppy;
bx_bool disk;
bx_bool interrupts;
bx_bool exceptions;
bx_bool debugger;
bx_bool mouse;
bx_bool unsupported_io;
bx_bool cdrom;
bx_bool print_timestamps;
bx_bool port_e9_hack;

6
bochs/bx_debug/dbg_main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: dbg_main.cc,v 1.189 2009-04-24 08:16:06 sshwarts Exp $
// $Id: dbg_main.cc,v 1.190 2009-04-24 14:57:24 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -1312,24 +1312,20 @@ void bx_dbg_show_command(const char* arg)
dbg_show_mask = 0x0;
dbg_printf("Disable all show flags\n");
} else if(!strcmp(arg,"dbg-all")) {
bx_dbg.floppy = 1;
bx_dbg.disk = 1;
bx_dbg.interrupts = 1;
bx_dbg.exceptions = 1;
bx_dbg.mouse = 1;
bx_dbg.debugger = 1;
bx_dbg.unsupported_io = 1;
/* bx_dbg.record_io = 1; this is a pointer .. somewhere */
dbg_printf("Turned ON all bx_dbg flags\n");
return;
} else if(!strcmp(arg,"dbg-none")) {
bx_dbg.floppy = 0;
bx_dbg.disk = 0;
bx_dbg.interrupts = 0;
bx_dbg.exceptions = 0;
bx_dbg.mouse = 0;
bx_dbg.debugger = 0;
bx_dbg.unsupported_io = 0;
/* bx_dbg.record_io = 0; this is a pointer .. somewhere */
dbg_printf("Turned OFF all bx_dbg flags\n");
return;

40
bochs/iodev/floppy.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: floppy.cc,v 1.119 2009-03-25 18:33:43 vruppert Exp $
// $Id: floppy.cc,v 1.120 2009-04-24 14:57:24 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -141,7 +141,7 @@ void bx_floppy_ctrl_c::init(void)
{
Bit8u i, devtype, cmos_value;
BX_DEBUG(("Init $Id: floppy.cc,v 1.119 2009-03-25 18:33:43 vruppert Exp $"));
BX_DEBUG(("Init $Id: floppy.cc,v 1.120 2009-04-24 14:57:24 vruppert 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++) {
@ -1016,12 +1016,8 @@ void bx_floppy_ctrl_c::floppy_xfer(Bit8u drive, Bit32u offset, Bit8u *buffer,
if (BX_FD_THIS s.device_type[drive] == FDRIVE_NONE)
BX_PANIC(("floppy_xfer: bad drive #%d", drive));
if (bx_dbg.floppy) {
BX_INFO(("drive=%u", (unsigned) drive));
BX_INFO(("offset=%u", (unsigned) offset));
BX_INFO(("bytes=%u", (unsigned) bytes));
BX_INFO(("direction=%s", (direction==FROM_FLOPPY)? "from" : "to"));
}
BX_DEBUG(("floppy_xfer: drive=%u, offset=%u, bytes=%u, direction=%s floppy",
drive, offset, bytes, (direction==FROM_FLOPPY)? "from" : "to"));
#if BX_WITH_MACOS
if (strcmp(SIM->get_param_string(BXPN_FLOPPYA_PATH)->getptr(), SuperDrive))
@ -1157,14 +1153,12 @@ void bx_floppy_ctrl_c::timer()
BX_FD_THIS s.status_reg1 = 0;
BX_FD_THIS s.status_reg2 = 0;
if (bx_dbg.floppy) {
BX_INFO(("<<WRITE DONE>>"));
BX_INFO(("AFTER"));
BX_INFO((" drive = %u", (unsigned) drive));
BX_INFO((" head = %u", (unsigned) BX_FD_THIS s.head[drive]));
BX_INFO((" cylinder = %u", (unsigned) BX_FD_THIS s.cylinder[drive]));
BX_INFO((" sector = %u", (unsigned) BX_FD_THIS s.sector[drive]));
}
BX_DEBUG(("<<WRITE DONE>>"));
BX_DEBUG(("AFTER"));
BX_DEBUG((" drive = %u", drive));
BX_DEBUG((" head = %u", BX_FD_THIS s.head[drive]));
BX_DEBUG((" cylinder = %u", BX_FD_THIS s.cylinder[drive]));
BX_DEBUG((" sector = %u", BX_FD_THIS s.sector[drive]));
enter_result_phase();
} else {
@ -1241,14 +1235,12 @@ void bx_floppy_ctrl_c::dma_write(Bit8u *data_byte)
BX_FD_THIS s.status_reg1 = 0;
BX_FD_THIS s.status_reg2 = 0;
if (bx_dbg.floppy) {
BX_INFO(("<<READ DONE>>"));
BX_INFO(("AFTER"));
BX_INFO((" drive = %u", (unsigned) drive));
BX_INFO((" head = %u", (unsigned) BX_FD_THIS s.head[drive]));
BX_INFO((" cylinder = %u", (unsigned) BX_FD_THIS s.cylinder[drive]));
BX_INFO((" sector = %u", (unsigned) BX_FD_THIS s.sector[drive]));
}
BX_DEBUG(("<<READ DONE>>"));
BX_DEBUG(("AFTER"));
BX_DEBUG((" drive = %u", drive));
BX_DEBUG((" head = %u", BX_FD_THIS s.head[drive]));
BX_DEBUG((" cylinder = %u", BX_FD_THIS s.cylinder[drive]));
BX_DEBUG((" sector = %u", BX_FD_THIS s.sector[drive]));
if (!(BX_FD_THIS s.main_status_reg & FD_MS_NDMA)) {
DEV_dma_set_drq(FLOPPY_DMA_CHAN, 0);

39
bochs/iodev/unmapped.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: unmapped.cc,v 1.34 2009-04-24 08:16:06 sshwarts Exp $
// $Id: unmapped.cc,v 1.35 2009-04-24 14:57:25 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -142,7 +142,6 @@ Bit32u bx_unmapped_c::read(Bit32u address, unsigned io_len)
case 0x03fd: /* UART */
case 0x17c6:
retval = 0xffffffff;
BX_DEBUG(("unsupported IO read from port %04x", address));
break;
default:
retval = 0xffffffff;
@ -150,8 +149,7 @@ Bit32u bx_unmapped_c::read(Bit32u address, unsigned io_len)
return_from_read:
if (bx_dbg.unsupported_io) {
switch (io_len) {
switch (io_len) {
case 1:
retval = (Bit8u)retval;
BX_DEBUG(("unmapped: 8-bit read from %04x = %02x", address, retval));
@ -165,7 +163,6 @@ return_from_read:
break;
default:
BX_PANIC(("unmapped: %d-bit read from %04x = %x", io_len * 8, address, retval));
}
}
return retval;
@ -253,10 +250,10 @@ void bx_unmapped_c::write(Bit32u address, Bit32u value, unsigned io_len)
case 'n': if (BX_UM_THIS s.shutdown == 7) BX_UM_THIS s.shutdown = 8; break;
#if BX_DEBUGGER
// Very handy for debugging:
// output 'D' to port 8900, and bochs quits to debugger
// output 'D' to port 8900, and bochs quits to debugger
case 'D': bx_debug_break(); break;
#endif
default : BX_UM_THIS s.shutdown = 0; break;
default : BX_UM_THIS s.shutdown = 0; break;
}
if (BX_UM_THIS s.shutdown == 8) {
bx_user_quit = 1;
@ -276,20 +273,18 @@ void bx_unmapped_c::write(Bit32u address, Bit32u value, unsigned io_len)
return_from_write:
if (bx_dbg.unsupported_io) {
switch (io_len) {
case 1:
BX_INFO(("unmapped: 8-bit write to %04x = %02x", address, value));
break;
case 2:
BX_INFO(("unmapped: 16-bit write to %04x = %04x", address, value));
break;
case 4:
BX_INFO(("unmapped: 32-bit write to %04x = %08x", address, value));
break;
default:
BX_PANIC(("unmapped: %d-bit write to %04x = %x", io_len * 8, address, value));
break;
}
switch (io_len) {
case 1:
BX_DEBUG(("unmapped: 8-bit write to %04x = %02x", address, value));
break;
case 2:
BX_DEBUG(("unmapped: 16-bit write to %04x = %04x", address, value));
break;
case 4:
BX_DEBUG(("unmapped: 32-bit write to %04x = %08x", address, value));
break;
default:
BX_PANIC(("unmapped: %d-bit write to %04x = %x", io_len * 8, address, value));
break;
}
}