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

- used grep to search for more instances of new bx_options problems that

Browse Source 
I have introduced, and fixed a lot.
This commit is contained in:
Bryce Denney 2001-06-21 14:56:43 +00:00
parent ee2ae90d79
commit 80a7541fed
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/debug/dbg_main.cc
View File

@ -1922,7 +1922,7 @@ bx_dbg_compare_sim_cpu(void)
void
clear_dirty_bits (void)
{
int num_pages = bx_options.memory.size->get () * 1024 / 4;
int num_pages = bx_options.memory.Osize->get () * 1024 / 4;
for (int i = 0; i < num_pages; i++) {
BX_MEM(0)->dbg_dirty_pages[i] = 0;
BX_MEM(1)->dbg_dirty_pages[i] = 0;
@ -1943,7 +1943,7 @@ bx_dbg_always_check(Bit32u page_start, Boolean on)
bx_dbg_compare_sim_memory(void)
{
Boolean ret = 0;
int num_pages = bx_options.memory.size->get () * 1024 / 4;
int num_pages = bx_options.memory.Osize->get () * 1024 / 4;
for (int i = 0; i < num_pages; i++) {
Boolean sim0_dirty = BX_MEM(0)->dbg_dirty_pages[i];
@ -2480,7 +2480,7 @@ bx_dbg_dump_cpu_command(void)
}
#if BX_PCI_SUPPORT
if (bx_options.i440FXSupport) {
if (bx_options.Oi440FXSupport->get ()) {
bx_devices.pci->print_i440fx_state();
}
#endif

2
bochs/gui/beos.cc
View File

@ -200,7 +200,7 @@ UNUSED(argv);
UNUSED(window_name);
th->setprefix("BGUI");
if (bx_options.private_colormap) {
if (bx_options.Oprivate_colormap->get ()) {
BX_INFO(( "BeOS: private_colormap option not handled yet."));
}

2
bochs/gui/gui.cc
View File

@ -131,7 +131,7 @@ bx_gui_c::floppyA_handler(void)
#ifdef macintosh
// If we are using the Mac floppy driver, eject the disk
// from the floppy drive
if (!strcmp(bx_options.floppya.path, SuperDrive))
if (!strcmp(bx_options.floppya.Opath->get (), SuperDrive))
DiskEject(1);
#endif
replace_bitmap(BX_GUI_THIS floppyA_hbar_id, BX_GUI_THIS floppyA_eject_bmap_id);

8
bochs/gui/macintosh.cc
View File

@ -214,7 +214,7 @@ void CreateTile(void)
CGrafPtr savePort;
OSErr err;
if (bx_options.private_colormap)
if (bx_options.Oprivate_colormap->get ())
{
GetGWorld(&savePort, &saveDevice);
@ -821,7 +821,7 @@ void bx_gui_c::text_update(Bit8u *old_text, Bit8u *new_text,
// RGBForeColor(&fgColor);
// RGBBackColor(&bgColor);
if (bx_options.private_colormap)
if (bx_options.Oprivate_colormap->get ())
{
PmForeColor(new_text[i+1] & 0x0F);
PmBackColor((new_text[i+1] & 0xF0) >> 4);
@ -872,7 +872,7 @@ Boolean bx_gui_c::palette_change(unsigned index, unsigned red, unsigned green, u
GDHandle saveDevice;
CGrafPtr savePort;
if (bx_options.private_colormap)
if (bx_options.Oprivate_colormap->get ())
{
GetGWorld(&savePort, &saveDevice);
@ -888,7 +888,7 @@ Boolean bx_gui_c::palette_change(unsigned index, unsigned red, unsigned green, u
CTabChanged(gCTable);
if (bx_options.private_colormap)
if (bx_options.Oprivate_colormap->get ())
{
SetGWorld(savePort, saveDevice);

2
bochs/gui/nogui.cc
View File

@ -69,7 +69,7 @@ bx_gui_c::specific_init(bx_gui_c *th, int argc, char **argv, unsigned tilewidth,
UNUSED(bochs_icon_bits); // global variable
if (bx_options.private_colormap) {
if (bx_options.Oprivate_colormap->get ()) {
BX_INFO(("private_colormap option ignored."));
}
}

2
bochs/gui/rfb.cc
View File

@ -187,7 +187,7 @@ void bx_gui_c::specific_init(bx_gui_c *th, int argc, char **argv, unsigned tilew
Sleep(1000);
SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL);
#endif
if (bx_options.private_colormap) {
if (bx_options.Oprivate_colormap->get ()) {
BX_ERROR(( "private_colormap option ignored." ));
}
}

2
bochs/gui/term.cc
View File

@ -139,7 +139,7 @@ bx_gui_c::specific_init(bx_gui_c *th, int argc, char **argv, unsigned tilewidth,
nodelay(stdscr, TRUE);
noecho();
if (bx_options.private_colormap)
if (bx_options.Oprivate_colormap->get ())
if(bx_dbg.video)
BX_INFO(("#TERM] WARNING: private_colormap option ignored."));
}

4
bochs/iodev/pci.cc
View File

@ -68,7 +68,7 @@ bx_pci_c::init(bx_devices_c *d)
}
// should this go into ::reset() ???
if (bx_options.i440FXSupport) {
if (bx_options.Oi440FXSupport->get ()) {
for (unsigned i=0; i<256; i++)
BX_PCI_THIS s.i440fx.array[i] = 0x0;
}
@ -394,7 +394,7 @@ bx_pci_c::print_i440fx_state()
Bit8u*
bx_pci_c::i440fx_fetch_ptr(Bit32u addr)
{
if (bx_options.i440FXSupport) {
if (bx_options.Oi440FXSupport->get ()) {
switch (rd_memType (addr)) {
case 0x0: // Read from ShadowRAM
return (&BX_PCI_THIS devices->mem->vector[addr]);

6
bochs/memory/memory.cc
View File

@ -185,7 +185,7 @@ inc_one:
#endif
#else
// Write Based on 440fx Programming
if (bx_options.i440FXSupport &&
if (bx_options.Oi440FXSupport->get () &&
((a20addr >= 0xC0000) && (a20addr <= 0xFFFFF))) {
switch (bx_devices.pci->wr_memType(a20addr & 0xFC000)) {
case 0x0: // Writes to ShadowRAM
@ -381,7 +381,7 @@ inc_one:
}
// a20addr in C0000 .. FFFFF
if (!bx_options.i440FXSupport) {
if (!bx_options.Oi440FXSupport->get ()) {
*data_ptr = vector[a20addr];
goto inc_one;
}
@ -433,7 +433,7 @@ inc_one:
#else // BX_PCI_SUPPORT == 0
if (a20addr < BX_MEM_THIS len) {
if ((a20addr >= 0x000C0000) && (a20addr <= 0x000FFFFF)) {
if (!bx_options.i440FXSupport)
if (!bx_options.Oi440FXSupport->get ())
*data_ptr = vector[a20addr];
else {
switch (bx_devices.pci->rd_memType(a20addr & 0xFC000)) {

6
bochs/memory/misc_mem.cc
View File

@ -151,7 +151,7 @@ BX_MEM_C::load_ROM(const char *path, Bit32u romaddress)
offset = 0;
while (size > 0) {
#if BX_PCI_SUPPORT
if (bx_options.i440FXSupport)
if (bx_options.Oi440FXSupport->get ())
ret = read(fd, (bx_ptr_t) &bx_devices.pci->s.i440fx.shadow[romaddress - 0xC0000 + offset],
size);
else
@ -167,7 +167,7 @@ BX_MEM_C::load_ROM(const char *path, Bit32u romaddress)
}
close(fd);
#if BX_PCI_SUPPORT
if (bx_options.i440FXSupport)
if (bx_options.Oi440FXSupport->get ())
BX_INFO(("rom in i440FX RAM 0x%06x/%u ('%s')",
(unsigned) romaddress,
(unsigned) stat_buf.st_size,
@ -209,7 +209,7 @@ BX_MEM_C::dbg_fetch_mem(Bit32u addr, unsigned len, Bit8u *buf)
#if BX_PCI_SUPPORT == 0
*buf = vector[addr];
#else
if ( bx_options.i440FXSupport &&
if ( bx_options.Oi440FXSupport->get () &&
((addr >= 0x000C0000) && (addr <= 0x000FFFFF)) ) {
switch (bx_devices.pci->rd_memType (addr)) {
case 0x0: // Fetch from ShadowRAM