diff --git a/bochs/cpu/init.cc b/bochs/cpu/init.cc index e2dab8766..c06eb40f4 100644 --- a/bochs/cpu/init.cc +++ b/bochs/cpu/init.cc @@ -46,6 +46,7 @@ BX_CPU_C::BX_CPU_C() void BX_CPU_C::init(BX_MEM_C *addrspace) { + BX_DEBUG(( "Init $Id: init.cc,v 1.12 2001-06-27 20:27:48 fries Exp $")); // BX_CPU_C constructor BX_CPU_THIS_PTR set_INTR (0); #if BX_SUPPORT_APIC @@ -185,7 +186,6 @@ void BX_CPU_C::init(BX_MEM_C *addrspace) sprintf (name, "CPU %p", this); BX_INSTR_INIT(); - BX_DEBUG(( "Init.")); } diff --git a/bochs/iodev/devices.cc b/bochs/iodev/devices.cc index 81b7658ac..8af5ab64c 100644 --- a/bochs/iodev/devices.cc +++ b/bochs/iodev/devices.cc @@ -85,7 +85,6 @@ bx_devices_c::bx_devices_c(void) } timer_handle = BX_NULL_TIMER_HANDLE; - BX_DEBUG(("Init $Id: devices.cc,v 1.11 2001-06-27 20:11:10 fries Exp $")); } @@ -99,6 +98,7 @@ bx_devices_c::~bx_devices_c(void) void bx_devices_c::init(BX_MEM_C *newmem) { + BX_DEBUG(("Init $Id: devices.cc,v 1.12 2001-06-27 20:27:49 fries Exp $")); mem = newmem; // Start with all IO port address registered to unmapped handler // MUST be called first diff --git a/bochs/iodev/dma.cc b/bochs/iodev/dma.cc index 48dc564c3..c91cf3a21 100644 --- a/bochs/iodev/dma.cc +++ b/bochs/iodev/dma.cc @@ -43,7 +43,6 @@ bx_dma_c::bx_dma_c(void) { put("DMA"); settype(DMALOG); - BX_DEBUG(("Init $Id: dma.cc,v 1.9 2001-06-27 20:11:10 fries Exp $")); } bx_dma_c::~bx_dma_c(void) @@ -56,6 +55,7 @@ bx_dma_c::~bx_dma_c(void) bx_dma_c::init(bx_devices_c *d) { unsigned c; + BX_DEBUG(("Init $Id: dma.cc,v 1.10 2001-06-27 20:27:49 fries Exp $")); BX_DMA_THIS devices = d; diff --git a/bochs/iodev/floppy.cc b/bochs/iodev/floppy.cc index 970f51aa5..ec91b7df8 100644 --- a/bochs/iodev/floppy.cc +++ b/bochs/iodev/floppy.cc @@ -69,7 +69,6 @@ bx_floppy_ctrl_c::bx_floppy_ctrl_c(void) { put("FDD"); settype(FDLOG); - BX_DEBUG(("Init $Id: floppy.cc,v 1.15 2001-06-27 20:11:10 fries Exp $")); } bx_floppy_ctrl_c::~bx_floppy_ctrl_c(void) @@ -82,6 +81,7 @@ bx_floppy_ctrl_c::~bx_floppy_ctrl_c(void) void bx_floppy_ctrl_c::init(bx_devices_c *d, bx_cmos_c *cmos) { + BX_DEBUG(("Init $Id: floppy.cc,v 1.16 2001-06-27 20:27:49 fries Exp $")); BX_FD_THIS devices = d; BX_FD_THIS devices->register_irq(6, "Floppy Drive"); diff --git a/bochs/iodev/guest2host.cc b/bochs/iodev/guest2host.cc index d79a16210..a21689b07 100644 --- a/bochs/iodev/guest2host.cc +++ b/bochs/iodev/guest2host.cc @@ -37,7 +37,6 @@ bx_g2h_c::bx_g2h_c(void) s.callback[i].f = NULL; s.callback[i].used = 0; } - BX_DEBUG(("Init $Id: guest2host.cc,v 1.7 2001-06-27 20:11:10 fries Exp $")); } bx_g2h_c::~bx_g2h_c(void) @@ -49,6 +48,7 @@ bx_g2h_c::~bx_g2h_c(void) void bx_g2h_c::init(bx_devices_c *d) { + BX_DEBUG(("Init $Id: guest2host.cc,v 1.8 2001-06-27 20:27:49 fries Exp $")); // Reserve a dword port for this interface for (Bit32u addr=BX_G2H_PORT; addr<=(BX_G2H_PORT+3); addr++) { d->register_io_read_handler(&bx_g2h, diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc index 46354a730..a28e1473c 100644 --- a/bochs/iodev/harddrv.cc +++ b/bochs/iodev/harddrv.cc @@ -81,7 +81,6 @@ bx_hard_drive_c::bx_hard_drive_c(void) #endif #endif - BX_DEBUG(("Init $Id: harddrv.cc,v 1.24 2001-06-27 20:11:10 fries Exp $")); } bx_hard_drive_c::~bx_hard_drive_c(void) @@ -96,6 +95,7 @@ bx_hard_drive_c::~bx_hard_drive_c(void) bx_hard_drive_c::init(bx_devices_c *d, bx_cmos_c *cmos) { BX_HD_THIS devices = d; + BX_DEBUG(("Init $Id: harddrv.cc,v 1.25 2001-06-27 20:27:49 fries Exp $")); /* HARD DRIVE 0 */ diff --git a/bochs/iodev/keyboard.cc b/bochs/iodev/keyboard.cc index d7e289a5e..c2350720e 100644 --- a/bochs/iodev/keyboard.cc +++ b/bochs/iodev/keyboard.cc @@ -57,7 +57,7 @@ bx_keyb_c::bx_keyb_c(void) memset( &s, 0, sizeof(s) ); BX_KEY_THIS put("KBD"); BX_KEY_THIS settype(KBDLOG); - BX_DEBUG(("Init $Id: keyboard.cc,v 1.26 2001-06-27 20:11:10 fries Exp $")); + BX_DEBUG(("Init $Id: keyboard.cc,v 1.27 2001-06-27 20:27:49 fries Exp $")); } bx_keyb_c::~bx_keyb_c(void) @@ -92,6 +92,7 @@ bx_keyb_c::resetinternals(Boolean powerup) void bx_keyb_c::init(bx_devices_c *d, bx_cmos_c *cmos) { + BX_DEBUG(("Init $Id: keyboard.cc,v 1.27 2001-06-27 20:27:49 fries Exp $")); Bit32u i; BX_KEY_THIS devices = d; @@ -157,7 +158,6 @@ bx_keyb_c::init(bx_devices_c *d, bx_cmos_c *cmos) // mouse port installed on system board cmos->s.reg[0x14] |= 0x04; - BX_DEBUG(("Init.")); } #define RETURN(x) do { ret = (x); goto read_return; } while (0) diff --git a/bochs/iodev/ne2k.cc b/bochs/iodev/ne2k.cc index 8ebaf8aee..d60699000 100644 --- a/bochs/iodev/ne2k.cc +++ b/bochs/iodev/ne2k.cc @@ -37,7 +37,7 @@ bx_ne2k_c::bx_ne2k_c(void) { put("NE2K"); settype(NE2KLOG); - BX_DEBUG(("Init $Id: ne2k.cc,v 1.17 2001-06-27 20:11:10 fries Exp $")); + BX_DEBUG(("Init $Id: ne2k.cc,v 1.18 2001-06-27 20:27:49 fries Exp $")); // nothing for now } @@ -1160,9 +1160,9 @@ bx_ne2k_c::rx_frame(const void *buf, unsigned io_len) void bx_ne2k_c::init(bx_devices_c *d) { + BX_DEBUG(("Init $Id: ne2k.cc,v 1.18 2001-06-27 20:27:49 fries Exp $")); BX_NE2K_THIS devices = d; - BX_DEBUG(("Init.")); if (bx_options.ne2k.Ovalid->get ()) { // Bring the register state into power-up state diff --git a/bochs/iodev/parallel.cc b/bochs/iodev/parallel.cc index f04741455..b10b6d708 100644 --- a/bochs/iodev/parallel.cc +++ b/bochs/iodev/parallel.cc @@ -39,7 +39,6 @@ bx_parallel_c::bx_parallel_c(void) { put("PAR"); settype(PARLOG); - BX_DEBUG(("Init $Id: parallel.cc,v 1.6 2001-06-27 20:11:10 fries Exp $")); } bx_parallel_c::~bx_parallel_c(void) @@ -50,6 +49,7 @@ bx_parallel_c::~bx_parallel_c(void) void bx_parallel_c::init(bx_devices_c *d) { + BX_DEBUG(("Init $Id: parallel.cc,v 1.7 2001-06-27 20:27:49 fries Exp $")); BX_PAR_THIS devices = d; #if 0 diff --git a/bochs/memory/misc_mem.cc b/bochs/memory/misc_mem.cc index 5f1633021..3a4ad562b 100644 --- a/bochs/memory/misc_mem.cc +++ b/bochs/memory/misc_mem.cc @@ -87,6 +87,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.13 2001-06-27 20:27:49 fries Exp $")); // you can pass 0 if memory has been allocated already through // the constructor, or the desired size of memory if it hasn't @@ -95,7 +96,7 @@ BX_MEM_C::init_memory(int memsize) BX_MEM_THIS vector = new Bit8u[memsize]; BX_MEM_THIS len = memsize; BX_MEM_THIS megabytes = memsize / (1024*1024); - BX_INFO(("Init(%uB == %.2fMB).", memsize, (float)(BX_MEM_THIS megabytes) )); + BX_INFO(("%.2fMB", memsize, (float)(BX_MEM_THIS megabytes) )); } // initialize all memory to 0x00 memset(BX_MEM_THIS vector, 0x00, BX_MEM_THIS len);