[prev in list] [next in list] [prev in thread] [next in thread]
List: bochs-cvs
Subject: [Bochs-cvs] CVS: bochs/iodev iodev.h,1.49,1.50 vga.cc,1.110,1.111 vga.h,1.42,1.43
From: Volker Ruppert <vruppert () users ! sourceforge ! net>
Date: 2004-08-24 10:16:00
Message-ID: E1BzYLQ-0002FI-Cc () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
Update of /cvsroot/bochs/bochs/iodev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8309/iodev
Modified Files:
iodev.h vga.cc vga.h
Log Message:
- unused vga function dump_status() rewritten for the use with the debugger ("info vga")
Index: iodev.h
===================================================================
RCS file: /cvsroot/bochs/bochs/iodev/iodev.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- iodev.h 6 Aug 2004 15:49:54 -0000 1.49
+++ iodev.h 24 Aug 2004 10:15:55 -0000 1.50
@@ -251,6 +251,7 @@
virtual Bit8u get_actl_palette_idx(Bit8u index) {
return 0;
}
+ virtual void dump_status(void) {}
};
class BOCHSAPI bx_pci_stub_c : public bx_devmodel_c {
Index: vga.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/iodev/vga.cc,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- vga.cc 23 Aug 2004 18:47:25 -0000 1.110
+++ vga.cc 24 Aug 2004 10:15:56 -0000 1.111
@@ -1756,7 +1756,6 @@
if ( BX_VGA_THIS s.sequencer.chain_four ) {
unsigned long pixely, pixelx, plane;
- // bx_vga_dump_status();
if (BX_VGA_THIS s.misc_output.select_high_bank != 1)
BX_PANIC(("update: select_high_bank != 1"));
@@ -2588,66 +2587,66 @@
void
bx_vga_c::dump_status(void)
{
- BX_INFO(("s.misc_output.color_emulation = %u",
- (unsigned) BX_VGA_THIS s.misc_output.color_emulation));
- BX_INFO(("s.misc_output.enable_ram = %u",
- (unsigned) BX_VGA_THIS s.misc_output.enable_ram));
- BX_INFO(("s.misc_output.clock_select = %u",
- (unsigned) BX_VGA_THIS s.misc_output.clock_select));
+#if BX_DEBUGGER
+ dbg_printf("s.misc_output.color_emulation = %u\n",
+ (unsigned) BX_VGA_THIS s.misc_output.color_emulation);
+ dbg_printf("s.misc_output.enable_ram = %u\n",
+ (unsigned) BX_VGA_THIS s.misc_output.enable_ram);
+ dbg_printf("s.misc_output.clock_select = %u ",
+ (unsigned) BX_VGA_THIS s.misc_output.clock_select);
if (BX_VGA_THIS s.misc_output.clock_select == 0)
- BX_INFO((" 25Mhz 640 horiz pixel clock"));
+ dbg_printf("(25Mhz 640 horiz pixel clock)\n");
else
- BX_INFO((" 28Mhz 720 horiz pixel clock"));
- BX_INFO(("s.misc_output.select_high_bank = %u",
- (unsigned) BX_VGA_THIS s.misc_output.select_high_bank));
- BX_INFO(("s.misc_output.horiz_sync_pol = %u",
- (unsigned) BX_VGA_THIS s.misc_output.horiz_sync_pol));
- BX_INFO(("s.misc_output.vert_sync_pol = %u",
- (unsigned) BX_VGA_THIS s.misc_output.vert_sync_pol));
+ dbg_printf("(28Mhz 720 horiz pixel clock)\n");
+ dbg_printf("s.misc_output.select_high_bank = %u\n",
+ (unsigned) BX_VGA_THIS s.misc_output.select_high_bank);
+ dbg_printf("s.misc_output.horiz_sync_pol = %u\n",
+ (unsigned) BX_VGA_THIS s.misc_output.horiz_sync_pol);
+ dbg_printf("s.misc_output.vert_sync_pol = %u ",
+ (unsigned) BX_VGA_THIS s.misc_output.vert_sync_pol);
switch ( (BX_VGA_THIS s.misc_output.vert_sync_pol << 1) |
BX_VGA_THIS s.misc_output.horiz_sync_pol ) {
- case 0: BX_INFO((" (reserved")); break;
- case 1: BX_INFO((" 400 lines")); break;
- case 2: BX_INFO((" 350 lines")); break;
- case 3: BX_INFO((" 480 lines")); break;
- default: BX_INFO((" ???"));
+ case 1: dbg_printf("(400 lines)\n"); break;
+ case 2: dbg_printf("(350 lines)\n"); break;
+ case 3: dbg_printf("(480 lines)\n"); break;
+ default: dbg_printf("(reserved)\n");
}
- BX_INFO(("s.graphics_ctrl.odd_even = %u",
- (unsigned) BX_VGA_THIS s.graphics_ctrl.odd_even));
- BX_INFO(("s.graphics_ctrl.chain_odd_even = %u",
- (unsigned) BX_VGA_THIS s.graphics_ctrl.chain_odd_even));
- BX_INFO(("s.graphics_ctrl.shift_reg = %u",
- (unsigned) BX_VGA_THIS s.graphics_ctrl.shift_reg));
- BX_INFO(("s.graphics_ctrl.graphics_alpha = %u",
- (unsigned) BX_VGA_THIS s.graphics_ctrl.graphics_alpha));
- BX_INFO(("s.graphics_ctrl.memory_mapping = %u",
- (unsigned) BX_VGA_THIS s.graphics_ctrl.memory_mapping));
+ dbg_printf("s.graphics_ctrl.odd_even = %u\n",
+ (unsigned) BX_VGA_THIS s.graphics_ctrl.odd_even);
+ dbg_printf("s.graphics_ctrl.chain_odd_even = %u\n",
+ (unsigned) BX_VGA_THIS s.graphics_ctrl.chain_odd_even);
+ dbg_printf("s.graphics_ctrl.shift_reg = %u\n",
+ (unsigned) BX_VGA_THIS s.graphics_ctrl.shift_reg);
+ dbg_printf("s.graphics_ctrl.graphics_alpha = %u\n",
+ (unsigned) BX_VGA_THIS s.graphics_ctrl.graphics_alpha);
+ dbg_printf("s.graphics_ctrl.memory_mapping = %u ",
+ (unsigned) BX_VGA_THIS s.graphics_ctrl.memory_mapping);
switch (BX_VGA_THIS s.graphics_ctrl.memory_mapping) {
- case 0: BX_INFO((" A0000-BFFFF")); break;
- case 1: BX_INFO((" A0000-AFFFF")); break;
- case 2: BX_INFO((" B0000-B7FFF")); break;
- case 3: BX_INFO((" B8000-BFFFF")); break;
- default: BX_INFO((" ???"));
+ case 1: dbg_printf("(A0000-AFFFF)\n"); break;
+ case 2: dbg_printf("(B0000-B7FFF)\n"); break;
+ case 3: dbg_printf("(B8000-BFFFF)\n"); break;
+ default: dbg_printf("(A0000-BFFFF)\n"); break;
}
- BX_INFO(("s.sequencer.extended_mem = %u",
- (unsigned) BX_VGA_THIS s.sequencer.extended_mem));
- BX_INFO(("s.sequencer.odd_even = %u (inverted)",
- (unsigned) BX_VGA_THIS s.sequencer.odd_even));
- BX_INFO(("s.sequencer.chain_four = %u",
- (unsigned) BX_VGA_THIS s.sequencer.chain_four));
+ dbg_printf("s.sequencer.extended_mem = %u\n",
+ (unsigned) BX_VGA_THIS s.sequencer.extended_mem);
+ dbg_printf("s.sequencer.odd_even = %u (inverted)\n",
+ (unsigned) BX_VGA_THIS s.sequencer.odd_even);
+ dbg_printf("s.sequencer.chain_four = %u\n",
+ (unsigned) BX_VGA_THIS s.sequencer.chain_four);
- BX_INFO(("s.attribute_ctrl.video_enabled = %u",
- (unsigned) BX_VGA_THIS s.attribute_ctrl.video_enabled));
- BX_INFO(("s.attribute_ctrl.mode_ctrl.graphics_alpha = %u",
- (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.graphics_alpha));
- BX_INFO(("s.attribute_ctrl.mode_ctrl.display_type = %u",
- (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.display_type));
- BX_INFO(("s.attribute_ctrl.mode_ctrl.internal_palette_size = %u",
- (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.internal_palette_size));
- BX_INFO(("s.attribute_ctrl.mode_ctrl.pixel_clock_select = %u",
- (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.pixel_clock_select));
+ dbg_printf("s.attribute_ctrl.video_enabled = %u\n",
+ (unsigned) BX_VGA_THIS s.attribute_ctrl.video_enabled);
+ dbg_printf("s.attribute_ctrl.mode_ctrl.graphics_alpha = %u\n",
+ (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.graphics_alpha);
+ dbg_printf("s.attribute_ctrl.mode_ctrl.display_type = %u\n",
+ (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.display_type);
+ dbg_printf("s.attribute_ctrl.mode_ctrl.internal_palette_size = %u\n",
+ (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.internal_palette_size);
+ dbg_printf("s.attribute_ctrl.mode_ctrl.pixel_clock_select = %u\n",
+ (unsigned) BX_VGA_THIS s.attribute_ctrl.mode_ctrl.pixel_clock_select);
+#endif
}
Index: vga.h
===================================================================
RCS file: /cvsroot/bochs/bochs/iodev/vga.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- vga.h 16 Aug 2004 08:02:15 -0000 1.42
+++ vga.h 24 Aug 2004 10:15:56 -0000 1.43
@@ -121,6 +121,7 @@
virtual Bit8u mem_read(Bit32u addr);
virtual void mem_write(Bit32u addr, Bit8u value);
virtual void trigger_timer(void *this_ptr);
+ virtual void dump_status(void);
#if BX_SUPPORT_VBE
BX_VGA_SMF Bit8u vbe_mem_read(Bit32u addr) BX_CPP_AttrRegparmN(1);
@@ -309,7 +310,6 @@
protected:
BX_VGA_SMF void update(void);
- BX_VGA_SMF void dump_status(void);
BX_VGA_SMF void determine_screen_dimensions(unsigned *piHeight,
unsigned *piWidth);
};
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic