mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bb9fd8ae22
Bochs/bochs/main.cc

3243 lines
113 KiB
C++
Raw Normal View History

- add rcs header
2001-10-03 16:56:51 +04:00
/////////////////////////////////////////////////////////////////////////
- set the quit context to NULL after it is no longer usable. I don't want anybody jumping back because the pointer was still lying around. - modified: gui/wxmain.cc main.cc
2002-10-06 23:21:05 +04:00
// $Id: main.cc,v 1.158 2002-10-06 19:21:05 bdenney Exp $
- add rcs header
2001-10-03 16:56:51 +04:00
/////////////////////////////////////////////////////////////////////////
//
- missing 'fclose(fd)' added in function parse_bochsrc()
2002-07-16 00:12:14 +04:00
// Copyright (C) 2002 MandrakeSoft S.A.
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
//
// MandrakeSoft S.A.
// 43, rue d'Aboukir
// 75002 Paris - France
// http://www.linux-mandrake.com/
// http://www.mandrakesoft.com/
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "bochs.h"
merge in BRANCH-io-cleanup. To see the commit logs for this use either cvsweb or cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files. In general this provides a generic interface for logging. logfunctions:: is a class that is inherited by some classes, and also . allocated as a standalone global called 'genlog'. All logging uses . one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this . class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros . respectively. . . An example usage: . BX_INFO(("Hello, World!\n")); iofunctions:: is a class that is allocated once by default, and assigned as the iofunction of each logfunctions instance. It is this class that maintains the file descriptor and other output related code, at this point using vfprintf(). At some future point, someone may choose to write a gui 'console' for bochs to which messages would be redirected simply by assigning a different iofunction class to the various logfunctions objects. More cleanup is coming, but this works for now. If you want to see alot of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1. Comments, bugs, flames, to me: todd@fries.net
2001-05-15 18:49:57 +04:00
#include <assert.h>
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#include "state_file.h"
- solve SDL specific build problem: in win32, SDL redefines main to SDL_main. Include SDL.h so that the C language prototype can be found. Otherwise SDL_main() will get its name mangled and not match what the SDL library is expecting.
2002-10-02 03:34:52 +04:00
#if BX_WITH_SDL
// since SDL redefines main() to SDL_main(), we must include SDL.h so that the
// C language prototype is found. Otherwise SDL_main() will get its name
// mangled and not match what the SDL library is expecting.
#include <SDL/SDL.h>
- workaround for SDL compile problem on MacOS X
2002-10-02 23:23:01 +04:00
#if defined(macintosh)
// Work around a bug in SDL 1.2.4 on MacOS X, which redefines getenv to
// SDL_getenv, but then neglects to provide SDL_getenv. It happens
// because we are defining -Dmacintosh.
#undef getenv
#endif
- solve SDL specific build problem: in win32, SDL redefines main to SDL_main. Include SDL.h so that the C language prototype can be found. Otherwise SDL_main() will get its name mangled and not match what the SDL library is expecting.
2002-10-02 03:34:52 +04:00
#endif
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
int enable_config_interface = 1;
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
int bochsrc_include_count = 0;
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
extern "C" {
#include <signal.h>
}
#ifdef __MINGW32__
void alarm(int);
#endif
#if BX_PROVIDE_DEVICE_MODELS==1
// some prototypes from iodev/
// I want to stay away from including iodev/iodev.h here
Bit32u bx_unmapped_io_read_handler(Bit32u address, unsigned io_len);
void bx_unmapped_io_write_handler(Bit32u address, Bit32u value,
unsigned io_len);
void bx_close_harddrive(void);
#endif
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
void bx_init_bx_dbg (void);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
void bx_emulate_hga_dumps_timer(void);
- change name of action "crash" to "fatal" - change Makefile.in to "cvs-snapshot" information rather than printing the release number, since in fact it's not the same as the release anymore - use #defines to give the actions names (ACT_IGNORE, ACT_REPORT, ACT_FATAL) - register all logfunctions as they call setio, and keep a list so that we can change their settings more easily. I admit I used a static-sized array to store them. Sorry. - instead of printing a prefix [GEN ] for generic messages, just leave the prefix blank [ ]. Otherwise you start wondering what does gen stand for. - avoid reentry into fatal, since fatal can call BX_INFO and friends. This avoids a potential infinite recursion. - now that files other than .bochsrc can be the rc file, print the actual name of the file in error messages.
2001-05-23 06:37:52 +04:00
static char *divider = "========================================================================";
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
/* typedefs */
split log stuff into a separate file
2001-06-19 20:25:41 +04:00
#define LOG_THIS genlog->
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#if ( BX_PROVIDE_DEVICE_MODELS==1 )
bx_pc_system_c bx_pc_system;
class state_file state_stuff("state_file.out", "options");
#endif
bx_debug_t bx_dbg;
- init bx_options using a few simple lines of code, instead of a monstrous initializer full of NULLs and zeroes that has to be fixed every time we change the bx_options_t type.
2002-09-03 10:22:53 +04:00
bx_options_t bx_options; // initialized in bx_init_options()
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
static Bit32s parse_line_unformatted(char *context, char *line);
static Bit32s parse_line_formatted(char *context, int num_params, char *params[]);
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
static int parse_bochsrc(char *rcfile);
- declaration of bx_do_text_config_interface() is not necessary for the wx gui - don't load a bochsrc for the wx gui if no -q or -qf option is present
2002-08-29 00:01:34 +04:00
#if !BX_WITH_WX
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
static void bx_do_text_config_interface (int argc, char *argv[]);
- declaration of bx_do_text_config_interface() is not necessary for the wx gui - don't load a bochsrc for the wx gui if no -q or -qf option is present
2002-08-29 00:01:34 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
static Bit32s
bx_param_handler (bx_param_c *param, int set, Bit32s val)
{
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_id id = param->get_id ();
switch (id) {
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
case BXP_VGA_UPDATE_INTERVAL:
// if after init, notify the vga device to change its timer.
if (set && SIM->get_init_done ())
bx_vga.set_update_interval (val);
break;
case BXP_MOUSE_ENABLED:
// if after init, notify the GUI
Minor updates to the mouse code that may help with enable/disable problems. Also fixed a warning in pc_system.h Modified Files: main.cc pc_system.h iodev/keyboard.cc iodev/keyboard.h
2001-09-21 06:46:17 +04:00
if (set && SIM->get_init_done ()) {
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
bx_gui.mouse_enabled_changed (val!=0);
Minor updates to the mouse code that may help with enable/disable problems. Also fixed a warning in pc_system.h Modified Files: main.cc pc_system.h iodev/keyboard.cc iodev/keyboard.h
2001-09-21 06:46:17 +04:00
bx_keyboard.mouse_enabled_changed (val!=0);
}
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
break;
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
case BXP_NE2K_VALID:
if (set) {
int enable = (val != 0);
SIM->get_param (BXP_NE2K_IOADDR)->set_enabled (enable);
SIM->get_param (BXP_NE2K_IRQ)->set_enabled (enable);
- also disable macaddress when the NE2K is disabled
2001-06-21 23:30:14 +04:00
SIM->get_param (BXP_NE2K_MACADDR)->set_enabled (enable);
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
SIM->get_param (BXP_NE2K_ETHMOD)->set_enabled (enable);
SIM->get_param (BXP_NE2K_ETHDEV)->set_enabled (enable);
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
SIM->get_param (BXP_NE2K_SCRIPT)->set_enabled (enable);
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
}
break;
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
case BXP_LOAD32BITOS_WHICH:
if (set) {
int enable = (val != 0);
SIM->get_param (BXP_LOAD32BITOS_PATH)->set_enabled (enable);
SIM->get_param (BXP_LOAD32BITOS_IOLOG)->set_enabled (enable);
SIM->get_param (BXP_LOAD32BITOS_INITRD)->set_enabled (enable);
}
break;
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
case BXP_ATA0_MASTER_STATUS:
case BXP_ATA0_SLAVE_STATUS:
case BXP_ATA1_MASTER_STATUS:
case BXP_ATA1_SLAVE_STATUS:
case BXP_ATA2_MASTER_STATUS:
case BXP_ATA2_SLAVE_STATUS:
case BXP_ATA3_MASTER_STATUS:
case BXP_ATA3_SLAVE_STATUS:
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
if ((set) && (SIM->get_init_done ())) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
Bit8u device = id - BXP_ATA0_MASTER_STATUS;
Bit32u handle = bx_devices.hard_drive->get_device_handle (device/2, device%2);
bx_devices.hard_drive->set_cd_media_status(handle, val == BX_INSERTED);
- renamed update_floppy_status_buttons() to update_drive_status_buttons() since it handles the cdrom status too
2002-03-17 23:57:54 +03:00
bx_gui.update_drive_status_buttons ();
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
}
break;
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
case BXP_FLOPPYA_TYPE:
if ((set) && (!SIM->get_init_done ())) {
bx_options.floppya.Odevtype->set (val);
}
break;
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
case BXP_FLOPPYA_STATUS:
if ((set) && (SIM->get_init_done ())) {
bx_devices.floppy->set_media_status(0, val == BX_INSERTED);
- renamed update_floppy_status_buttons() to update_drive_status_buttons() since it handles the cdrom status too
2002-03-17 23:57:54 +03:00
bx_gui.update_drive_status_buttons ();
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
}
break;
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
case BXP_FLOPPYB_TYPE:
if ((set) && (!SIM->get_init_done ())) {
bx_options.floppyb.Odevtype->set (val);
}
break;
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
case BXP_FLOPPYB_STATUS:
if ((set) && (SIM->get_init_done ())) {
bx_devices.floppy->set_media_status(1, val == BX_INSERTED);
- renamed update_floppy_status_buttons() to update_drive_status_buttons() since it handles the cdrom status too
2002-03-17 23:57:54 +03:00
bx_gui.update_drive_status_buttons ();
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
}
break;
- made keyboard_paste_delay a runtime configurable option - clean up comments & debug msgs in paste code
2002-03-26 17:46:03 +03:00
case BXP_KBD_PASTE_DELAY:
if (set) bx_keyboard.paste_delay_changed ();
break;
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
case BXP_ATA0_MASTER_TYPE:
case BXP_ATA0_SLAVE_TYPE:
case BXP_ATA1_MASTER_TYPE:
case BXP_ATA1_SLAVE_TYPE:
case BXP_ATA2_MASTER_TYPE:
case BXP_ATA2_SLAVE_TYPE:
case BXP_ATA3_MASTER_TYPE:
case BXP_ATA3_SLAVE_TYPE:
if (set) {
int device = id - BXP_ATA0_MASTER_TYPE;
switch (val) {
case BX_ATA_DEVICE_DISK:
SIM->get_param_num ((bx_id)(BXP_ATA0_MASTER_PRESENT + device))->set (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_PATH + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_CYLINDERS + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_HEADS + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_SPT + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_STATUS + device))->set_enabled (0);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_MODEL + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_BIOSDETECT + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_TRANSLATION + device))->set_enabled (1);
break;
case BX_ATA_DEVICE_CDROM:
SIM->get_param_num ((bx_id)(BXP_ATA0_MASTER_PRESENT + device))->set (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_PATH + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_CYLINDERS + device))->set_enabled (0);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_HEADS + device))->set_enabled (0);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_SPT + device))->set_enabled (0);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_STATUS + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_MODEL + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_BIOSDETECT + device))->set_enabled (1);
SIM->get_param ((bx_id)(BXP_ATA0_MASTER_TRANSLATION + device))->set_enabled (0);
break;
}
}
break;
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
default:
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
BX_PANIC (("bx_param_handler called with unknown id %d", id));
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
return -1;
}
return val;
}
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
char *bx_param_string_handler (bx_param_string_c *param, int set, char *val, int maxlen)
{
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_id id = param->get_id ();
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
int empty = 0;
if ((strlen(val) < 1) || !strcmp ("none", val)) {
empty = 1;
val = "none";
}
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
switch (id) {
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
case BXP_FLOPPYA_PATH:
if (set==1) {
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
if (SIM->get_init_done ()) {
if (empty) {
bx_devices.floppy->set_media_status(0, 0);
- renamed update_floppy_status_buttons() to update_drive_status_buttons() since it handles the cdrom status too
2002-03-17 23:57:54 +03:00
bx_gui.update_drive_status_buttons ();
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
} else {
if (!SIM->get_param_num(BXP_FLOPPYA_TYPE)->get_enabled()) {
BX_ERROR(("Cannot add a floppy drive at runtime"));
bx_options.floppya.Opath->set ("none");
}
}
if ((bx_devices.floppy) &&
(SIM->get_param_num(BXP_FLOPPYA_STATUS)->get () == BX_INSERTED)) {
// tell the device model that we removed, then inserted the disk
bx_devices.floppy->set_media_status(0, 0);
bx_devices.floppy->set_media_status(0, 1);
}
} else {
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
SIM->get_param_num(BXP_FLOPPYA_DEVTYPE)->set_enabled (!empty);
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
SIM->get_param_num(BXP_FLOPPYA_TYPE)->set_enabled (!empty);
SIM->get_param_num(BXP_FLOPPYA_STATUS)->set_enabled (!empty);
}
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
}
break;
case BXP_FLOPPYB_PATH:
if (set==1) {
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
if (SIM->get_init_done ()) {
if (empty) {
bx_devices.floppy->set_media_status(1, 0);
- renamed update_floppy_status_buttons() to update_drive_status_buttons() since it handles the cdrom status too
2002-03-17 23:57:54 +03:00
bx_gui.update_drive_status_buttons ();
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
} else {
if (!SIM->get_param_num(BXP_FLOPPYB_TYPE)->get_enabled ()) {
BX_ERROR(("Cannot add a floppy drive at runtime"));
bx_options.floppyb.Opath->set ("none");
}
}
if ((bx_devices.floppy) &&
(SIM->get_param_num(BXP_FLOPPYB_STATUS)->get () == BX_INSERTED)) {
// tell the device model that we removed, then inserted the disk
bx_devices.floppy->set_media_status(1, 0);
bx_devices.floppy->set_media_status(1, 1);
}
} else {
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
SIM->get_param_num(BXP_FLOPPYB_DEVTYPE)->set_enabled (!empty);
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
SIM->get_param_num(BXP_FLOPPYB_TYPE)->set_enabled (!empty);
SIM->get_param_num(BXP_FLOPPYB_STATUS)->set_enabled (!empty);
}
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
}
break;
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
case BXP_ATA0_MASTER_PATH:
case BXP_ATA0_SLAVE_PATH:
case BXP_ATA1_MASTER_PATH:
case BXP_ATA1_SLAVE_PATH:
case BXP_ATA2_MASTER_PATH:
case BXP_ATA2_SLAVE_PATH:
case BXP_ATA3_MASTER_PATH:
case BXP_ATA3_SLAVE_PATH:
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
if (set==1) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
Bit8u device = id - BXP_ATA0_MASTER_PATH;
Bit32u handle = bx_devices.hard_drive->get_device_handle(device/2, device%2);
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
if (SIM->get_init_done ()) {
if (empty) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_devices.hard_drive->set_cd_media_status(handle, 0);
- renamed update_floppy_status_buttons() to update_drive_status_buttons() since it handles the cdrom status too
2002-03-17 23:57:54 +03:00
bx_gui.update_drive_status_buttons ();
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
} else {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
if (!SIM->get_param_num((bx_id)(BXP_ATA0_MASTER_PRESENT + device))->get ()) {
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
BX_ERROR(("Cannot add a cdrom drive at runtime"));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_options.atadevice[device/2][device%2].Opresent->set (0);
}
if (SIM->get_param_num((bx_id)(BXP_ATA0_MASTER_TYPE + device))->get () != BX_ATA_DEVICE_CDROM) {
BX_ERROR(("Device is not a cdrom drive"));
bx_options.atadevice[device/2][device%2].Opresent->set (0);
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
}
}
if ((bx_devices.hard_drive) &&
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
(SIM->get_param_num((bx_id)(BXP_ATA0_MASTER_STATUS + device))->get () == BX_INSERTED) &&
(SIM->get_param_num((bx_id)(BXP_ATA0_MASTER_TYPE + device))->get () == BX_ATA_DEVICE_CDROM)) {
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
// tell the device model that we removed, then inserted the cd
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_devices.hard_drive->set_cd_media_status(handle, 0);
bx_devices.hard_drive->set_cd_media_status(handle, 1);
- cdrom and floppy options in configuration interface partially fixed * don't change the device state to "not present" at runtime if the path is changed to "none" - simply eject the media if inserted * don't change the device state to "present" at runtime if the previous state is "not present" * eject and re-insert the media if the current media state is "inserted" * changing the media state in the config interface works now * TODO: don't do anything if the path is unchanged - bx_write_cdrom_options(): writing media state fixed
2002-03-14 23:14:47 +03:00
}
}
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
}
break;
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
case BXP_SCREENMODE:
if (set==1) {
BX_INFO (("Screen mode changed to %s", val));
}
break;
- tweaks to get rid of compile warnings
2001-09-11 20:56:48 +04:00
default:
BX_PANIC (("bx_string_handler called with unexpected parameter %d", param->get_id()));
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
}
return val;
}
- now megs, ips, mouse_enabled, vga_update_interval, and rom_path are using Bryce's experimental parameter structures.
2001-06-16 23:29:59 +04:00
void bx_init_options ()
- clean up extra ^M's I introduced when playing in win32 land. They are mostly harmless EXCEPT if they appear after a '\' that's used for line continuation. Then they are a disaster.
2002-09-03 23:04:17 +04:00
{
- can't use "for (int i=0; ...)" twice because some compilers (e.g. MSVC++) think i is still defined the second time. - MSVC++: can't use a variable to define another variable's array bounds. Now I use a #define for the array bounds instead.
2002-09-03 19:59:52 +04:00
int i;
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_list_c *menu;
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
bx_list_c *deplist;
char name[1024], descr[1024];
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
- init bx_options using a few simple lines of code, instead of a monstrous initializer full of NULLs and zeroes that has to be fixed every time we change the bx_options_t type.
2002-09-03 10:22:53 +04:00
memset (&bx_options, 0, sizeof(bx_options));
- Volker introduced the -q command line switch in August 2002, which tells Bochs to immediately read the bochsrc and start simulating immediately (as opposed to going into the configuration interface first). Now -q does the right thing in the wxWindows interface. It behaves as if you selected Read Configuration and then Simulate:Start. - modified: main.cc gui/siminterface.cc gui/siminterface.h gui/wxmain.cc
2002-09-05 11:01:30 +04:00
// quick start option, set by command line arg
new bx_param_bool_c (BXP_QUICK_START,
"Quick start",
"Quick start option: if true, read the bochsrc and start simulation immediately",
0);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
// floppya
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.floppya.Opath = new bx_param_filename_c (BXP_FLOPPYA_PATH,
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
"Floppy A image",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Pathname of first floppy image file or device. If you're booting from floppy, this should be a bootable floppy.",
"", BX_PATHNAME_LEN);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
#if BX_WITH_WX
bx_options.floppya.Opath->set_ask_format ("Filename of first floppy image");
#else
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppya.Opath->set_ask_format ("Enter new filename, or 'none' for no disk: [%s] ");
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
#endif
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Odevtype = new bx_param_enum_c (BXP_FLOPPYA_DEVTYPE,
"floppya:devtype",
"Type of floppy drive",
floppy_type_names,
BX_FLOPPY_NONE,
BX_FLOPPY_NONE);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppya.Otype = new bx_param_enum_c (BXP_FLOPPYA_TYPE,
"floppya:type",
"Type of floppy disk",
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
floppy_type_names,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_FLOPPY_NONE,
BX_FLOPPY_NONE);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppya.Otype->set_ask_format ("What type of floppy disk? [%s] ");
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Ostatus = new bx_param_enum_c (BXP_FLOPPYA_STATUS,
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
"Is floppya inserted",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Inserted or ejected",
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
floppy_status_names,
BX_INSERTED,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_EJECTED);
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Ostatus->set_ask_format ("Is the floppy inserted or ejected? [%s] ");
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppya.Opath->set_format ("%s");
bx_options.floppya.Otype->set_format (", size=%s, ");
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Ostatus->set_format ("%s");
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_param_c *floppya_init_list[] = {
- add comment that warns that gui/wxmain.cc depends on the order of floppy parameters in the bx_list_c.
2002-08-28 11:45:30 +04:00
// if the order "path,type,status" changes, corresponding changes must
// be made in gui/wxmain.cc, MyFrame::editFloppyConfig.
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppya.Opath,
bx_options.floppya.Otype,
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Ostatus,
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
NULL
};
menu = new bx_list_c (BXP_FLOPPYA, "Floppy Disk 0", "All options for first floppy disk", floppya_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SERIES_ASK);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppya.Opath->set_handler (bx_param_string_handler);
bx_options.floppya.Opath->set ("none");
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Otype->set_handler (bx_param_handler);
bx_options.floppya.Ostatus->set_handler (bx_param_handler);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.floppyb.Opath = new bx_param_filename_c (BXP_FLOPPYB_PATH,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"floppyb:path",
"Pathname of second floppy image file or device.",
"", BX_PATHNAME_LEN);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
#if BX_WITH_WX
bx_options.floppyb.Opath->set_ask_format ("Filename of second floppy image");
#else
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppyb.Opath->set_ask_format ("Enter new filename, or 'none' for no disk: [%s] ");
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
#endif
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Odevtype = new bx_param_enum_c (BXP_FLOPPYB_DEVTYPE,
"floppyb:devtype",
"Type of floppy drive",
floppy_type_names,
BX_FLOPPY_NONE,
BX_FLOPPY_NONE);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppyb.Otype = new bx_param_enum_c (BXP_FLOPPYB_TYPE,
"floppyb:type",
"Type of floppy disk",
floppy_type_names,
BX_FLOPPY_NONE,
BX_FLOPPY_NONE);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppyb.Otype->set_ask_format ("What type of floppy disk? [%s] ");
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Ostatus = new bx_param_enum_c (BXP_FLOPPYB_STATUS,
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
"Is floppyb inserted",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Inserted or ejected",
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
floppy_status_names,
BX_INSERTED,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_EJECTED);
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Ostatus->set_ask_format ("Is the floppy inserted or ejected? [%s] ");
bx_options.floppyb.Ostatus->set_format ("%s");
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppyb.Opath->set_format ("%s");
bx_options.floppyb.Otype->set_format (", size=%s, ");
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Ostatus->set_format ("%s");
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_param_c *floppyb_init_list[] = {
bx_options.floppyb.Opath,
bx_options.floppyb.Otype,
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Ostatus,
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
NULL
};
menu = new bx_list_c (BXP_FLOPPYB, "Floppy Disk 1", "All options for second floppy disk", floppyb_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SERIES_ASK);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.floppyb.Opath->set_handler (bx_param_string_handler);
bx_options.floppyb.Opath->set ("none");
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Otype->set_handler (bx_param_handler);
bx_options.floppyb.Ostatus->set_handler (bx_param_handler);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
// disk options
// FIXME use descr and name
char *s_atachannel[] = {
"ATA channel 0",
"ATA channel 1",
"ATA channel 2",
"ATA channel 3",
};
char *s_atadevice[4][2] = {
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
{ "First HD/CD on channel 0",
"Second HD/CD on channel 0" },
{ "First HD/CD on channel 1",
"Second HD/CD on channel 1" },
{ "First HD/CD on channel 2",
"Second HD/CD on channel 2" },
{ "First HD/CD on channel 3",
"Second HD/CD on channel 3" }
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
};
Bit16u ata_default_ioaddr1[BX_MAX_ATA_CHANNEL] = {
0x1f0, 0x170, 0x1e8, 0x168
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
};
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
Bit8u ata_default_irq[BX_MAX_ATA_CHANNEL] = {
- changed irq for ata2 and ata3, as ps2 mouse needs irq12
2002-09-25 02:49:52 +04:00
14, 15, 11, 9
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
};
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_list_c *ata[BX_MAX_ATA_CHANNEL];
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
bx_list_c *ata_menu[BX_MAX_ATA_CHANNEL];
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
- VC++ doesn't like declaring a var inside a for loop, and then later declaring another. I guess it doesn't think the var went out of scope at end of first loop. Oh well, it's easy to fix.
2002-09-25 12:04:07 +04:00
Bit8u channel;
for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel ++) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
ata[channel] = new bx_list_c ((bx_id)(BXP_ATA0+channel), s_atachannel[channel], s_atachannel[channel], 8);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
ata[channel]->get_options ()->set (bx_list_c::SERIES_ASK);
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
ata[channel]->add (bx_options.ata[channel].Opresent = new bx_param_bool_c ((bx_id)(BXP_ATA0_PRESENT+channel),
"ata:present",
"Controls whether ata channel is installed or not",
0));
ata[channel]->add (bx_options.ata[channel].Oioaddr1 = new bx_param_num_c ((bx_id)(BXP_ATA0_IOADDR1+channel),
"ata:ioaddr1",
"IO adress of ata command block",
0, 0xffff,
ata_default_ioaddr1[channel]));
ata[channel]->add (bx_options.ata[channel].Oioaddr2 = new bx_param_num_c ((bx_id)(BXP_ATA0_IOADDR2+channel),
"ata:ioaddr2",
"IO adress of ata control block",
0, 0xffff,
ata_default_ioaddr1[channel] + 0x200));
ata[channel]->add (bx_options.ata[channel].Oirq = new bx_param_num_c ((bx_id)(BXP_ATA0_IRQ+channel),
"ata:irq",
"IRQ of ata ",
0, 15,
ata_default_irq[channel]));
// all items in the ata[channel] menu depend on the present flag.
// The menu list is complete, but a few dependent_list items will
// be added later. Use clone() to make a copy of the dependent_list
// so that it can be changed without affecting the menu.
bx_options.ata[channel].Opresent->set_dependent_list (
ata[channel]->clone());
for (Bit8u slave=0; slave<2; slave++) {
menu = bx_options.atadevice[channel][slave].Omenu = new bx_list_c ((bx_id)(BXP_ATA0_MASTER+channel*2+slave),
s_atadevice[channel][slave],
s_atadevice[channel][slave],
12 /* list max size */);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SERIES_ASK);
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
menu->add (bx_options.atadevice[channel][slave].Opresent = new bx_param_bool_c ((bx_id)(BXP_ATA0_MASTER_PRESENT+channel*2+slave),
"ata-device:present",
"Controls whether ata device is installed or not",
0));
menu->add (bx_options.atadevice[channel][slave].Otype = new bx_param_enum_c ((bx_id)(BXP_ATA0_MASTER_TYPE+channel*2+slave),
"ata-device:type",
"Type of ATA device",
atadevice_type_names,
BX_ATA_DEVICE_DISK,
BX_ATA_DEVICE_DISK));
menu->add (bx_options.atadevice[channel][slave].Opath = new bx_param_filename_c ((bx_id)(BXP_ATA0_MASTER_PATH+channel*2+slave),
"ata-device:path",
"Pathname of the image",
"", BX_PATHNAME_LEN));
menu->add (bx_options.atadevice[channel][slave].Ocylinders = new bx_param_num_c ((bx_id)(BXP_ATA0_MASTER_CYLINDERS+channel*2+slave),
"ata-device:cylinders",
"Number of cylinders",
0, 65535,
0));
menu->add (bx_options.atadevice[channel][slave].Oheads = new bx_param_num_c ((bx_id)(BXP_ATA0_MASTER_HEADS+channel*2+slave),
"ata-device:heads",
"Number of heads",
0, 65535,
0));
menu->add (bx_options.atadevice[channel][slave].Ospt = new bx_param_num_c ((bx_id)(BXP_ATA0_MASTER_SPT+channel*2+slave),
"ata-device:spt",
"Number of sectors per track",
0, 65535,
0));
menu->add (bx_options.atadevice[channel][slave].Ostatus = new bx_param_enum_c ((bx_id)(BXP_ATA0_MASTER_STATUS+channel*2+slave),
"ata-device:status",
"Inserted or ejected",
atadevice_status_names,
BX_INSERTED,
BX_EJECTED));
menu->add (bx_options.atadevice[channel][slave].Omodel = new bx_param_string_c ((bx_id)(BXP_ATA0_MASTER_MODEL+channel*2+slave),
"ata-device:model",
"Model name",
"Generic 1234", 40));
menu->add (bx_options.atadevice[channel][slave].Obiosdetect = new bx_param_enum_c ((bx_id)(BXP_ATA0_MASTER_BIOSDETECT+channel*2+slave),
"ata-device:biosdetect",
"Type of bios detection",
atadevice_biosdetect_names,
BX_ATA_BIOSDETECT_AUTO,
BX_ATA_BIOSDETECT_NONE));
menu->add (bx_options.atadevice[channel][slave].Otranslation = new bx_param_enum_c ((bx_id)(BXP_ATA0_MASTER_TRANSLATION+channel*2+slave),
"How the ata-disk translation is done by the bios",
"Type of translation",
atadevice_translation_names,
BX_ATA_TRANSLATION_LBA,
BX_ATA_TRANSLATION_NONE));
bx_options.atadevice[channel][slave].Opresent->set_dependent_list (
menu->clone ());
// the menu and all items on it depend on the Opresent flag
bx_options.atadevice[channel][slave].Opresent->get_dependent_list()->add(menu);
// the present flag depends on the ATA channel's present flag
bx_options.ata[channel].Opresent->get_dependent_list()->add (
bx_options.atadevice[channel][slave].Opresent);
}
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
// set up top level menu for ATA[i] controller configuration. This list
// controls what will appear on the ATA configure dialog. It now
// requests the USE_TAB_WINDOW display, which is implemented in wx.
char buffer[32];
sprintf (buffer, "Configure ATA%d", channel);
ata_menu[channel] = new bx_list_c ((bx_id)(BXP_ATA0_MENU+channel), strdup(buffer), "", 4);
ata_menu[channel]->add (ata[channel]);
ata_menu[channel]->add (bx_options.atadevice[channel][0].Omenu);
ata_menu[channel]->add (bx_options.atadevice[channel][1].Omenu);
ata_menu[channel]->get_options()->set (bx_list_c::USE_TAB_WINDOW);
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
// Enable first ata interface by default, disable the others.
bx_options.ata[0].Opresent->set_initial_val(1);
// now that the dependence relationships are established, call set() on
// the ata device present params to set all enables correctly.
for (i=0; i<BX_MAX_ATA_CHANNEL; i++)
bx_options.ata[i].Opresent->set (i==0);
- VC++ doesn't like declaring a var inside a for loop, and then later declaring another. I guess it doesn't think the var went out of scope at end of first loop. Oh well, it's easy to fix.
2002-09-25 12:04:07 +04:00
for (channel=0; channel<BX_MAX_ATA_CHANNEL; channel ++) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_options.ata[channel].Opresent->set_ask_format (
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
BX_WITH_WX? "Enable this channel?"
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
: "Channel is enabled: [%s] ");
bx_options.ata[channel].Oioaddr1->set_ask_format (
BX_WITH_WX? "I/O Address 1:"
: "Enter new ioaddr1: [0x%x] ");
bx_options.ata[channel].Oioaddr2->set_ask_format (
BX_WITH_WX? "I/O Address 2:"
: "Enter new ioaddr2: [0x%x] ");
bx_options.ata[channel].Oirq->set_ask_format (
BX_WITH_WX? "IRQ:"
: "Enter new IRQ: [%d] ");
#if !BX_WITH_WX
bx_options.ata[channel].Opresent->set_format ("enabled: %s");
bx_options.ata[channel].Oioaddr1->set_format (", ioaddr1: 0x%x");
bx_options.ata[channel].Oioaddr2->set_format (", ioaddr2: 0x%x");
bx_options.ata[channel].Oirq->set_format (", irq: %d");
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
#endif
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_options.ata[channel].Oioaddr1->set_base (16);
bx_options.ata[channel].Oioaddr2->set_base (16);
for (Bit8u slave=0; slave<2; slave++) {
bx_options.atadevice[channel][slave].Opresent->set_ask_format (
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
BX_WITH_WX? "Enable this device?"
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
: "Device is enabled: [%s] ");
bx_options.atadevice[channel][slave].Otype->set_ask_format (
BX_WITH_WX? "Type of ATA device:"
: "Enter type of ATA device, disk or cdrom: [%s] ");
bx_options.atadevice[channel][slave].Opath->set_ask_format (
BX_WITH_WX? "Path or physical device name:"
: "Enter new filename: [%s] ");
bx_options.atadevice[channel][slave].Ocylinders->set_ask_format (
BX_WITH_WX? "Cylinders:"
: "Enter number of cylinders: [%d] ");
bx_options.atadevice[channel][slave].Oheads->set_ask_format (
BX_WITH_WX? "Heads:"
: "Enter number of heads: [%d] ");
bx_options.atadevice[channel][slave].Ospt->set_ask_format (
BX_WITH_WX? "Sectors per track:"
: "Enter number of sectors per track: [%d] ");
bx_options.atadevice[channel][slave].Ostatus->set_ask_format (
BX_WITH_WX? "Inserted?"
: "Is the device inserted or ejected? [%s] ");
bx_options.atadevice[channel][slave].Omodel->set_ask_format (
BX_WITH_WX? "Model name:"
: "Enter new model name: [%s]");
bx_options.atadevice[channel][slave].Otranslation->set_ask_format (
BX_WITH_WX? "Translation type:"
: "Enter translation type: [%s]");
bx_options.atadevice[channel][slave].Obiosdetect->set_ask_format (
BX_WITH_WX? "BIOS Detection:"
: "Enter bios detection type: [%s]");
#if !BX_WITH_WX
bx_options.atadevice[channel][slave].Opresent->set_format ("enabled: %s");
bx_options.atadevice[channel][slave].Otype->set_format (", %s");
bx_options.atadevice[channel][slave].Opath->set_format (" on '%s'");
bx_options.atadevice[channel][slave].Ocylinders->set_format (", %d cylinders");
bx_options.atadevice[channel][slave].Oheads->set_format (", %d heads");
bx_options.atadevice[channel][slave].Ospt->set_format (", %d sectors/track");
bx_options.atadevice[channel][slave].Ostatus->set_format (", %s");
bx_options.atadevice[channel][slave].Omodel->set_format (", model '%s'");
bx_options.atadevice[channel][slave].Otranslation->set_format (", translation '%s'");
bx_options.atadevice[channel][slave].Obiosdetect->set_format (", biosdetect '%s'");
#endif
bx_options.atadevice[channel][slave].Otype->set_handler (bx_param_handler);
bx_options.atadevice[channel][slave].Ostatus->set_handler (bx_param_handler);
bx_options.atadevice[channel][slave].Opath->set_handler (bx_param_string_handler);
}
}
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.OnewHardDriveSupport = new bx_param_bool_c (BXP_NEWHARDDRIVESUPPORT,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"New hard drive support",
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
"Enables new features found on newer hard drives.",
1);
bx_options.Obootdrive = new bx_param_enum_c (BXP_BOOTDRIVE,
"bootdrive",
. changes to enable El-Torito boot. It is disabled by default in rombios.c
2002-01-30 13:30:52 +03:00
"Boot A, C or CD",
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
floppy_bootdisk_names,
BX_BOOT_FLOPPYA,
BX_BOOT_FLOPPYA);
bx_options.Obootdrive->set_format ("Boot from: %s drive");
. changes to enable El-Torito boot. It is disabled by default in rombios.c
2002-01-30 13:30:52 +03:00
bx_options.Obootdrive->set_ask_format ("Boot from floppy drive, hard drive or cdrom ? [%s] ");
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
bx_options.OfloppySigCheck = new bx_param_bool_c (BXP_FLOPPYSIGCHECK,
- floppy boot signature stuff fixed * added "skip" to the label of the configuration option * write the option "disabled" into the config file, not "enabled"
2002-05-25 17:16:55 +04:00
"Skip Floppy Boot Signature Check",
"Skips check for the 0xaa55 signature on floppy boot device.",
- changed the floppy_bootsig_check syntax to be more logical. the syntax is now : floppy_bootsig_check: disabled=[0|1]. It is not disabled by default. Sorry for any inconvenience it could cause - changed the default (if cmos reg is 0) behavior for the floppy boot signature check, so the new bios is compatible with older bochs binaries (useful if we want to use the new bios when we release 1.4.1) : 1 : disabled 0 : enabled - added info at launch time about the boot device and the floppy boot signature check - added a "LBA capable" flag in the ata controller
2002-05-04 20:00:40 +04:00
0);
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
// disk menu
bx_param_c *disk_menu_init_list[] = {
SIM->get_param (BXP_FLOPPYA),
SIM->get_param (BXP_FLOPPYB),
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
//SIM->get_param (BXP_DISKC),
//SIM->get_param (BXP_DISKD),
//SIM->get_param (BXP_CDROMD),
SIM->get_param (BXP_ATA0),
SIM->get_param (BXP_ATA0_MASTER),
SIM->get_param (BXP_ATA0_SLAVE),
#if BX_MAX_ATA_CHANNEL>1
SIM->get_param (BXP_ATA1),
SIM->get_param (BXP_ATA1_MASTER),
SIM->get_param (BXP_ATA1_SLAVE),
#endif
#if BX_MAX_ATA_CHANNEL>2
SIM->get_param (BXP_ATA2),
SIM->get_param (BXP_ATA2_MASTER),
SIM->get_param (BXP_ATA2_SLAVE),
#endif
#if BX_MAX_ATA_CHANNEL>3
SIM->get_param (BXP_ATA3),
SIM->get_param (BXP_ATA3_MASTER),
SIM->get_param (BXP_ATA3_SLAVE),
#endif
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
SIM->get_param (BXP_NEWHARDDRIVESUPPORT),
SIM->get_param (BXP_BOOTDRIVE),
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
SIM->get_param (BXP_FLOPPYSIGCHECK),
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
NULL
};
menu = new bx_list_c (BXP_MENU_DISK, "Bochs Disk Options", "diskmenu", disk_menu_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
- now the "memory options" menu is entirely defined using parameter data structures, see bx_init_options in main.cc. The implementation of this menu and all its choices is 17 lines long, see do_mem_options_menu in gui/control.cc.
2001-06-18 18:11:55 +04:00
// memory options menu
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.memory.Osize = new bx_param_num_c (BXP_MEM_SIZE,
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
"megs",
"Amount of RAM in megabytes",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
1, BX_MAX_INT,
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
BX_DEFAULT_MEM_MEGS);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.memory.Osize->set_format ("Memory size in megabytes: %d");
bx_options.memory.Osize->set_ask_format ("Enter memory size (MB): [%d] ");
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
// initialize serial and parallel port options
- clean up extra ^M's I introduced when playing in win32 land. They are mostly harmless EXCEPT if they appear after a '\' that's used for line continuation. Then they are a disaster.
2002-09-03 23:04:17 +04:00
#define PAR_SER_INIT_LIST_MAX \
- can't use "for (int i=0; ...)" twice because some compilers (e.g. MSVC++) think i is still defined the second time. - MSVC++: can't use a variable to define another variable's array bounds. Now I use a #define for the array bounds instead.
2002-09-03 19:59:52 +04:00
((BXP_PARAMS_PER_PARALLEL_PORT * BX_N_PARALLEL_PORTS) \
+ (BXP_PARAMS_PER_SERIAL_PORT * BX_N_SERIAL_PORTS))
bx_param_c *par_ser_init_list[1+PAR_SER_INIT_LIST_MAX];
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
bx_param_c **par_ser_ptr = &par_ser_init_list[0];
// parallel ports
- can't use "for (int i=0; ...)" twice because some compilers (e.g. MSVC++) think i is still defined the second time. - MSVC++: can't use a variable to define another variable's array bounds. Now I use a #define for the array bounds instead.
2002-09-03 19:59:52 +04:00
for (i=0; i<BX_N_PARALLEL_PORTS; i++) {
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
sprintf (name, "Enable parallel port #%d", i+1);
bx_options.par[i].Oenabled = new bx_param_bool_c (
BXP_PARPORTx_ENABLED(i+1),
strdup(name),
"",
(i==0)? 1 : 0); // only enable #1 by default
sprintf (name, "Parallel port #%d output file", i+1);
sprintf (descr, "Data written to parport#%d by the guest OS is written to this file", i+1);
bx_options.par[i].Ooutfile = new bx_param_filename_c (
BXP_PARPORTx_OUTFILE(i+1),
strdup(name),
strdup(descr),
"", BX_PATHNAME_LEN);
deplist = new bx_list_c (BXP_NULL, 1);
deplist->add (bx_options.par[i].Ooutfile);
bx_options.par[i].Oenabled->set_dependent_list (deplist);
// add to menu
*par_ser_ptr++ = bx_options.par[i].Oenabled;
*par_ser_ptr++ = bx_options.par[i].Ooutfile;
}
// serial ports
- can't use "for (int i=0; ...)" twice because some compilers (e.g. MSVC++) think i is still defined the second time. - MSVC++: can't use a variable to define another variable's array bounds. Now I use a #define for the array bounds instead.
2002-09-03 19:59:52 +04:00
for (i=0; i<BX_N_SERIAL_PORTS; i++) {
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
// options for COM port
sprintf (name, "Enable serial port #%d (COM%d)", i+1, i+1);
sprintf (descr, "Controls whether COM%d is installed or not", i+1);
bx_options.com[i].Oenabled = new bx_param_bool_c (
BXP_COMx_ENABLED(i+1),
strdup(name),
strdup(descr),
(i==0)?1 : 0); // only enable the first by default
sprintf (name, "Pathname of the serial device for COM%d", i+1);
bx_options.com[i].Odev = new bx_param_filename_c (
BXP_COMx_PATH(i+1),
strdup(name),
"",
"", BX_PATHNAME_LEN);
deplist = new bx_list_c (BXP_NULL, 1);
deplist->add (bx_options.com[i].Odev);
bx_options.com[i].Oenabled->set_dependent_list (deplist);
// add to menu
*par_ser_ptr++ = bx_options.com[i].Oenabled;
*par_ser_ptr++ = bx_options.com[i].Odev;
}
// add final NULL at the end, and build the menu
*par_ser_ptr = NULL;
menu = new bx_list_c (BXP_MENU_SERIAL_PARALLEL,
"Serial and Parallel Port Options",
"serial_parallel_menu",
par_ser_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.rom.Opath = new bx_param_filename_c (BXP_ROM_PATH,
- now the "memory options" menu is entirely defined using parameter data structures, see bx_init_options in main.cc. The implementation of this menu and all its choices is 17 lines long, see do_mem_options_menu in gui/control.cc.
2001-06-18 18:11:55 +04:00
"romimage",
"Pathname of ROM image to load",
"", BX_PATHNAME_LEN);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.rom.Opath->set_format ("Name of ROM BIOS image: %s");
bx_options.rom.Oaddress = new bx_param_num_c (BXP_ROM_ADDRESS,
- now the "memory options" menu is entirely defined using parameter data structures, see bx_init_options in main.cc. The implementation of this menu and all its choices is 17 lines long, see do_mem_options_menu in gui/control.cc.
2001-06-18 18:11:55 +04:00
"romaddr",
"The address at which the ROM image should be loaded",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
0, BX_MAX_INT,
- set the default address for ROM BIOS to 0xF0000 (it was 0 before)
2002-09-03 09:34:32 +04:00
0xf0000);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.rom.Oaddress->set_format ("ROM BIOS address: 0x%05x");
bx_options.rom.Oaddress->set_base (16);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Opath = new bx_param_filename_c (BXP_OPTROM1_PATH,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romimage #1",
"Pathname of optional ROM image #1 to load",
"", BX_PATHNAME_LEN);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Opath->set_format ("Name of optional ROM image #1 : %s");
bx_options.optrom[0].Oaddress = new bx_param_num_c (BXP_OPTROM1_ADDRESS,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romaddr #1",
"The address at which the optional ROM image #1 should be loaded",
0, BX_MAX_INT,
0);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Oaddress->set_format ("optional ROM #1 address: 0x%05x");
bx_options.optrom[0].Oaddress->set_base (16);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[1].Opath = new bx_param_filename_c (BXP_OPTROM2_PATH,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romimage #2",
"Pathname of optional ROM image #2 to load",
"", BX_PATHNAME_LEN);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[1].Opath->set_format ("Name of optional ROM image #2 : %s");
bx_options.optrom[1].Oaddress = new bx_param_num_c (BXP_OPTROM2_ADDRESS,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romaddr #2",
"The address at which the optional ROM image #2 should be loaded",
0, BX_MAX_INT,
0);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[1].Oaddress->set_format ("optional ROM #2 address: 0x%05x");
bx_options.optrom[1].Oaddress->set_base (16);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[2].Opath = new bx_param_filename_c (BXP_OPTROM3_PATH,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romimage #3",
"Pathname of optional ROM image #3 to load",
"", BX_PATHNAME_LEN);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[2].Opath->set_format ("Name of optional ROM image #3 : %s");
bx_options.optrom[2].Oaddress = new bx_param_num_c (BXP_OPTROM3_ADDRESS,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romaddr #3",
"The address at which the optional ROM image #3 should be loaded",
0, BX_MAX_INT,
0);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[2].Oaddress->set_format ("optional ROM #3 address: 0x%05x");
bx_options.optrom[2].Oaddress->set_base (16);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[3].Opath = new bx_param_filename_c (BXP_OPTROM4_PATH,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romimage #4",
"Pathname of optional ROM image #4 to load",
"", BX_PATHNAME_LEN);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[3].Opath->set_format ("Name of optional ROM image #4 : %s");
bx_options.optrom[3].Oaddress = new bx_param_num_c (BXP_OPTROM4_ADDRESS,
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
"optional romaddr #4",
"The address at which the optional ROM image #4 should be loaded",
0, BX_MAX_INT,
0);
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[3].Oaddress->set_format ("optional ROM #4 address: 0x%05x");
bx_options.optrom[3].Oaddress->set_base (16);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.vgarom.Opath = new bx_param_filename_c (BXP_VGA_ROM_PATH,
- now the "memory options" menu is entirely defined using parameter data structures, see bx_init_options in main.cc. The implementation of this menu and all its choices is 17 lines long, see do_mem_options_menu in gui/control.cc.
2001-06-18 18:11:55 +04:00
"vgaromimage",
"Pathname of VGA ROM image to load",
"", BX_PATHNAME_LEN);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.vgarom.Opath->set_format ("Name of VGA BIOS image: %s");
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_param_c *memory_init_list[] = {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.memory.Osize,
bx_options.vgarom.Opath,
bx_options.rom.Opath,
bx_options.rom.Oaddress,
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Opath,
bx_options.optrom[0].Oaddress,
bx_options.optrom[1].Opath,
bx_options.optrom[1].Oaddress,
bx_options.optrom[2].Opath,
bx_options.optrom[2].Oaddress,
bx_options.optrom[3].Opath,
bx_options.optrom[3].Oaddress,
- now the "memory options" menu is entirely defined using parameter data structures, see bx_init_options in main.cc. The implementation of this menu and all its choices is 17 lines long, see do_mem_options_menu in gui/control.cc.
2001-06-18 18:11:55 +04:00
NULL
};
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
menu = new bx_list_c (BXP_MENU_MEMORY, "Bochs Memory Options", "memmenu", memory_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- now the "memory options" menu is entirely defined using parameter data structures, see bx_init_options in main.cc. The implementation of this menu and all its choices is 17 lines long, see do_mem_options_menu in gui/control.cc.
2001-06-18 18:11:55 +04:00
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
// interface
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Ovga_update_interval = new bx_param_num_c (BXP_VGA_UPDATE_INTERVAL,
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
"VGA Update Interval",
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
"Number of microseconds between VGA updates",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
1, BX_MAX_INT,
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
30000);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Ovga_update_interval->set_handler (bx_param_handler);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_options.Ovga_update_interval->set_ask_format ("Type a new value for VGA update interval: [%d] ");
bx_options.Omouse_enabled = new bx_param_bool_c (BXP_MOUSE_ENABLED,
"Enable the mouse",
"Controls whether the mouse sends events to bochs",
0);
bx_options.Omouse_enabled->set_handler (bx_param_handler);
bx_options.Oips = new bx_param_num_c (BXP_IPS,
"Emulated instructions per second (IPS)",
"Emulated instructions per second, used to calibrate bochs emulated\ntime with wall clock time.",
1, BX_MAX_INT,
500000);
bx_options.Oprivate_colormap = new bx_param_bool_c (BXP_PRIVATE_COLORMAP,
"Use a private colormap",
"Request that the GUI create and use it's own non-shared colormap. This colormap will be used when in the bochs window. If not enabled, a shared colormap scheme may be used. Not implemented on all GUI's.",
0);
ok, now the amiga target on cvs is complete
2001-08-16 16:35:52 +04:00
#if BX_WITH_AMIGAOS
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
bx_options.Ofullscreen = new bx_param_bool_c (BXP_FULLSCREEN,
"Use full screen mode",
"When enabled, bochs occupies the whole screen instead of just a window.",
0);
bx_options.Oscreenmode = new bx_param_string_c (BXP_SCREENMODE,
"Screen mode name",
"Screen mode name",
"", BX_PATHNAME_LEN);
bx_options.Oscreenmode->set_handler (bx_param_string_handler);
#endif
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
bx_param_c *interface_init_list[] = {
bx_options.Ovga_update_interval,
bx_options.Omouse_enabled,
bx_options.Oips,
bx_options.Oprivate_colormap,
ok, now the amiga target on cvs is complete
2001-08-16 16:35:52 +04:00
#if BX_WITH_AMIGAOS
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
bx_options.Ofullscreen,
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
bx_options.Oscreenmode,
#endif
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
NULL
};
menu = new bx_list_c (BXP_MENU_INTERFACE, "Bochs Interface Menu", "intfmenu", interface_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
// NE2K options
bx_options.ne2k.Ovalid = new bx_param_bool_c (BXP_NE2K_VALID,
"NE2K is present",
"to be written",
0);
bx_options.ne2k.Oioaddr = new bx_param_num_c (BXP_NE2K_IOADDR,
"NE2K I/O Address",
"to be written",
0, 0xffff,
0);
bx_options.ne2k.Oioaddr->set_base (16);
bx_options.ne2k.Oirq = new bx_param_num_c (BXP_NE2K_IRQ,
"NE2K Interrupt",
"to be written",
0, 15,
0);
- add options to the string parameter class that allow it to deal with raw hex bytes, for the MAC address.
2001-06-21 23:27:05 +04:00
bx_options.ne2k.Omacaddr = new bx_param_string_c (BXP_NE2K_MACADDR,
"MAC Address",
"to be written",
"", 6);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
bx_options.ne2k.Omacaddr->get_options ()->set (bx_options.ne2k.Omacaddr->RAW_BYTES);
- add options to the string parameter class that allow it to deal with raw hex bytes, for the MAC address.
2001-06-21 23:27:05 +04:00
bx_options.ne2k.Omacaddr->set_separator (':');
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Oethmod = new bx_param_string_c (BXP_NE2K_ETHMOD,
"Ethernet module",
"to be written",
"null", 16);
bx_options.ne2k.Oethdev = new bx_param_string_c (BXP_NE2K_ETHDEV,
"Ethernet device",
"to be written",
"xl0", BX_PATHNAME_LEN);
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
bx_options.ne2k.Oscript = new bx_param_string_c (BXP_NE2K_SCRIPT,
"Device configuration script",
"to be written",
"none", BX_PATHNAME_LEN);
bx_options.ne2k.Oscript->set_ask_format ("Enter new script name, or 'none': [%s] ");
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_param_c *ne2k_init_list[] = {
bx_options.ne2k.Ovalid,
bx_options.ne2k.Oioaddr,
bx_options.ne2k.Oirq,
- add options to the string parameter class that allow it to deal with raw hex bytes, for the MAC address.
2001-06-21 23:27:05 +04:00
bx_options.ne2k.Omacaddr,
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Oethmod,
bx_options.ne2k.Oethdev,
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
bx_options.ne2k.Oscript,
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
NULL
};
menu = new bx_list_c (BXP_NE2K, "NE2K Configuration", "", ne2k_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Ovalid->set_handler (bx_param_handler);
bx_options.ne2k.Ovalid->set (0);
// SB16 options
bx_options.sb16.Opresent = new bx_param_bool_c (BXP_SB16_PRESENT,
"SB16 is present",
"to be written",
0);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.sb16.Omidifile = new bx_param_filename_c (BXP_SB16_MIDIFILE,
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
"Midi file",
"to be written",
"", BX_PATHNAME_LEN);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.sb16.Owavefile = new bx_param_filename_c (BXP_SB16_WAVEFILE,
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
"Wave file",
"to be written",
"", BX_PATHNAME_LEN);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.sb16.Ologfile = new bx_param_filename_c (BXP_SB16_LOGFILE,
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
"Log file",
"to be written",
"", BX_PATHNAME_LEN);
bx_options.sb16.Omidimode = new bx_param_num_c (BXP_SB16_MIDIMODE,
"Midi mode",
"to be written",
0, BX_MAX_INT,
0);
bx_options.sb16.Owavemode = new bx_param_num_c (BXP_SB16_WAVEMODE,
"Wave mode",
"to be written",
0, BX_MAX_INT,
0);
bx_options.sb16.Ologlevel = new bx_param_num_c (BXP_SB16_LOGLEVEL,
"Log mode",
"to be written",
0, BX_MAX_INT,
0);
bx_options.sb16.Odmatimer = new bx_param_num_c (BXP_SB16_DMATIMER,
"DMA timer",
"to be written",
0, BX_MAX_INT,
0);
bx_param_c *sb16_init_list[] = {
bx_options.sb16.Opresent,
bx_options.sb16.Omidifile,
bx_options.sb16.Owavefile,
bx_options.sb16.Ologfile,
bx_options.sb16.Omidimode,
bx_options.sb16.Owavemode,
bx_options.sb16.Ologlevel,
bx_options.sb16.Odmatimer,
NULL
};
menu = new bx_list_c (BXP_SB16, "SB16 Configuration", "", sb16_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
// sb16_dependent_list is a null-terminated list including all the
// sb16 fields except for the "present" field. These will all be enabled/
// disabled according to the value of the present field.
bx_param_c **sb16_dependent_list = &sb16_init_list[1];
bx_options.sb16.Opresent->set_dependent_list (
new bx_list_c (BXP_NULL, "", "", sb16_dependent_list));
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.log.Ofilename = new bx_param_filename_c (BXP_LOG_FILENAME,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"Log filename",
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
"Pathname of bochs log file",
"-", BX_PATHNAME_LEN);
bx_options.log.Ofilename->set_ask_format ("Enter log filename: [%s] ");
I reworked and included Carl's patch to have a new bochsrc directive to describe the format of the log prefix. This option can be any string with special tokens being replaced at run time : # %t : 11 decimal digits timer tick # %i : 8 hexadecimal digits of cpu0 current eip # %e : 1 character event type ('i'nfo, 'd'ebug, 'p'anic, 'e'rror) # %d : 5 characters string of the device, between brackets the default is "%t%i%d", so the logprefix is the same as before. New tokens can be easily added or changed if needed. Modified Files: .bochsrc bochs.h logio.cc main.cc gui/control.cc gui/siminterface.h gui/siminterface.cc patches/patch.logfilefmteip
2002-06-26 18:42:35 +04:00
bx_options.log.Oprefix = new bx_param_string_c (BXP_LOG_PREFIX,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"Log output prefix",
I reworked and included Carl's patch to have a new bochsrc directive to describe the format of the log prefix. This option can be any string with special tokens being replaced at run time : # %t : 11 decimal digits timer tick # %i : 8 hexadecimal digits of cpu0 current eip # %e : 1 character event type ('i'nfo, 'd'ebug, 'p'anic, 'e'rror) # %d : 5 characters string of the device, between brackets the default is "%t%i%d", so the logprefix is the same as before. New tokens can be easily added or changed if needed. Modified Files: .bochsrc bochs.h logio.cc main.cc gui/control.cc gui/siminterface.h gui/siminterface.cc patches/patch.logfilefmteip
2002-06-26 18:42:35 +04:00
"Prefix prepended to log output",
"%t%e%d", BX_PATHNAME_LEN);
bx_options.log.Oprefix->set_ask_format ("Enter log prefix: [%s] ");
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
// loader
bx_options.load32bitOSImage.OwhichOS = new bx_param_enum_c (BXP_LOAD32BITOS_WHICH,
"Which operating system?",
"Which OS to boot",
loader_os_names,
Load32bitOSNone,
Load32bitOSNone);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.load32bitOSImage.Opath = new bx_param_filename_c (BXP_LOAD32BITOS_PATH,
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
"Pathname of OS to load",
NULL,
"", BX_PATHNAME_LEN);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.load32bitOSImage.Oiolog = new bx_param_filename_c (BXP_LOAD32BITOS_IOLOG,
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
"Pathname of I/O log file",
NULL,
"", BX_PATHNAME_LEN);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.load32bitOSImage.Oinitrd = new bx_param_filename_c (BXP_LOAD32BITOS_INITRD,
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
"Pathname of initrd",
NULL,
"", BX_PATHNAME_LEN);
bx_param_c *loader_init_list[] = {
bx_options.load32bitOSImage.OwhichOS,
bx_options.load32bitOSImage.Opath,
bx_options.load32bitOSImage.Oiolog,
bx_options.load32bitOSImage.Oinitrd,
NULL
};
bx_options.load32bitOSImage.OwhichOS->set_format ("os=%s");
bx_options.load32bitOSImage.Opath->set_format (", path=%s");
bx_options.load32bitOSImage.Oiolog->set_format (", iolog=%s");
bx_options.load32bitOSImage.Oinitrd->set_format (", initrd=%s");
bx_options.load32bitOSImage.OwhichOS->set_ask_format ("Enter OS to load: [%s] ");
bx_options.load32bitOSImage.Opath->set_ask_format ("Enter pathname of OS: [%s]");
bx_options.load32bitOSImage.Oiolog->set_ask_format ("Enter pathname of I/O log: [%s] ");
bx_options.load32bitOSImage.Oinitrd->set_ask_format ("Enter pathname of initrd: [%s] ");
menu = new bx_list_c (BXP_LOAD32BITOS, "32-bit OS Loader", "", loader_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SERIES_ASK);
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
bx_options.load32bitOSImage.OwhichOS->set_handler (bx_param_handler);
bx_options.load32bitOSImage.OwhichOS->set (Load32bitOSNone);
// other
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Okeyboard_serial_delay = new bx_param_num_c (BXP_KBD_SERIAL_DELAY,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"Keyboard serial delay",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Approximate time in microseconds that it takes one character to be transfered from the keyboard to controller over the serial path.",
1, BX_MAX_INT,
20000);
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
bx_options.Okeyboard_paste_delay = new bx_param_num_c (BXP_KBD_PASTE_DELAY,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"Keyboard paste delay",
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
"Approximate time in microseconds between attemps to paste characters to the keyboard controller.",
- restore Christophe's minimum paste delay of 1ms. Linux works even if you turn the delay down to 0, but it doesn't actually paste any faster so there's no point. I will try to be satisfied with only 1000 chars per second. :)
2002-03-26 17:28:31 +03:00
1000, BX_MAX_INT,
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
100000);
- made keyboard_paste_delay a runtime configurable option - clean up comments & debug msgs in paste code
2002-03-26 17:46:03 +03:00
bx_options.Okeyboard_paste_delay->set_handler (bx_param_handler);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Ofloppy_command_delay = new bx_param_num_c (BXP_FLOPPY_CMD_DELAY,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"Floppy command delay",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Time in microseconds to wait before completing some floppy commands such as read/write/seek/etc, which normally have a delay associated. This used to be hardwired to 50,000 before.",
1, BX_MAX_INT,
50000);
bx_options.Oi440FXSupport = new bx_param_bool_c (BXP_I440FX_SUPPORT,
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
"PCI i440FX Support",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Controls whether to emulate PCI I440FX",
0);
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
bx_options.cmos.OcmosImage = new bx_param_bool_c (BXP_CMOS_IMAGE,
"Use a CMOS image",
NULL,
0);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.cmos.Opath = new bx_param_filename_c (BXP_CMOS_PATH,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Pathname of CMOS image",
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
NULL,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"", BX_PATHNAME_LEN);
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
deplist = new bx_list_c (BXP_NULL, 1);
deplist->add (bx_options.cmos.Opath);
bx_options.cmos.OcmosImage->set_dependent_list (deplist);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.cmos.Otime0 = new bx_param_num_c (BXP_CMOS_TIME0,
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
"Initial CMOS time for Bochs",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
"Start time for Bochs CMOS clock, used if you really want two runs to be identical (cosimulation)",
- now the memory options menu, interface menu, and disk menu in the control panel are all implemented as bx_list_c, and look much like they did before. - removed many hardcoded UI functions from control.cc, since the much more general "text_ask" methods have replaced them. - add range checking on integer parameter values. This exposed several cases where my initial value for an integer parameter was not in range. - cleaned up behavior of get/set methods. The get/set methods allow the handler to override the value that is returned/set, or perform side effects. - the title parameter of a bx_list_c now defaults to the name. - now bx_param_c fields that used to be private are protected instead - removed references to bx_any - moved definition of set_handler from siminterface.h to siminterface.cc. I was considering with doing a "set" of the old value when the handler is first installed, but that remains commented out. - BX_BOOT_DISKA and BX_BOOT_DISKC are now 0,1 so that they can correspond with the values of a bx_param_enum_c. For a while they were 0x00 and 0x80 corresponding to the numbering convention of the bios, but it didn't really matter.
2001-06-21 18:37:55 +04:00
0, BX_MAX_INT,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
0);
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
// Keyboard mapping
bx_options.keyboard.OuseMapping = new bx_param_bool_c(BXP_KEYBOARD_USEMAPPING,
"Use keyboard mapping",
NULL,
0);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_options.keyboard.Okeymap = new bx_param_filename_c (BXP_KEYBOARD_MAP,
- New keymap architecture. The localisation is now read from keymap files The keymap files are in gui/keymaps directory
2002-03-06 12:31:55 +03:00
"Keymap filename",
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
NULL,
- New keymap architecture. The localisation is now read from keymap files The keymap files are in gui/keymaps directory
2002-03-06 12:31:55 +03:00
"", BX_PATHNAME_LEN);
- the system of using the bx_param_c::set_handler() callback functions to change the enable/disable status of other parameters worked fine for the text mode interface but poorly for the wxWindows gui. So I implemented it a different way. Now in every boolean parameter, there is a field called dependent_list which is a list of parameters which are enabled/disabled by that boolean. Having this list available allows both the text mode CI and the wxWindows CI to know which fields should be enabled and disabled as a result of a boolean changing value. - I've made this change in many of the parameters, in the init code of main.cc. When I add a dependent_list, I no longer need the "handler" so I remove the call to set_handler and the cases in the handler functions. - in the process, I also made the serial and parallel port init code into loops, instead of hardcoded initialization. Now if you change the number of serial/parallel ports in bochs.h the correct number of ports will be initialized and the menus will grow/shrink accordingly. - fixed up a few names to improve the look of ParamDialog generated dialogs.
2002-09-03 12:42:23 +04:00
deplist = new bx_list_c (BXP_NULL, 1);
deplist->add (bx_options.keyboard.Okeymap);
bx_options.keyboard.OuseMapping->set_dependent_list (deplist);
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
// Keyboard type
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
bx_options.Okeyboard_type = new bx_param_enum_c (BXP_KBD_TYPE,
"Keyboard type",
"Keyboard type",
keyboard_type_names,
BX_KBD_MF_TYPE,
BX_KBD_XT_TYPE);
bx_options.Okeyboard_type->set_format ("Keyboard type: %s");
bx_options.Okeyboard_type->set_ask_format ("Enter keyboard type: [%s] ");
- new "user" button added to the headerbar. It can send keyboard shortcuts to the guest OS. The shortcut can be defined in the bochsrc or in the config interface. It is possible to change it at runtime. These shortcuts are currently recognized: ctrlaltdel, ctrlaltesc, ctrlaltf1, alttab Here is the list of changes: * userbutton.h and userbutton.xpm added in gui/bitmaps * config options for the userbutton shortcut added * initialize the new button in the gui.cc * the new userbutton handler generates keypresses and relaeses depending on the shortcut keyword * the gui stops adding buttons to the headerbar if not enough space is left. This can happen when the screen width is 320 pixels (done for X11 only). * TODO: build a dialog box for the wxWindows gui
2002-08-09 10:16:43 +04:00
// Userbutton shortcut
bx_options.Ouser_shortcut = new bx_param_string_c (BXP_USER_SHORTCUT,
"Userbutton shortcut",
"Userbutton shortcut",
"none", 16);
- add GDB stub patch by Johan Rydberg
2002-10-03 09:29:15 +04:00
// GDB stub
bx_options.gdbstub.port = 1234;
bx_options.gdbstub.text_base = 0;
bx_options.gdbstub.data_base = 0;
bx_options.gdbstub.bss_base = 0;
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
bx_param_c *other_init_list[] = {
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
bx_options.Okeyboard_serial_delay,
bx_options.Okeyboard_paste_delay,
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
bx_options.Ofloppy_command_delay,
bx_options.Oi440FXSupport,
bx_options.cmos.OcmosImage,
bx_options.cmos.Opath,
bx_options.cmos.Otime0,
SIM->get_param (BXP_LOAD32BITOS),
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
bx_options.keyboard.OuseMapping,
bx_options.keyboard.Okeymap,
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
bx_options.Okeyboard_type,
- new "user" button added to the headerbar. It can send keyboard shortcuts to the guest OS. The shortcut can be defined in the bochsrc or in the config interface. It is possible to change it at runtime. These shortcuts are currently recognized: ctrlaltdel, ctrlaltesc, ctrlaltf1, alttab Here is the list of changes: * userbutton.h and userbutton.xpm added in gui/bitmaps * config options for the userbutton shortcut added * initialize the new button in the gui.cc * the new userbutton handler generates keypresses and relaeses depending on the shortcut keyword * the gui stops adding buttons to the headerbar if not enough space is left. This can happen when the screen width is 320 pixels (done for X11 only). * TODO: build a dialog box for the wxWindows gui
2002-08-09 10:16:43 +04:00
bx_options.Ouser_shortcut,
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
NULL
};
menu = new bx_list_c (BXP_MENU_MISC, "Configure Everything Else", "", other_init_list);
- fixed up ParamDialog to correctly handle "trees" of parameters. A bx_list_c can now be displayed as either a wxStaticBox with the child parameters inside, or as a wxNotebook with each child parameter in a separate tab. (The children can also be lists of course.) The default display is the wxStaticBox type, but if you set the option bit bx_list_c::USE_TAB_WINDOW in the list, ParamDialog will use the wxNotebook display instead. - to get the param trees working, I created a new struct AddParamContext, which is passed to AddParam(). This struct is critical when AddParam calls itself recursively to display lists within lists. - use the wxNotebook display feature for the ATA0,1,2,3 controller dialog box. Now instead of being hundreds of pixels tall, it is reasonable height with three different tabs. This fixed bug #619074: "wx: ATA interface editor too tall" and was the whole reason I started messing with this at all. plus some minor cleanups - when I added the enum constant bx_list_c::USE_TAB_WINDOW, I also removed the BX_ prefix from all the other enum constants that are used in parameter options in siminterface.cc. Since these constants are enums within a class, there is no possibility of namespace conflicts so the prefix is not needed. - added wxADJUST_MINSIZE to all wxChoice controls, since that tells wxWindows to adjust its size to the length of the longest string. - instead of calling SetSize or SetSizeHints on every textcontrol with a hardcoded width, I am using just two wxSize specifications for everything: either normalTextSize or longTextSize. - edit names of a few menus and params. For example now instead of the tab saying "Master ATA device on channel 0" it will say "First HD/CD on channel 0". Modified Files: main.cc gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/wxdialog.cc gui/wxdialog.h gui/wxmain.cc
2002-10-06 06:37:28 +04:00
menu->get_options ()->set (menu->SHOW_PARENT);
- turn the last few options into parameters (cmos, loader, random stuff)
2001-06-21 23:57:21 +04:00
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
- now megs, ips, mouse_enabled, vga_update_interval, and rom_path are using Bryce's experimental parameter structures.
2001-06-16 23:29:59 +04:00
}
- new function bx_reset_options() resets the bx_options to their initial values
2002-08-30 18:22:47 +04:00
void bx_reset_options ()
{
// drives
bx_options.floppya.Opath->reset();
bx_options.floppya.Odevtype->reset();
bx_options.floppya.Otype->reset();
bx_options.floppya.Ostatus->reset();
bx_options.floppyb.Opath->reset();
bx_options.floppyb.Odevtype->reset();
bx_options.floppyb.Otype->reset();
bx_options.floppyb.Ostatus->reset();
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
for (Bit8u channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
bx_options.ata[channel].Opresent->reset();
bx_options.ata[channel].Oioaddr1->reset();
bx_options.ata[channel].Oioaddr2->reset();
bx_options.ata[channel].Oirq->reset();
for (Bit8u slave=0; slave<2; slave++) {
bx_options.atadevice[channel][slave].Opresent->reset();
bx_options.atadevice[channel][slave].Otype->reset();
bx_options.atadevice[channel][slave].Opath->reset();
bx_options.atadevice[channel][slave].Ocylinders->reset();
bx_options.atadevice[channel][slave].Oheads->reset();
bx_options.atadevice[channel][slave].Ospt->reset();
bx_options.atadevice[channel][slave].Ostatus->reset();
bx_options.atadevice[channel][slave].Omodel->reset();
bx_options.atadevice[channel][slave].Obiosdetect->reset();
bx_options.atadevice[channel][slave].Otranslation->reset();
}
}
- new function bx_reset_options() resets the bx_options to their initial values
2002-08-30 18:22:47 +04:00
bx_options.OnewHardDriveSupport->reset();
// boot & memory
bx_options.Obootdrive->reset();
bx_options.OfloppySigCheck->reset();
bx_options.memory.Osize->reset();
// standard ports
bx_options.com[0].Oenabled->reset();
bx_options.com[0].Odev->reset();
bx_options.par[0].Oenabled->reset();
bx_options.par[0].Ooutfile->reset();
// rom images
bx_options.rom.Opath->reset();
bx_options.rom.Oaddress->reset();
bx_options.optrom[0].Opath->reset();
bx_options.optrom[0].Oaddress->reset();
bx_options.optrom[1].Opath->reset();
bx_options.optrom[1].Oaddress->reset();
bx_options.optrom[2].Opath->reset();
bx_options.optrom[2].Oaddress->reset();
bx_options.optrom[3].Opath->reset();
bx_options.optrom[3].Oaddress->reset();
bx_options.vgarom.Opath->reset();
// interface
bx_options.Ovga_update_interval->reset();
bx_options.Omouse_enabled->reset();
bx_options.Oips->reset();
bx_options.Oprivate_colormap->reset();
#if BX_WITH_AMIGAOS
bx_options.Ofullscreen->reset();
bx_options.Oscreenmode->reset();
#endif
// ne2k
bx_options.ne2k.Ovalid->reset();
bx_options.ne2k.Oioaddr->reset();
bx_options.ne2k.Oirq->reset();
bx_options.ne2k.Omacaddr->reset();
bx_options.ne2k.Oethmod->reset();
bx_options.ne2k.Oethdev->reset();
bx_options.ne2k.Oscript->reset();
// SB16
bx_options.sb16.Opresent->reset();
bx_options.sb16.Omidifile->reset();
bx_options.sb16.Owavefile->reset();
bx_options.sb16.Ologfile->reset();
bx_options.sb16.Omidimode->reset();
bx_options.sb16.Owavemode->reset();
bx_options.sb16.Ologlevel->reset();
bx_options.sb16.Odmatimer->reset();
// logfile
bx_options.log.Ofilename->reset();
bx_options.log.Oprefix->reset();
// loader
bx_options.load32bitOSImage.OwhichOS->reset();
bx_options.load32bitOSImage.Opath->reset();
bx_options.load32bitOSImage.Oiolog->reset();
bx_options.load32bitOSImage.Oinitrd->reset();
// keyboard
bx_options.Okeyboard_serial_delay->reset();
bx_options.Okeyboard_paste_delay->reset();
bx_options.keyboard.OuseMapping->reset();
bx_options.keyboard.Okeymap->reset();
bx_options.Okeyboard_type->reset();
bx_options.Ouser_shortcut->reset();
// other
bx_options.Ofloppy_command_delay->reset();
bx_options.Oi440FXSupport->reset();
bx_options.cmos.OcmosImage->reset();
bx_options.cmos.Opath->reset();
bx_options.cmos.Otime0->reset();
}
split log stuff into a separate file
2001-06-19 20:25:41 +04:00
void bx_print_header ()
{
fprintf (stderr, "%s\n", divider);
char buffer[128];
sprintf (buffer, "Bochs x86 Emulator %s\n", VER_STRING);
bx_center_print (stderr, buffer, 72);
if (REL_STRING[0]) {
sprintf (buffer, "%s\n", REL_STRING);
bx_center_print (stderr, buffer, 72);
}
fprintf (stderr, "%s\n", divider);
}
- fixed broken #ifdef...should have been an #if
2001-09-26 07:19:25 +04:00
#if BX_WITH_CARBON
- add code for MacOS X, contributed by emmanuel maillard <e.rsz@libertysurf.fr>
2001-09-26 04:12:12 +04:00
/* Original code by Darrell Walisser - dwaliss1@purdue.edu */
static void setupWorkingDirectory (char *path)
{
char parentdir[MAXPATHLEN];
char *c;
strncpy ( parentdir, path, MAXPATHLEN );
c = (char*) parentdir;
while (*c != '\0') /* go to end */
c++;
while (*c != '/') /* back up to parent */
c--;
*c = '\0'; /* cut off last part (binary name) */
- fixed a minor problem I introduced in macos X specific code
2001-10-09 07:21:48 +04:00
/* chdir to the binary app's parent */
int n;
n = chdir (parentdir);
if (n) BX_PANIC (("failed to change dir to parent"));
/* chdir to the .app's parent */
n = chdir ("../../../");
- on win32 in some configurations, code within an assert is completely removed! I used this trick sometimes to check that a function returned what I expected, like assert (func () == 0), but this caused the func() to never get called. Oops.
2001-10-07 22:16:01 +04:00
if (n) BX_PANIC (("failed to change to ../../.."));
- add code for MacOS X, contributed by emmanuel maillard <e.rsz@libertysurf.fr>
2001-09-26 04:12:12 +04:00
}
#endif
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
#if !BX_WITH_WX
// main() is the entry point for all configurations, except for
// wxWindows.
int main (int argc, char *argv[])
{
- create the quit_context as early as possible, in case fatal() gets called from bx_init_main, bx_do_text_config_interface, or bx_config_interface. This should fix bug #614175: infinite panic loop if bochsrc buggy
2002-09-25 20:26:29 +04:00
bx_init_siminterface (); // create the SIM object
- use setjmp() and longjmp() to quit the simulation thread cleanly. I use setjmp() to save the context just before calling bx_continue_after_config_interface(). Then, in bx_real_sim_c:quit_sim, I use longjmp() to jump back to that context. This happens in main.cc and in gui/wxmain.cc (wxWindows only). I haven't tested with the debugger yet. Possibly with debugger the quit longjmp() should jump back to the debugger prompt loop instead of actually quitting the program. - clean up BX_ASYNC_EVT_LOG_MSG implementation by creating a different, synchronous event called BX_SYNC_EVT_LOG_ASK. The async event could be used to simply tell the CI that an event has occurred, for example if the user wanted to view the events on screen (not implemented). The sync event is used when you want the user to respond before the simulation can continue, such as a for the "panic=ask" behavior. - in wxmain.cc, move the updates to the Start,Stop,Pause,Resume menu items into a separate method simStatusChanged(). This makes the code that does important stuff more readable. - remove wxMutexGuiEnter()/Leave() from MyFrame::OnSim2CuiEvent(). This method is an event handler called in the gui thread, so it already has the gui lock. This call caused thread lock on my linux box.
2002-08-27 22:11:13 +04:00
static jmp_buf context;
if (setjmp (context) == 0) {
SIM->set_quit_context (&context);
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
if (bx_init_main (argc, argv) < 0) return 0;
- create the quit_context as early as possible, in case fatal() gets called from bx_init_main, bx_do_text_config_interface, or bx_config_interface. This should fix bug #614175: infinite panic loop if bochsrc buggy
2002-09-25 20:26:29 +04:00
bx_do_text_config_interface (argc, argv);
bx_config_interface (BX_CI_INIT);
- use setjmp() and longjmp() to quit the simulation thread cleanly. I use setjmp() to save the context just before calling bx_continue_after_config_interface(). Then, in bx_real_sim_c:quit_sim, I use longjmp() to jump back to that context. This happens in main.cc and in gui/wxmain.cc (wxWindows only). I haven't tested with the debugger yet. Possibly with debugger the quit longjmp() should jump back to the debugger prompt loop instead of actually quitting the program. - clean up BX_ASYNC_EVT_LOG_MSG implementation by creating a different, synchronous event called BX_SYNC_EVT_LOG_ASK. The async event could be used to simply tell the CI that an event has occurred, for example if the user wanted to view the events on screen (not implemented). The sync event is used when you want the user to respond before the simulation can continue, such as a for the "panic=ask" behavior. - in wxmain.cc, move the updates to the Start,Stop,Pause,Resume menu items into a separate method simStatusChanged(). This makes the code that does important stuff more readable. - remove wxMutexGuiEnter()/Leave() from MyFrame::OnSim2CuiEvent(). This method is an event handler called in the gui thread, so it already has the gui lock. This call caused thread lock on my linux box.
2002-08-27 22:11:13 +04:00
bx_continue_after_config_interface (argc, argv);
// function returned normally
} else {
// quit via longjmp
}
- set the quit context to NULL after it is no longer usable. I don't want anybody jumping back because the pointer was still lying around. - modified: gui/wxmain.cc main.cc
2002-10-06 23:21:05 +04:00
SIM->set_quit_context (NULL);
- main should return something! how about 0.
2002-09-04 17:07:26 +04:00
return 0;
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
}
#endif
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
int
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
bx_init_main (int argc, char *argv[])
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
int help = 0;
- wx gui menu functions "Read Configuration" and "Save Configuration" implemented - loading default bochsrc for the wx gui no longer necessary - the wx gui version of bochs now accepts the same command line arguments as the other guis
2002-08-25 19:51:46 +04:00
#if BX_WITH_WX
int arg = 1;
char *bochsrc = NULL;
#endif
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
// To deal with initialization order problems inherent in C++, use the macros
// SAFE_GET_IOFUNC and SAFE_GET_GENLOG to retrieve "io" and "genlog" in all
// constructors or functions called by constructors. The macros test for
// NULL and create the object if necessary, then return it. Ensure that io
// and genlog get created, by making one reference to each macro right here.
- add comments about lifetime of io and genlog and why they're never freed.
2002-08-31 01:41:29 +04:00
// All other code can reference io and genlog directly. Because these
// objects are required for logging, and logging is so fundamental to
// knowing what the program is doing, they are never free()d.
SAFE_GET_IOFUNC(); // never freed
SAFE_GET_GENLOG(); // never freed
merge in BRANCH-io-cleanup. To see the commit logs for this use either cvsweb or cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files. In general this provides a generic interface for logging. logfunctions:: is a class that is inherited by some classes, and also . allocated as a standalone global called 'genlog'. All logging uses . one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this . class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros . respectively. . . An example usage: . BX_INFO(("Hello, World!\n")); iofunctions:: is a class that is allocated once by default, and assigned as the iofunction of each logfunctions instance. It is this class that maintains the file descriptor and other output related code, at this point using vfprintf(). At some future point, someone may choose to write a gui 'console' for bochs to which messages would be redirected simply by assigning a different iofunction class to the various logfunctions objects. More cleanup is coming, but this works for now. If you want to see alot of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1. Comments, bugs, flames, to me: todd@fries.net
2001-05-15 18:49:57 +04:00
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
if ((argc > 1) && (!strcmp ("--help", argv[1]))) {
fprintf(stderr, "Usage: bochs [options] [bochsrc options]\n\n"
" -q quickstart with default configuration file\n"
" -qf configfile quickstart with specified configuration file\n"
" --help display this help and exit\n\n"
"For information on Bochs configuration file arguments, see the\n"
#if (!defined(WIN32)) && !BX_WITH_MACOS
"bochsrc section in the user documentation or the man page of bochsrc.\n");
#else
"bochsrc section in the user documentation.\n");
#endif
help = 1;
} else {
- skip over some fprintfs to stderr when using wxWindows
2002-09-05 20:40:18 +04:00
#if !BX_WITH_WX
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
bx_print_header ();
- skip over some fprintfs to stderr when using wxWindows
2002-09-05 20:40:18 +04:00
#endif
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
}
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
bx_init_bx_dbg ();
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_init_options ();
- command line parameter --help added - this changes also fix a carbon gui compile problem (SF bug #594718)
2002-08-25 12:31:16 +04:00
if (help) exit(0);
- fixed broken #ifdef...should have been an #if
2001-09-26 07:19:25 +04:00
#if BX_WITH_CARBON
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
/* "-psn" is passed if we are launched by double-clicking */
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
// ugly hack. I don't know how to open a window to print messages in,
// so put them in /tmp/early-bochs-out.txt. Sorry. -bbd
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
io->init_log("/tmp/early-bochs-out.txt");
BX_INFO (("I was launched by double clicking. Fixing home directory."));
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
argc = 1; // ignore all other args.
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
setupWorkingDirectory (argv[0]);
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
// there is no stdin/stdout so disable the text-based config interface.
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
enable_config_interface = 0;
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
}
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
// if it was started from command line, there could be some args still.
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
for (int a=0; a<argc; a++) {
BX_INFO (("argument %d is %s", a, argv[a]));
}
- add code for MacOS X, contributed by emmanuel maillard <e.rsz@libertysurf.fr>
2001-09-26 04:12:12 +04:00
- attempt to clean up the behavior when you run bochs from the command line or by double clicking. Running from the command line doesn't really work because of a NULL pointer problem in gui/carbon.cc.
2001-09-27 06:54:06 +04:00
char cwd[MAXPATHLEN];
getwd (cwd);
BX_INFO (("Now my working directory is %s", cwd));
- add code for MacOS X, contributed by emmanuel maillard <e.rsz@libertysurf.fr>
2001-09-26 04:12:12 +04:00
#endif
- wx gui menu functions "Read Configuration" and "Save Configuration" implemented - loading default bochsrc for the wx gui no longer necessary - the wx gui version of bochs now accepts the same command line arguments as the other guis
2002-08-25 19:51:46 +04:00
#if BX_WITH_WX
// detect -q or -qf
if ((argc > 1) && (!strncmp ("-q", argv[1], 2))) {
- Volker introduced the -q command line switch in August 2002, which tells Bochs to immediately read the bochsrc and start simulating immediately (as opposed to going into the configuration interface first). Now -q does the right thing in the wxWindows interface. It behaves as if you selected Read Configuration and then Simulate:Start. - modified: main.cc gui/siminterface.cc gui/siminterface.h gui/wxmain.cc
2002-09-05 11:01:30 +04:00
SIM->get_param_bool(BXP_QUICK_START)->set (1); // used in wxmain.cc
- wx gui menu functions "Read Configuration" and "Save Configuration" implemented - loading default bochsrc for the wx gui no longer necessary - the wx gui version of bochs now accepts the same command line arguments as the other guis
2002-08-25 19:51:46 +04:00
arg++;
if ((argc > 2) && (!strcmp(argv[1], "-qf"))) {
bochsrc = argv[arg];
arg++;
}
else if ((argc > 3) && (!strcmp ("-f", argv[arg]))) {
bochsrc = argv[arg+1];
arg += 2;
}
- declaration of bx_do_text_config_interface() is not necessary for the wx gui - don't load a bochsrc for the wx gui if no -q or -qf option is present
2002-08-29 00:01:34 +04:00
if (bochsrc == NULL) bochsrc = bx_find_bochsrc ();
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
if (bochsrc) {
if (bx_read_configuration (bochsrc) < 0)
return -1; // read config failed
}
- wx gui menu functions "Read Configuration" and "Save Configuration" implemented - loading default bochsrc for the wx gui no longer necessary - the wx gui version of bochs now accepts the same command line arguments as the other guis
2002-08-25 19:51:46 +04:00
}
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
// parse cmdline after bochsrc so that it can override things
- wx gui menu functions "Read Configuration" and "Save Configuration" implemented - loading default bochsrc for the wx gui no longer necessary - the wx gui version of bochs now accepts the same command line arguments as the other guis
2002-08-25 19:51:46 +04:00
bx_parse_cmdline (arg, argc, argv);
#endif
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
return 0;
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
}
- add code for MacOS X, contributed by emmanuel maillard <e.rsz@libertysurf.fr>
2001-09-26 04:12:12 +04:00
- now #if !BX_WITH_WX...#endif is around the whole bx_do_text_config_interface() to make it clear that it's not used with wxWindows. Before, it was around only the line of that function that failed to compile.
2002-08-27 20:43:40 +04:00
#if !BX_WITH_WX
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
static void
bx_do_text_config_interface (int argc, char *argv[])
{
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
char *bochsrc = NULL;
int norcfile = 1;
- removed -nocontrolpanel and -nocp arguments. It was never documented, and is now replaced by -q, which IS documented thanks to Volker.
2002-08-26 22:05:16 +04:00
// detect -q, -qf argument before anything else
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
int arg = 1;
- removed -nocontrolpanel and -nocp arguments. It was never documented, and is now replaced by -q, which IS documented thanks to Volker.
2002-08-26 22:05:16 +04:00
if ((argc > 1) && !strncmp ("-q", argv[1], 2)) {
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
// skip the configuration interface
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
arg++;
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
enable_config_interface = 0;
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
if ((argc > 2) && (!strcmp(argv[1], "-qf"))) {
bochsrc = argv[arg];
arg++;
}
else if ((argc > 3) && (!strcmp ("-f", argv[arg]))) {
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
bochsrc = argv[arg+1];
arg += 2;
}
- add "-nocontrolpanel" command line option.
2001-06-22 01:24:05 +04:00
}
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
#if !BX_USE_CONFIG_INTERFACE
enable_config_interface = 0;
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
#endif
- add "-nocontrolpanel" command line option.
2001-06-22 01:24:05 +04:00
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
if (!enable_config_interface || BX_WITH_WX) {
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
/* parse configuration file and command line arguments */
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
if (bochsrc == NULL) bochsrc = bx_find_bochsrc ();
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
if (bochsrc)
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
norcfile = bx_read_configuration (bochsrc);
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
if (norcfile && arg>=argc) {
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
// no bochsrc used. This is legal since they may have everything on the
// command line. However if they have no arguments then give them some
// friendly advice.
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
fprintf (stderr, "%s\n", divider);
fprintf (stderr, "Before running Bochs, you should cd to a directory which contains\n");
fprintf (stderr, "a .bochsrc file and a disk image. If you downloaded a binary package,\n");
fprintf (stderr, "all the necessary files are already on your disk.\n");
#if defined(WIN32)
fprintf (stderr, "\nFor Windows installations, go to the dlxlinux direectory and\n");
fprintf (stderr, "double-click on the start.bat script.\n");
#elif !defined(macintosh)
fprintf (stderr, "\nFor UNIX installations, try running \"bochs-dlx\" for a demo. This script\n");
fprintf (stderr, "is basically equivalent to typing:\n");
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
fprintf (stderr, " cd /usr/share/bochs/dlxlinux\n");
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
fprintf (stderr, " bochs\n");
#endif
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
BX_EXIT(1);
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
}
}
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
// parse the rest of the command line.
if (bx_parse_cmdline (arg, argc, argv)) {
fprintf (stderr, "There were errors while parsing the command line.\n");
fprintf (stderr, "Bochs is exiting.\n");
exit (1);
}
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
if (enable_config_interface) {
// update log actions before starting configuration interface
- update log actions after reading command line or bochsrc
2001-12-29 14:40:37 +03:00
for (int level=0; level<N_LOGLEV; level++) {
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
int action = SIM->get_default_log_action (level);
- update log actions after reading command line or bochsrc
2001-12-29 14:40:37 +03:00
io->set_log_action (level, action);
}
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
// Display the pre-simulation configuration interface.
bx_config_interface (BX_CI_START_MENU);
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
}
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
}
- now #if !BX_WITH_WX...#endif is around the whole bx_do_text_config_interface() to make it clear that it's not used with wxWindows. Before, it was around only the line of that function that failed to compile.
2002-08-27 20:43:40 +04:00
#endif
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
int
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
bx_continue_after_config_interface (int argc, char *argv[])
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
{
- add GDB stub patch by Johan Rydberg
2002-10-03 09:29:15 +04:00
#if BX_GDBSTUB
bx_gdbstub_init (argc, argv);
#elif BX_DEBUGGER
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
// If using the debugger, it will take control and call
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
// bx_init_hardware() and cpu_loop()
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
bx_dbg_main(argc, argv);
#else
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
bx_init_hardware();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if (bx_options.load32bitOSImage.OwhichOS->get ()) {
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
void bx_load32bitOSimagehack(void);
bx_load32bitOSimagehack();
}
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
SIM->set_init_done (1);
- added a new method to all GUIs called mouse_enabled_changed_specific, which notifies them that the mouse_enabled bit has changed. Now that mouse_enabled can be initialized or modified by parameter events in addition to GUI events, the guis must be prepared for it. I have pasted empty method definitions into mouse_enabled_changed_specific for all guis except for X11, which I did the right way. The implementation of this function must use the argument "val" rather than reading the parameter.
2001-06-23 07:23:19 +04:00
// The set handler for mouse_enabled does not actually update the gui
// until init_done is set. This forces the set handler to be called,
// which sets up the mouse enabled GUI-specific stuff correctly.
// Not a great solution but it works. BBD
bx_options.Omouse_enabled->set (bx_options.Omouse_enabled->get ());
- the SMP merge has reduced performance of even one processor, so this is the first attempt to regain the performance of pre-SMP bochs (1.1.2). When simulating only one processor, stay in cpu_loop forever as pre-SMP versions did. The overhead of returning from cpu_loop over and over was slowing us down.
2001-06-05 19:56:19 +04:00
if (BX_SMP_PROCESSORS == 1) {
// only one processor, run as fast as possible by not messing with
// quantums and loops.
BX_CPU(0)->cpu_loop(1);
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
// for one processor, the only reason for cpu_loop to return is
// that kill_bochs_request was set by the GUI interface.
- the SMP merge has reduced performance of even one processor, so this is the first attempt to regain the performance of pre-SMP bochs (1.1.2). When simulating only one processor, stay in cpu_loop forever as pre-SMP versions did. The overhead of returning from cpu_loop over and over was slowing us down.
2001-06-05 19:56:19 +04:00
} else {
- compile with debugger has failed because it continued to call bx_bochs_init when main.cc no longer had one. Now compiling with debugger is working with the control panel. To get the control panel, you have to click the snapshot button, and to get the debugger, you have to press ^C. These should be better integrated (maybe a control panel menu choice that jumps into the debugger and a debugger command that starts the runtime control panel...)
2001-06-13 17:36:12 +04:00
// SMP simulation: do a few instructions on each processor, then switch
// to another. Increasing quantum speeds up overall performance, but
// reduces granularity of synchronization between processors.
- the SMP merge has reduced performance of even one processor, so this is the first attempt to regain the performance of pre-SMP bochs (1.1.2). When simulating only one processor, stay in cpu_loop forever as pre-SMP versions did. The overhead of returning from cpu_loop over and over was slowing us down.
2001-06-05 19:56:19 +04:00
int processor = 0;
int quantum = 5;
while (1) {
// do some instructions in each processor
BX_CPU(processor)->cpu_loop(quantum);
processor = (processor+1) % BX_SMP_PROCESSORS;
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
if (BX_CPU(0)->kill_bochs_request)
break;
- the SMP merge has reduced performance of even one processor, so this is the first attempt to regain the performance of pre-SMP bochs (1.1.2). When simulating only one processor, stay in cpu_loop forever as pre-SMP versions did. The overhead of returning from cpu_loop over and over was slowing us down.
2001-06-05 19:56:19 +04:00
if (processor == 0)
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
BX_TICKN(quantum);
- the SMP merge has reduced performance of even one processor, so this is the first attempt to regain the performance of pre-SMP bochs (1.1.2). When simulating only one processor, stay in cpu_loop forever as pre-SMP versions did. The overhead of returning from cpu_loop over and over was slowing us down.
2001-06-05 19:56:19 +04:00
}
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
BX_INFO (("cpu loop quit, shutting down simulator"));
bx_atexit ();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
return(0);
}
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
int
- compile with debugger has failed because it continued to call bx_bochs_init when main.cc no longer had one. Now compiling with debugger is working with the control panel. To get the control panel, you have to click the snapshot button, and to get the debugger, you have to press ^C. These should be better integrated (maybe a control panel menu choice that jumps into the debugger and a debugger command that starts the runtime control panel...)
2001-06-13 17:36:12 +04:00
bx_read_configuration (char *rcfile)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
// parse rcfile first, then parse arguments in order.
BX_INFO (("reading configuration from %s", rcfile));
if (parse_bochsrc(rcfile) < 0) {
BX_ERROR (("reading from %s failed", rcfile));
return -1;
}
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
// update log actions if configuration interface is enabled
if (enable_config_interface) {
- update log actions after reading command line or bochsrc
2001-12-29 14:40:37 +03:00
for (int level=0; level<N_LOGLEV; level++) {
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
int action = SIM->get_default_log_action (level);
- update log actions after reading command line or bochsrc
2001-12-29 14:40:37 +03:00
io->set_log_action (level, action);
}
}
- compile with debugger has failed because it continued to call bx_bochs_init when main.cc no longer had one. Now compiling with debugger is working with the control panel. To get the control panel, you have to click the snapshot button, and to get the debugger, you have to press ^C. These should be better integrated (maybe a control panel menu choice that jumps into the debugger and a debugger command that starts the runtime control panel...)
2001-06-13 17:36:12 +04:00
return 0;
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
int bx_parse_cmdline (int arg, int argc, char *argv[])
- compile with debugger has failed because it continued to call bx_bochs_init when main.cc no longer had one. Now compiling with debugger is working with the control panel. To get the control panel, you have to click the snapshot button, and to get the debugger, you have to press ^C. These should be better integrated (maybe a control panel menu choice that jumps into the debugger and a debugger command that starts the runtime control panel...)
2001-06-13 17:36:12 +04:00
{
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
//if (arg < argc) BX_INFO (("parsing command line arguments"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Fixes for bug [ #467530 ] cmd line overrides config interface - rework the order of initialization with and without the control panel. The thing that was bothering me most was the command line options were being processed after the user had set everything in the control panel. This is clearly not what's expected--the command line options should affect the startup defaults of the control panel, but whatever the user chooses in the cpanel menus is the final choice. - if the control panel (config interface) is not wanted, the user can put "-nocp" or "-nocontrolpanel" as the FIRST argument on the command line. Also, the "-psn" option which is automatically passed in by MacOS X when you doubleclick the application causes the control panel to be disabled. In this case, the order of operations is: 1. read bochsrc 2. parse command line options. - if the control panel is enabled (default), the command line options are parsed to provide the startup defaults for the control panel, but the control panel settings are the final answer. So the order is: 1. parse command line options 2. run control panel (if user chooses, he can read bochsrc from menus) - I haven't tested command line options with the debugger yet.
2001-10-07 02:31:31 +04:00
while (arg < argc) {
BX_INFO (("parsing arg %d, %s", arg, argv[arg]));
parse_line_unformatted("cmdline args", argv[arg]);
arg++;
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
}
return 0;
}
int
bx_init_hardware()
{
// all configuration has been read, now initialize everything.
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- I've added lots of comments in siminterface.h, and tried to clean up the terminology a bit. In particular, the term "gui" has started to mean different things in different contexts, so I've defined some more specific names for the parts of the user interface, and updated comments and some variable names to reflect it. See siminterface.h for a more complete description of all of these. VGAW: VGA display window and toolbar buttons, the traditional Bochs display which is ported to X, win32, MacOS X, etc. Implemented in gui/gui.* and platform dependent gui/*.cc files. CI: configuration interface that lets the user change settings such as floppy disk image, ne2k settings, log options. The CI consists of two parts: configuration user interface (CUI) which does the actual rendering to the screen and handles key/mouse/menu events, and the siminterface object. CUI: configuration user interface. This handles the user interactions that allow the user to configure Bochs. To actually change any values it talks to the siminterface object. One implementation of the CUI is the text-mode menus in gui/control.cc. Another implementation is (will be) the wxWindows menus and dialogs in gui/wxmain.cc. siminterface: the glue between the CUI and the simulation code, accessible throughout the code by the global variable bx_simulator_interface_c *SIM; Among other things, siminterface methods allow the simulator to ask the CUI to display things or ask for user input, and allows the CUI to query and modify variables in the simulation code. GUI: Literally, "graphical user interface". Until the configuration menus and wxWindows came along, everyone understood that "gui" referred to the VGA display window and the toolbar buttons because that's all there was. Now that we have the wxWindows code, which implements both the VGAW and the CUI, while all other platforms implement only the VGAW, it's not so clear. So, I'm trying to use VGAW, CI, and CUI consistently since they are more specific. control panel: This has been used as another name for the configuration interface. "control panel" is also somewhat unspecific and it sounds like it would be graphical with buttons and sliders, but our text-mode thing is not graphical at all. I've replaced "control panel" with "configuration interface" wherever I could find it. In configure script, the --disable-control-panel option is still supported, but it politely suggests that you use --disable-config-interface instead. - clean up comments in siminterface,wx* code - add comments and examples for bx_param_* and BxEvents - remove some obsolete stuff: notify_*_args, bx_simulator_interface_c::[sg]et_enabled() methods - in siminterface.cc, move a few bx_real_sim_c methods to where they belong, with the rest of the methods. No changes to the actual methods. - remove some DOS ^M's which crept in and confused my editor.
2002-08-26 19:31:23 +04:00
if (!enable_config_interface) {
- bx_init_hardware(): don't update the log actions if control panel is enabled
2002-01-02 12:57:58 +03:00
for (int level=0; level<N_LOGLEV; level++) {
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
int action = SIM->get_default_log_action (level);
- bx_init_hardware(): log actions must be updated when bochs starts with -q
2002-09-07 13:57:54 +04:00
#if !BX_USE_CONFIG_INTERFACE
- bx_init_hardware(): don't update the log actions if control panel is enabled
2002-01-02 12:57:58 +03:00
if (action == ACT_ASK) action = ACT_FATAL;
- bx_init_hardware(): log actions must be updated when bochs starts with -q
2002-09-07 13:57:54 +04:00
#endif
- bx_init_hardware(): don't update the log actions if control panel is enabled
2002-01-02 12:57:58 +03:00
io->set_log_action (level, action);
}
- add "-nocontrolpanel" command line option.
2001-06-22 01:24:05 +04:00
}
- change name of action "crash" to "fatal" - change Makefile.in to "cvs-snapshot" information rather than printing the release number, since in fact it's not the same as the release anymore - use #defines to give the actions names (ACT_IGNORE, ACT_REPORT, ACT_FATAL) - register all logfunctions as they call setio, and keep a list so that we can change their settings more easily. I admit I used a static-sized array to store them. Sorry. - instead of printing a prefix [GEN ] for generic messages, just leave the prefix blank [ ]. Otherwise you start wondering what does gen stand for. - avoid reentry into fatal, since fatal can call BX_INFO and friends. This avoids a potential infinite recursion. - now that files other than .bochsrc can be the rc file, print the actual name of the file in error messages.
2001-05-23 06:37:52 +04:00
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_pc_system.init_ips(bx_options.Oips->get ());
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if(bx_options.log.Ofilename->getptr()[0]!='-') {
BX_INFO (("using log file %s", bx_options.log.Ofilename->getptr ()));
io->init_log(bx_options.log.Ofilename->getptr ());
- more stderr cleanup
2001-05-22 23:07:53 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- cleaned up the logprefix code
2002-06-28 18:03:47 +04:00
io->set_log_prefix(bx_options.log.Oprefix->getptr());
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
// set up memory and CPU objects
- there were cases where BX_APIC_SUPPORT were used and others where BX_SUPPORT_APIC were used. To follow the pattern used by other names like this, I changed them all to BX_SUPPORT_APIC. Thanks to Tom Lindström for chasing this down!
2001-06-12 17:07:43 +04:00
#if BX_SUPPORT_APIC
- many parameters in cpu were being redefined if you stop simulation and restart another one in wxWindows. Fixed that. Also, on restart, the apic id's left over from the first run were causing panics. Fixed that. - modified: main.cc cpu/apic.cc cpu/cpu.h cpu/init.cc
2002-10-01 02:18:53 +04:00
bx_generic_apic_c::reset_all_ids ();
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
#endif
- another speed boost: when not using SMP, use BX_CPU_C bx_cpu; BX_MEM_C bx_mem; and when more than one processor, use BX_CPU_C *bx_cpu_array[BX_SMP_PROCESSORS]; BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES]; The changeover is controlled by BX_SMP_PROCESSORS, but there are only a few code changes since nearly all code uses the BX_CPU(n) and BX_MEM(n) macros. - This turns out to make a 10% speed difference! With this revision, the CVS version now gets 95% of the performance of the 3/25/2000 snapshot, which I've been using as my baseline.
2001-06-05 21:35:08 +04:00
#if BX_SMP_PROCESSORS==1
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_MEM(0)->init_memory(bx_options.memory.Osize->get () * 1024*1024);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
// First load the optional ROM images
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
if (bx_options.optrom[0].Opath->getptr () > 0)
BX_MEM(0)->load_ROM(bx_options.optrom[0].Opath->getptr (), bx_options.optrom[0].Oaddress->get ());
if (bx_options.optrom[1].Opath->getptr () > 0)
BX_MEM(0)->load_ROM(bx_options.optrom[1].Opath->getptr (), bx_options.optrom[1].Oaddress->get ());
if (bx_options.optrom[2].Opath->getptr () > 0)
BX_MEM(0)->load_ROM(bx_options.optrom[2].Opath->getptr (), bx_options.optrom[2].Oaddress->get ());
if (bx_options.optrom[3].Opath->getptr () > 0)
BX_MEM(0)->load_ROM(bx_options.optrom[3].Opath->getptr (), bx_options.optrom[3].Oaddress->get ());
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
// Then Load the BIOS and VGABIOS
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_MEM(0)->load_ROM(bx_options.rom.Opath->getptr (), bx_options.rom.Oaddress->get ());
BX_MEM(0)->load_ROM(bx_options.vgarom.Opath->getptr (), 0xc0000);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- another speed boost: when not using SMP, use BX_CPU_C bx_cpu; BX_MEM_C bx_mem; and when more than one processor, use BX_CPU_C *bx_cpu_array[BX_SMP_PROCESSORS]; BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES]; The changeover is controlled by BX_SMP_PROCESSORS, but there are only a few code changes since nearly all code uses the BX_CPU(n) and BX_MEM(n) macros. - This turns out to make a 10% speed difference! With this revision, the CVS version now gets 95% of the performance of the 3/25/2000 snapshot, which I've been using as my baseline.
2001-06-05 21:35:08 +04:00
BX_CPU(0)->init (BX_MEM(0));
- fix segfault that happened if APIC was enabled with one processor
2002-03-27 19:05:13 +03:00
#if BX_SUPPORT_APIC
applied a temporary fix so that it can compile
2002-03-30 02:37:07 +03:00
BX_CPU(0)->local_apic.set_id (0);
Fixed the bug caused failures of instrumentation on SMP configuration ...
2002-09-29 20:59:28 +04:00
BX_INSTR_INIT(0);
- fix segfault that happened if APIC was enabled with one processor
2002-03-27 19:05:13 +03:00
#endif
- another speed boost: when not using SMP, use BX_CPU_C bx_cpu; BX_MEM_C bx_mem; and when more than one processor, use BX_CPU_C *bx_cpu_array[BX_SMP_PROCESSORS]; BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES]; The changeover is controlled by BX_SMP_PROCESSORS, but there are only a few code changes since nearly all code uses the BX_CPU(n) and BX_MEM(n) macros. - This turns out to make a 10% speed difference! With this revision, the CVS version now gets 95% of the performance of the 3/25/2000 snapshot, which I've been using as my baseline.
2001-06-05 21:35:08 +04:00
BX_CPU(0)->reset(BX_RESET_HARDWARE);
#else
// SMP initialization
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
bx_mem_array[0] = new BX_MEM_C ();
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_mem_array[0]->init_memory(bx_options.memory.Osize->get () * 1024*1024);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
// First load the optional ROM images
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
if (bx_options.optrom[0].Opath->getptr () > 0)
bx_mem_array[0]->load_ROM(bx_options.optrom[0].Opath->getptr (), bx_options.optrom[0].Oaddress->get ());
if (bx_options.optrom[1].Opath->getptr () > 0)
bx_mem_array[0]->load_ROM(bx_options.optrom[1].Opath->getptr (), bx_options.optrom[1].Oaddress->get ());
if (bx_options.optrom[2].Opath->getptr () > 0)
BX_MEM(0)->load_ROM(bx_options.optrom[2].Opath->getptr (), bx_options.optrom[2].Oaddress->get ());
bx_mem_array[0]->load_ROM(bx_options.optrom[2].Opath->getptr (), bx_options.optrom[2].Oaddress->get ());
if (bx_options.optrom[3].Opath->getptr () > 0)
bx_mem_array[0]->load_ROM(bx_options.optrom[3].Opath->getptr (), bx_options.optrom[3].Oaddress->get ());
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
// Then Load the BIOS and VGABIOS
allow to compile with SMP
2001-11-06 18:41:34 +03:00
bx_mem_array[0]->load_ROM(bx_options.rom.Opath->getptr (), bx_options.rom.Oaddress->get ());
bx_mem_array[0]->load_ROM(bx_options.vgarom.Opath->getptr (), 0xc0000);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
for (int i=0; i<BX_SMP_PROCESSORS; i++) {
BX_CPU(i) = new BX_CPU_C ();
BX_CPU(i)->init (bx_mem_array[0]);
// assign apic ID from the index of this loop
- there were cases where BX_APIC_SUPPORT were used and others where BX_SUPPORT_APIC were used. To follow the pattern used by other names like this, I changed them all to BX_SUPPORT_APIC. Thanks to Tom Lindström for chasing this down!
2001-06-12 17:07:43 +04:00
// if !BX_SUPPORT_APIC, this will not compile.
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
BX_CPU(i)->local_apic.set_id (i);
Fixed the bug caused failures of instrumentation on SMP configuration ...
2002-09-29 20:59:28 +04:00
BX_INSTR_INIT(i);
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
BX_CPU(i)->reset(BX_RESET_HARDWARE);
}
- another speed boost: when not using SMP, use BX_CPU_C bx_cpu; BX_MEM_C bx_mem; and when more than one processor, use BX_CPU_C *bx_cpu_array[BX_SMP_PROCESSORS]; BX_MEM_C *bx_mem_array[BX_ADDRESS_SPACES]; The changeover is controlled by BX_SMP_PROCESSORS, but there are only a few code changes since nearly all code uses the BX_CPU(n) and BX_MEM(n) macros. - This turns out to make a 10% speed difference! With this revision, the CVS version now gets 95% of the performance of the 3/25/2000 snapshot, which I've been using as my baseline.
2001-06-05 21:35:08 +04:00
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#if BX_DEBUGGER == 0
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
bx_devices.init(BX_MEM(0));
- bx_devices.reset() method now takes one arg
2002-08-28 01:30:48 +04:00
bx_devices.reset(BX_RESET_HARDWARE);
- This implements a solution that lets any GUI take over handling of any signal. First, selection of the GUI should cause BX_GUI_SIGHANDLER to be defined in config.h.in. Then, the GUI should define member functions Bit32u get_sighandler_mask (); void sighandler (int sig); The mask function returns a bitfield where one bit corresponds to each signal. For any signal whose bit is set to 1 in the return value of get_sighandler_mask, the gui will control that signal. When the signal arrives, bx_gui.sighandler(sig) will be called by bx_signal_handler, instead of the default behavior of that signal.
2001-05-09 00:18:04 +04:00
bx_gui.init_signal_handlers ();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
bx_pc_system.start_timers();
#endif
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
BX_DEBUG(("bx_init_hardware is setting signal handlers"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
// if not using debugger, then we can take control of SIGINT.
// If using debugger, it needs control of this.
- restore signal handling to default when bochs thread dies
2002-09-05 19:51:03 +04:00
#if !BX_DEBUGGER
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
signal(SIGINT, bx_signal_handler);
#endif
#if BX_SHOW_IPS
#ifndef __MINGW32__
signal(SIGALRM, bx_signal_handler);
#endif
alarm( 1 );
#endif
return(0);
}
void
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
bx_init_bx_dbg (void)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
bx_dbg.floppy = 0;
bx_dbg.keyboard = 0;
bx_dbg.video = 0;
bx_dbg.disk = 0;
bx_dbg.pit = 0;
bx_dbg.pic = 0;
bx_dbg.bios = 0;
bx_dbg.cmos = 0;
bx_dbg.a20 = 0;
bx_dbg.interrupts = 0;
bx_dbg.exceptions = 0;
bx_dbg.unsupported = 0;
bx_dbg.temp = 0;
bx_dbg.reset = 0;
bx_dbg.mouse = 0;
bx_dbg.io = 0;
bx_dbg.debugger = 0;
bx_dbg.xms = 0;
bx_dbg.v8086 = 0;
bx_dbg.paging = 0;
bx_dbg.creg = 0;
bx_dbg.dreg = 0;
bx_dbg.dma = 0;
bx_dbg.unsupported_io = 0;
bx_dbg.record_io = 0;
bx_dbg.serial = 0;
bx_dbg.cdrom = 0;
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
#ifdef MAGIC_BREAKPOINT
bx_dbg.magic_break_enabled = 0;
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
int
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
bx_atexit(void)
{
static Boolean been_here = 0;
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
if (been_here) return 1; // protect from reentry
been_here = 1;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
Added guest2host TLB tricks to read-modify-write variants of access routines in access.cc, completing the upgrade of those routines. You do need '--enable-guest2host-tlb', before you get the speedups for now. The guest2host mods seem pretty solid, though I do need to see what effects the A20 line has on this cache and the paging TLB in general.
2002-09-03 08:54:28 +04:00
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#if BX_PROVIDE_DEVICE_MODELS==1
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
bx_pc_system.exit();
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif
#if BX_DEBUGGER == 0
- until init_done is set, don't dump CPU registers. It's frustrating to get a screen full of cpu registers when you actually have a bochsrc parse error.
2002-09-25 22:49:35 +04:00
if (SIM && SIM->get_init_done ()) {
for (int cpu=0; cpu<BX_SMP_PROCESSORS; cpu++)
if (BX_CPU(cpu)) BX_CPU(cpu)->atexit();
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif
#if BX_PCI_SUPPORT
- restore signal handling to default when bochs thread dies
2002-09-05 19:51:03 +04:00
if (bx_options.Oi440FXSupport->get ()) {
bx_devices.pci->print_i440fx_state();
}
#endif
// restore signal handling to defaults
#if !BX_DEBUGGER
BX_INFO (("restoring default signal behavior"));
signal(SIGINT, SIG_DFL);
#endif
#if BX_SHOW_IPS
#ifndef __MINGW32__
signal(SIGALRM, SIG_DFL);
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif
- commit patch.wxwindows.gz in the main branch. Now you can try out the wxwindows interface by just "configure --with-wx; make" Modified Files: Makefile.in bochs.h config.h.in configure configure.in load32bitOShack.cc logio.cc main.cc cpu/cpu.cc cpu/cpu.h debug/dbg_main.cc gui/Makefile.in gui/control.cc gui/gui.cc gui/siminterface.cc gui/siminterface.h gui/x.cc iodev/cdrom.cc iodev/keyboard.cc memory/misc_mem.cc Added Files: README-wxWindows wxbochs.rc gui/wx.cc gui/wxmain.cc gui/wxmain.h gui/bitmaps/cdromd.xpm gui/bitmaps/configbutton.xpm gui/bitmaps/copy.xpm gui/bitmaps/floppya.xpm gui/bitmaps/floppyb.xpm gui/bitmaps/mouse.xpm gui/bitmaps/paste.xpm gui/bitmaps/power.xpm gui/bitmaps/reset.xpm gui/bitmaps/snapshot.xpm Removed Files: patches/patch.wxwindows.gz
2002-04-18 04:22:20 +04:00
return 0;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
#if (BX_PROVIDE_CPU_MEMORY==1) && (BX_EMULATE_HGA_DUMPS>0)
void
bx_emulate_hga_dumps_timer(void)
{
void bx_hga_set_video_memory(Bit8u *ptr);
bx_hga_set_video_memory(&bx_phy_memory[0xb0000]);
}
#endif
#if BX_PROVIDE_MAIN
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
char *
bx_find_bochsrc ()
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- clean up compiler warnings
2001-06-12 00:39:05 +04:00
FILE *fd = NULL;
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
char rcfile[512];
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
Bit32u retry = 0, found = 0;
// try several possibilities for the bochsrc before giving up
while (!found) {
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
rcfile[0] = 0;
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
switch (retry++) {
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
case 0: strcpy (rcfile, ".bochsrc"); break;
case 1: strcpy (rcfile, "bochsrc"); break;
case 2: strcpy (rcfile, "bochsrc.txt"); break;
- correct stupid problem that I caused yesterday. Must use #if for BX_WITH_MACOS, not #ifdef!!!
2001-09-26 19:22:52 +04:00
#if (!defined(WIN32)) && !BX_WITH_MACOS
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
// only try this on unix
- Added /etc/bochsrc in list of path searched for the configuration file on unix-systems. See patch [ 593018 ] from Bernhard Bablok
2002-08-12 18:55:21 +04:00
case 3:
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
{
char *ptr = getenv("HOME");
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
if (ptr) sprintf (rcfile, "%s/.bochsrc", ptr);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
break;
- Added /etc/bochsrc in list of path searched for the configuration file on unix-systems. See patch [ 593018 ] from Bernhard Bablok
2002-08-12 18:55:21 +04:00
case 4: strcpy (rcfile, "/etc/bochsrc"); break;
#endif
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
default:
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
return NULL;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
if (rcfile[0]) {
BX_DEBUG (("looking for configuration in %s", rcfile));
fd = fopen(rcfile, "r");
- clean up stderr output a lot - give hints if they type "bochs" with no args and no .bochsrc is found
2001-05-22 22:47:30 +04:00
if (fd) found = 1;
}
}
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
assert (fd != NULL && rcfile[0] != 0);
fclose (fd);
return strdup (rcfile);
}
static int
parse_bochsrc(char *rcfile)
{
FILE *fd = NULL;
char *ret;
char line[512];
// try several possibilities for the bochsrc before giving up
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
bochsrc_include_count++;
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
fd = fopen (rcfile, "r");
- added a command line option '-f' to specify a config file when using the '-nocp' option - reverted latest changes in function bx_do_text_config_interface() - removed unnecessary forward declaration of function bx_print_header() - replace the loglevel ACT_ASK by ACT_FATAL only when compiled without control panel - detection of the config file fixed - fopen returns NULL if the function fails
2002-07-14 17:22:38 +04:00
if (fd == NULL) return -1;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
int retval = 0;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
do {
ret = fgets(line, sizeof(line)-1, fd);
line[sizeof(line) - 1] = '\0';
- bug fix: zero length line could cause bochs to segfault. (Maybe it only happened at the end.)
2001-05-23 19:00:10 +04:00
int len = strlen(line);
if (len>0)
line[len-1] = '\0';
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if ((ret != NULL) && strlen(line)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
if (parse_line_unformatted(rcfile, line) < 0) {
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
retval = -1;
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
break; // quit parsing after first error
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
} while (!feof(fd));
- missing 'fclose(fd)' added in function parse_bochsrc()
2002-07-16 00:12:14 +04:00
fclose(fd);
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
bochsrc_include_count--;
- make parse_bochsrc return -1 if any parse errors occur. - make bx_init_main return -1 if any parse errors occur. - wxWindows: if bx_init_main returns -1, don't even show the application window. You'll get an error dialog and then it exits. So far this only happens if you run with -q and the parse fails. - non-wxWindows: if bx_init_main returns -1, just exit. So far this only happens if you run with -q and the parse fails. - with these changes, handling of bochsrc parse errors seems to work as you would expect. And it certainly doesn't go into an infinite recursive loop, as it used to! - a little more testing and I can close bug 614175: infinite panic loop if bochsrc buggy - modified: main.cc gui/siminterface.h gui/wxmain.cc
2002-09-25 23:05:01 +04:00
return retval;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
static Bit32s
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
parse_line_unformatted(char *context, char *line)
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
- apply patch.memleaks-tominac from Darko Tominac <darko.tominac@zg.tel.hr> which fixes some potential memory leaks
2001-12-21 22:33:18 +03:00
#define MAX_PARAMS_LEN 40
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
char *ptr;
unsigned i, string_i;
char string[512];
- apply patch.memleaks-tominac from Darko Tominac <darko.tominac@zg.tel.hr> which fixes some potential memory leaks
2001-12-21 22:33:18 +03:00
char *params[MAX_PARAMS_LEN];
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
int num_params;
Boolean inquotes = 0;
- apply patch.memleaks-tominac from Darko Tominac <darko.tominac@zg.tel.hr> which fixes some potential memory leaks
2001-12-21 22:33:18 +03:00
memset(params, 0, sizeof(params));
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
if (line == NULL) return 0;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
// if passed nothing but whitespace, just return
for (i=0; i<strlen(line); i++) {
if (!isspace(line[i])) break;
}
if (i>=strlen(line))
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
return 0;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
num_params = 0;
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
if (!strncmp(line, "#include", 8))
ptr = strtok(line, " ");
else
ptr = strtok(line, ":");
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
while (ptr) {
string_i = 0;
for (i=0; i<strlen(ptr); i++) {
if (ptr[i] == '"')
inquotes = !inquotes;
- do environment variable substitutions on any strings in the .bochsrc
2001-11-11 08:44:40 +03:00
else {
#if BX_HAVE_GETENV
// substitute environment variables.
if (ptr[i] == '$') {
char varname[512];
char *pv = varname;
char *value;
*pv = 0;
i++;
while (isalpha(ptr[i]) || ptr[i]=='_') {
*pv = ptr[i]; pv++; i++;
}
*pv = 0;
if (strlen(varname)<1 || !(value = getenv(varname))) {
BX_PANIC (("could not look up environment variable '%s'\n", varname));
} else {
// append value to the string
for (pv=value; *pv; pv++)
string[string_i++] = *pv;
}
}
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (!isspace(ptr[i]) || inquotes) {
- do environment variable substitutions on any strings in the .bochsrc
2001-11-11 08:44:40 +03:00
string[string_i++] = ptr[i];
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- do environment variable substitutions on any strings in the .bochsrc
2001-11-11 08:44:40 +03:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
string[string_i] = '\0';
- apply patch.memleaks-tominac from Darko Tominac <darko.tominac@zg.tel.hr> which fixes some potential memory leaks
2001-12-21 22:33:18 +03:00
if ( params[num_params] != NULL )
{
free(params[num_params]);
params[num_params] = NULL;
}
if ( num_params < MAX_PARAMS_LEN )
{
- do environment variable substitutions on any strings in the .bochsrc
2001-11-11 08:44:40 +03:00
params[num_params++] = strdup (string);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
ptr = strtok(NULL, ",");
- apply patch.memleaks-tominac from Darko Tominac <darko.tominac@zg.tel.hr> which fixes some potential memory leaks
2001-12-21 22:33:18 +03:00
}
else
{
BX_PANIC (("too many parameters, max is %d\n", MAX_PARAMS_LEN));
}
- do environment variable substitutions on any strings in the .bochsrc
2001-11-11 08:44:40 +03:00
}
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
Bit32s retval = parse_line_formatted(context, num_params, &params[0]);
- apply patch.memleaks-tominac from Darko Tominac <darko.tominac@zg.tel.hr> which fixes some potential memory leaks
2001-12-21 22:33:18 +03:00
for (i=0; i < MAX_PARAMS_LEN; i++)
{
if ( params[i] != NULL )
{
free(params[i]);
params[i] = NULL;
}
}
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
return retval;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
// This PARSE_ERR macro is called for all parse errors, so that we can easily
// change the behavior of all occurrences.
#define PARSE_ERR(x) \
do { BX_PANIC(x); return -1; } while (0)
static Bit32s
- more work on text-mode control panel. Now the control panel starts before the simulation begins, to give you a chance to choose between bochsrcs, choose the boot disk, etc.
2001-06-10 00:01:12 +04:00
parse_line_formatted(char *context, int num_params, char *params[])
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
{
int i;
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
if (num_params < 1) return 0;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
if (!strcmp(params[0], "#include")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ignoring malformed #include directive.", context));
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
}
if (!strcmp(params[1], context)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: cannot include this file again.", context));
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
}
if (bochsrc_include_count == 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: include directive in an included file not supported yet.", context));
- new bochsrc option '#include' added. Now you can store platform and installation dependent values in a global configuration file. If you are including such a file, you only need to define the disk images and other guest OS dependent stuff. - new command line option '-q' (quickstart) added (the same as '-nocp') - new command line option '-qf' (quickstart + config file) added (the same as '-nocp -f') - missing initialization of Ouser_shortcut in bx_options added
2002-08-18 20:59:26 +04:00
}
bx_read_configuration(params[1]);
}
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
else if (params[0][0] == '#') return 0; /* comment */
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "floppya")) {
for (i=1; i<num_params; i++) {
- 2.88M floppy patch by Todd Fries
2001-05-08 21:45:44 +04:00
if (!strncmp(params[i], "2_88=", 5)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppya.Opath->set (&params[i][5]);
bx_options.floppya.Otype->set (BX_FLOPPY_2_88);
- 2.88M floppy patch by Todd Fries
2001-05-08 21:45:44 +04:00
}
else if (!strncmp(params[i], "1_44=", 5)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppya.Opath->set (&params[i][5]);
bx_options.floppya.Otype->set (BX_FLOPPY_1_44);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "1_2=", 4)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppya.Opath->set (&params[i][4]);
bx_options.floppya.Otype->set (BX_FLOPPY_1_2);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "720k=", 5)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppya.Opath->set (&params[i][5]);
bx_options.floppya.Otype->set (BX_FLOPPY_720K);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- added support for 360k floppy images * new floppy type 360k can be used in .bochsrc and the config interface * media type and geometry can be set for the floppy type * BIOS changes to make 360k floppy drives work * bximage can create 360k images now
2002-08-01 11:37:56 +04:00
else if (!strncmp(params[i], "360k=", 5)) {
bx_options.floppya.Opath->set (&params[i][5]);
bx_options.floppya.Otype->set (BX_FLOPPY_360K);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strncmp(params[i], "status=ejected", 14)) {
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Ostatus->set (BX_EJECTED);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "status=inserted", 15)) {
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppya.Ostatus->set (BX_INSERTED);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppya attribute '%s' not understood.", context,
- replaced all the "fprintf(stderr...); exit(1);" lines with BX_PANIC and BX_INFO calls instead.
2001-05-23 19:13:05 +04:00
params[i]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
}
- add GDB stub patch by Johan Rydberg
2002-10-03 09:29:15 +04:00
else if (!strcmp(params[0], "gdbstub_port"))
{
if (num_params != 2)
{
fprintf(stderr, ".bochsrc: gdbstub_port directive: wrong # args.\n");
exit(1);
}
bx_options.gdbstub.port = atoi(params[1]);
}
else if (!strcmp(params[0], "gdbstub_text_base"))
{
if (num_params != 2)
{
fprintf(stderr, ".bochsrc: gdbstub_text_base directive: wrong # args.\n");
exit(1);
}
bx_options.gdbstub.text_base = atoi(params[1]);
}
else if (!strcmp(params[0], "gdbstub_data_base"))
{
if (num_params != 2)
{
fprintf(stderr, ".bochsrc: gdbstub_data_base directive: wrong # args.\n");
exit(1);
}
bx_options.gdbstub.data_base = atoi(params[1]);
}
else if (!strcmp(params[0], "gdbstub_bss_base"))
{
if (num_params != 2)
{
fprintf(stderr, ".bochsrc: gdbstub_bss_base directive: wrong # args.\n");
exit(1);
}
bx_options.gdbstub.bss_base = atoi(params[1]);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "floppyb")) {
for (i=1; i<num_params; i++) {
- 2.88M floppy patch by Todd Fries
2001-05-08 21:45:44 +04:00
if (!strncmp(params[i], "2_88=", 5)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppyb.Opath->set (&params[i][5]);
bx_options.floppyb.Otype->set (BX_FLOPPY_2_88);
- 2.88M floppy patch by Todd Fries
2001-05-08 21:45:44 +04:00
}
else if (!strncmp(params[i], "1_44=", 5)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppyb.Opath->set (&params[i][5]);
bx_options.floppyb.Otype->set (BX_FLOPPY_1_44);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "1_2=", 4)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppyb.Opath->set (&params[i][4]);
bx_options.floppyb.Otype->set (BX_FLOPPY_1_2);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "720k=", 5)) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.floppyb.Opath->set (&params[i][5]);
bx_options.floppyb.Otype->set (BX_FLOPPY_720K);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- added support for 360k floppy images * new floppy type 360k can be used in .bochsrc and the config interface * media type and geometry can be set for the floppy type * BIOS changes to make 360k floppy drives work * bximage can create 360k images now
2002-08-01 11:37:56 +04:00
else if (!strncmp(params[i], "360k=", 5)) {
bx_options.floppyb.Opath->set (&params[i][5]);
bx_options.floppyb.Otype->set (BX_FLOPPY_360K);
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strncmp(params[i], "status=ejected", 14)) {
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Ostatus->set (BX_EJECTED);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "status=inserted", 15)) {
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
bx_options.floppyb.Ostatus->set (BX_INSERTED);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppyb attribute '%s' not understood.", context,
- replaced all the "fprintf(stderr...); exit(1);" lines with BX_PANIC and BX_INFO calls instead.
2001-05-23 19:13:05 +04:00
params[i]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
}
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
else if ((!strncmp(params[0], "ata", 3)) && (strlen(params[0]) == 4)) {
Bit8u channel = params[0][3];
if ((channel < '0') || (channel > '9')) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
channel-='0';
if (channel >= BX_MAX_ATA_CHANNEL) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
if ((num_params < 2) || (num_params > 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
else {
bx_options.ata[channel].Opresent->set (atol(&params[1][8]));
}
if (num_params > 2) {
if (strncmp(params[2], "ioaddr1=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
else {
if ( (params[2][8] == '0') && (params[2][9] == 'x') )
bx_options.ata[channel].Oioaddr1->set (strtoul (&params[2][8], NULL, 16));
else
bx_options.ata[channel].Oioaddr1->set (strtoul (&params[2][8], NULL, 10));
}
}
if (num_params > 3) {
if (strncmp(params[3], "ioaddr2=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
else {
if ( (params[3][8] == '0') && (params[3][9] == 'x') )
bx_options.ata[channel].Oioaddr2->set (strtoul (&params[3][8], NULL, 16));
else
bx_options.ata[channel].Oioaddr2->set (strtoul (&params[3][8], NULL, 10));
}
}
if (num_params > 4) {
if (strncmp(params[4], "irq=", 4)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
else {
bx_options.ata[channel].Oirq->set (atol(&params[4][4]));
}
}
}
// ataX-master, ataX-slave
else if ((!strncmp(params[0], "ata", 3)) && (strlen(params[0]) > 4)) {
Bit8u channel = params[0][3], slave = 0;
if ((channel < '0') || (channel > '9')) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
channel-='0';
if (channel >= BX_MAX_ATA_CHANNEL) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
if ((strcmp(&params[0][4], "-slave")) &&
(strcmp(&params[0][4], "-master"))) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
if (!strcmp(&params[0][4], "-slave")) {
slave = 1;
}
if (bx_options.atadevice[channel][slave].Opresent->get()) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: %s device of ata channel %d already defined.", context, slave?"slave":"master",channel));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
for (i=1; i<num_params; i++) {
if (!strcmp(params[i], "type=disk")) {
bx_options.atadevice[channel][slave].Otype->set (BX_ATA_DEVICE_DISK);
}
else if (!strcmp(params[i], "type=cdrom")) {
bx_options.atadevice[channel][slave].Otype->set (BX_ATA_DEVICE_CDROM);
}
else if (!strncmp(params[i], "path=", 5)) {
bx_options.atadevice[channel][slave].Opath->set (&params[i][5]);
}
else if (!strncmp(params[i], "cylinders=", 10)) {
bx_options.atadevice[channel][slave].Ocylinders->set (atol(&params[i][10]));
}
else if (!strncmp(params[i], "heads=", 6)) {
bx_options.atadevice[channel][slave].Oheads->set (atol(&params[i][6]));
}
else if (!strncmp(params[i], "spt=", 4)) {
bx_options.atadevice[channel][slave].Ospt->set (atol(&params[i][4]));
}
else if (!strncmp(params[i], "model=", 6)) {
bx_options.atadevice[channel][slave].Omodel->set(&params[i][6]);
}
else if (!strcmp(params[i], "biosdetect=none")) {
bx_options.atadevice[channel][slave].Obiosdetect->set(BX_ATA_BIOSDETECT_NONE);
}
else if (!strcmp(params[i], "biosdetect=cmos")) {
bx_options.atadevice[channel][slave].Obiosdetect->set(BX_ATA_BIOSDETECT_CMOS);
}
else if (!strcmp(params[i], "biosdetect=auto")) {
bx_options.atadevice[channel][slave].Obiosdetect->set(BX_ATA_BIOSDETECT_AUTO);
}
else if (!strcmp(params[i], "translation=none")) {
bx_options.atadevice[channel][slave].Otranslation->set(BX_ATA_TRANSLATION_NONE);
}
else if (!strcmp(params[i], "translation=lba")) {
bx_options.atadevice[channel][slave].Otranslation->set(BX_ATA_TRANSLATION_LBA);
}
else if (!strcmp(params[i], "translation=large")) {
bx_options.atadevice[channel][slave].Otranslation->set(BX_ATA_TRANSLATION_LARGE);
}
else if (!strcmp(params[i], "status=ejected")) {
bx_options.atadevice[channel][slave].Ostatus->set(BX_EJECTED);
}
else if (!strcmp(params[i], "status=inserted")) {
bx_options.atadevice[channel][slave].Ostatus->set(BX_INSERTED);
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
}
// Enables the ata device
bx_options.atadevice[channel][slave].Opresent->set(1);
// if enabled check if device ok
if (bx_options.atadevice[channel][slave].Opresent->get() == 1) {
if (bx_options.atadevice[channel][slave].Otype->get() == BX_ATA_DEVICE_DISK) {
if ((strlen(bx_options.atadevice[channel][slave].Opath->getptr()) ==0) ||
(bx_options.atadevice[channel][slave].Ocylinders->get() == 0) ||
(bx_options.atadevice[channel][slave].Oheads->get() ==0 ) ||
(bx_options.atadevice[channel][slave].Ospt->get() == 0)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
}
else if (bx_options.atadevice[channel][slave].Otype->get() == BX_ATA_DEVICE_CDROM) {
if (strlen(bx_options.atadevice[channel][slave].Opath->getptr()) == 0) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ataX-master/slave: type sould be specified ", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
}
}
// Legacy disk options emulation
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "diskc")) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
if (bx_options.atadevice[0][0].Opresent->get()) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: master device of ata channel 0 already defined.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (num_params != 5) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: diskc directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "file=", 5) ||
strncmp(params[2], "cyl=", 4) ||
strncmp(params[3], "heads=", 6) ||
strncmp(params[4], "spt=", 4)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: diskc directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_options.ata[0].Opresent->set(1);
bx_options.atadevice[0][0].Otype->set (BX_ATA_DEVICE_DISK);
bx_options.atadevice[0][0].Opath->set (&params[1][5]);
bx_options.atadevice[0][0].Ocylinders->set (atol(&params[2][4]));
bx_options.atadevice[0][0].Oheads->set (atol(&params[3][6]));
bx_options.atadevice[0][0].Ospt->set (atol(&params[4][4]));
bx_options.atadevice[0][0].Opresent->set (1);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(params[0], "diskd")) {
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
if (bx_options.atadevice[0][1].Opresent->get()) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: slave device of ata channel 0 already defined.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (num_params != 5) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: diskd directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "file=", 5) ||
strncmp(params[2], "cyl=", 4) ||
strncmp(params[3], "heads=", 6) ||
strncmp(params[4], "spt=", 4)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: diskd directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_options.ata[0].Opresent->set(1);
bx_options.atadevice[0][1].Otype->set (BX_ATA_DEVICE_DISK);
bx_options.atadevice[0][1].Opath->set (&params[1][5]);
bx_options.atadevice[0][1].Ocylinders->set (atol( &params[2][4]));
bx_options.atadevice[0][1].Oheads->set (atol( &params[3][6]));
bx_options.atadevice[0][1].Ospt->set (atol( &params[4][4]));
bx_options.atadevice[0][1].Opresent->set (1);
}
else if (!strcmp(params[0], "cdromd")) {
if (bx_options.atadevice[0][1].Opresent->get()) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: slave device of ata channel 0 already defined.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
if (num_params != 3) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: cdromd directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
if (strncmp(params[1], "dev=", 4) || strncmp(params[2], "status=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: cdromd directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
bx_options.ata[0].Opresent->set(1);
bx_options.atadevice[0][1].Otype->set (BX_ATA_DEVICE_CDROM);
bx_options.atadevice[0][1].Opath->set (&params[1][4]);
if (!strcmp(params[2], "status=inserted"))
bx_options.atadevice[0][1].Ostatus->set (BX_INSERTED);
else if (!strcmp(params[2], "status=ejected"))
bx_options.atadevice[0][1].Ostatus->set (BX_EJECTED);
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: cdromd directive malformed.", context));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
bx_options.atadevice[0][1].Opresent->set (1);
}
else if (!strcmp(params[0], "boot")) {
if (!strcmp(params[1], "a")) {
bx_options.Obootdrive->set (BX_BOOT_FLOPPYA);
- added "floppy" and "disk" as available directive to the boot: option - legacy "c" and "a" are still supported
2002-09-24 13:50:16 +04:00
} else if (!strcmp(params[1], "floppy")) {
bx_options.Obootdrive->set (BX_BOOT_FLOPPYA);
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
} else if (!strcmp(params[1], "c")) {
bx_options.Obootdrive->set (BX_BOOT_DISKC);
- added "floppy" and "disk" as available directive to the boot: option - legacy "c" and "a" are still supported
2002-09-24 13:50:16 +04:00
} else if (!strcmp(params[1], "disk")) {
bx_options.Obootdrive->set (BX_BOOT_DISKC);
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
} else if (!strcmp(params[1], "cdrom")) {
bx_options.Obootdrive->set (BX_BOOT_CDROM);
} else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: boot directive with unknown boot device '%s'. use 'a', 'c' or 'cdrom'.", context, params[1]));
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
else if (!strcmp(params[0], "com1")) {
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
for (i=1; i<num_params; i++) {
if (!strncmp(params[i], "enabled=", 8)) {
bx_options.com[0].Oenabled->set (atol(&params[i][8]));
}
else if (!strncmp(params[i], "dev=", 4)) {
bx_options.com[0].Odev->set (&params[i][4]);
bx_options.com[0].Oenabled->set (1);
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: unknown parameter for com1 ignored.", context));
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
}
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
}
}
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
#if 0
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
else if (!strcmp(params[0], "com2")) {
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
for (i=1; i<num_params; i++) {
if (!strncmp(params[i], "enabled=", 8)) {
bx_options.com[1].Oenabled->set (atol(&params[i][8]));
}
else if (!strncmp(params[i], "dev=", 4)) {
bx_options.com[1].Odev->set (&params[i][4]);
bx_options.com[1].Oenabled->set (1);
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: unknown parameter for com2 ignored.", context));
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
}
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
}
}
else if (!strcmp(params[0], "com3")) {
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
for (i=1; i<num_params; i++) {
if (!strncmp(params[i], "enabled=", 8)) {
bx_options.com[2].Oenabled->set (atol(&params[i][8]));
}
else if (!strncmp(params[i], "dev=", 4)) {
bx_options.com[2].Odev->set (&params[i][4]);
bx_options.com[2].Oenabled->set (1);
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: unknown parameter for com3 ignored.", context));
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
}
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
}
}
else if (!strcmp(params[0], "com4")) {
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
for (i=1; i<num_params; i++) {
if (!strncmp(params[i], "enabled=", 8)) {
bx_options.com[3].Oenabled->set (atol(&params[i][8]));
}
else if (!strncmp(params[i], "dev=", 4)) {
bx_options.com[3].Odev->set (&params[i][4]);
bx_options.com[3].Oenabled->set (1);
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: unknown parameter for com4 ignored.", context));
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
}
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
}
}
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
#endif
- commit serial port patch from Stu Grossman <grossman@juniper.net> Here are the patches (without the serial name fix). Let me know if you want me to change that. Oh, FYI, my changes also open up the com1 terminal in raw mode, which makes the emulation much more accurate. You'll also notice that I added infrastructure for com2->4 in the option parsing. I didn't add it to the serial code, as I think a bunch of things need to be untangled before that can work.
2002-03-03 09:03:29 +03:00
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
else if (!strcmp(params[0], "floppy_bootsig_check")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppy_bootsig_check directive malformed.", context));
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
}
- changed the floppy_bootsig_check syntax to be more logical. the syntax is now : floppy_bootsig_check: disabled=[0|1]. It is not disabled by default. Sorry for any inconvenience it could cause - changed the default (if cmos reg is 0) behavior for the floppy boot signature check, so the new bios is compatible with older bochs binaries (useful if we want to use the new bios when we release 1.4.1) : 1 : disabled 0 : enabled - added info at launch time about the boot device and the floppy boot signature check - added a "LBA capable" flag in the ata controller
2002-05-04 20:00:40 +04:00
if (strncmp(params[1], "disabled=", 9)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppy_bootsig_check directive malformed.", context));
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
}
- changed the floppy_bootsig_check syntax to be more logical. the syntax is now : floppy_bootsig_check: disabled=[0|1]. It is not disabled by default. Sorry for any inconvenience it could cause - changed the default (if cmos reg is 0) behavior for the floppy boot signature check, so the new bios is compatible with older bochs binaries (useful if we want to use the new bios when we release 1.4.1) : 1 : disabled 0 : enabled - added info at launch time about the boot device and the floppy boot signature check - added a "LBA capable" flag in the ata controller
2002-05-04 20:00:40 +04:00
if (params[1][9] == '0')
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
bx_options.OfloppySigCheck->set (0);
- changed the floppy_bootsig_check syntax to be more logical. the syntax is now : floppy_bootsig_check: disabled=[0|1]. It is not disabled by default. Sorry for any inconvenience it could cause - changed the default (if cmos reg is 0) behavior for the floppy boot signature check, so the new bios is compatible with older bochs binaries (useful if we want to use the new bios when we release 1.4.1) : 1 : disabled 0 : enabled - added info at launch time about the boot device and the floppy boot signature check - added a "LBA capable" flag in the ata controller
2002-05-04 20:00:40 +04:00
else if (params[1][9] == '1')
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
bx_options.OfloppySigCheck->set (1);
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppy_bootsig_check directive malformed.", context));
- added a floppy_bootsig_check option to .bochsrc that will be used to enable/disable the 0xaa55 signature check ONLY for floppy-boot - stored the boot signature check flag in cmos reg 0x38 - the rombios that is able to handle that flag will be uploaded later
2002-04-23 11:44:34 +04:00
}
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "log")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: log directive has wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.log.Ofilename->set (params[1]);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
I reworked and included Carl's patch to have a new bochsrc directive to describe the format of the log prefix. This option can be any string with special tokens being replaced at run time : # %t : 11 decimal digits timer tick # %i : 8 hexadecimal digits of cpu0 current eip # %e : 1 character event type ('i'nfo, 'd'ebug, 'p'anic, 'e'rror) # %d : 5 characters string of the device, between brackets the default is "%t%i%d", so the logprefix is the same as before. New tokens can be easily added or changed if needed. Modified Files: .bochsrc bochs.h logio.cc main.cc gui/control.cc gui/siminterface.h gui/siminterface.cc patches/patch.logfilefmteip
2002-06-26 18:42:35 +04:00
else if (!strcmp(params[0], "logprefix")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: logprefix directive has wrong # args.", context));
I reworked and included Carl's patch to have a new bochsrc directive to describe the format of the log prefix. This option can be any string with special tokens being replaced at run time : # %t : 11 decimal digits timer tick # %i : 8 hexadecimal digits of cpu0 current eip # %e : 1 character event type ('i'nfo, 'd'ebug, 'p'anic, 'e'rror) # %d : 5 characters string of the device, between brackets the default is "%t%i%d", so the logprefix is the same as before. New tokens can be easily added or changed if needed. Modified Files: .bochsrc bochs.h logio.cc main.cc gui/control.cc gui/siminterface.h gui/siminterface.cc patches/patch.logfilefmteip
2002-06-26 18:42:35 +04:00
}
bx_options.log.Oprefix->set (params[1]);
}
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp(params[0], "panic")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: panic directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
if (strncmp(params[1], "action=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: panic directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
char *action = 7 + params[1];
- change name of action "crash" to "fatal" - change Makefile.in to "cvs-snapshot" information rather than printing the release number, since in fact it's not the same as the release anymore - use #defines to give the actions names (ACT_IGNORE, ACT_REPORT, ACT_FATAL) - register all logfunctions as they call setio, and keep a list so that we can change their settings more easily. I admit I used a static-sized array to store them. Sorry. - instead of printing a prefix [GEN ] for generic messages, just leave the prefix blank [ ]. Otherwise you start wondering what does gen stand for. - avoid reentry into fatal, since fatal can call BX_INFO and friends. This avoids a potential infinite recursion. - now that files other than .bochsrc can be the rc file, print the actual name of the file in error messages.
2001-05-23 06:37:52 +04:00
if (!strcmp(action, "fatal"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_PANIC, ACT_FATAL);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "report"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_PANIC, ACT_REPORT);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "ignore"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_PANIC, ACT_IGNORE);
- added a new log action "ask" which sends the log message to the control panel. It gives the user the option of continue this time, continue and never ask again for this type of log message, or die. - the communication between control.cc and siminterface.cc is still somewhat crude. I'm trying to implement it so that a network protocol based on this interface will be simple. I'll get this cleaned up soon.
2001-06-11 18:03:35 +04:00
else if (!strcmp (action, "ask"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_PANIC, ACT_ASK);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: panic directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
}
else if (!strcmp(params[0], "error")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: error directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
if (strncmp(params[1], "action=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: error directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
char *action = 7 + params[1];
- change name of action "crash" to "fatal" - change Makefile.in to "cvs-snapshot" information rather than printing the release number, since in fact it's not the same as the release anymore - use #defines to give the actions names (ACT_IGNORE, ACT_REPORT, ACT_FATAL) - register all logfunctions as they call setio, and keep a list so that we can change their settings more easily. I admit I used a static-sized array to store them. Sorry. - instead of printing a prefix [GEN ] for generic messages, just leave the prefix blank [ ]. Otherwise you start wondering what does gen stand for. - avoid reentry into fatal, since fatal can call BX_INFO and friends. This avoids a potential infinite recursion. - now that files other than .bochsrc can be the rc file, print the actual name of the file in error messages.
2001-05-23 06:37:52 +04:00
if (!strcmp(action, "fatal"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_ERROR, ACT_FATAL);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "report"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_ERROR, ACT_REPORT);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "ignore"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_ERROR, ACT_IGNORE);
- added a new log action "ask" which sends the log message to the control panel. It gives the user the option of continue this time, continue and never ask again for this type of log message, or die. - the communication between control.cc and siminterface.cc is still somewhat crude. I'm trying to implement it so that a network protocol based on this interface will be simple. I'll get this cleaned up soon.
2001-06-11 18:03:35 +04:00
else if (!strcmp (action, "ask"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_ERROR, ACT_ASK);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: error directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
}
else if (!strcmp(params[0], "info")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: info directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
if (strncmp(params[1], "action=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: info directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
char *action = 7 + params[1];
- change name of action "crash" to "fatal" - change Makefile.in to "cvs-snapshot" information rather than printing the release number, since in fact it's not the same as the release anymore - use #defines to give the actions names (ACT_IGNORE, ACT_REPORT, ACT_FATAL) - register all logfunctions as they call setio, and keep a list so that we can change their settings more easily. I admit I used a static-sized array to store them. Sorry. - instead of printing a prefix [GEN ] for generic messages, just leave the prefix blank [ ]. Otherwise you start wondering what does gen stand for. - avoid reentry into fatal, since fatal can call BX_INFO and friends. This avoids a potential infinite recursion. - now that files other than .bochsrc can be the rc file, print the actual name of the file in error messages.
2001-05-23 06:37:52 +04:00
if (!strcmp(action, "fatal"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_INFO, ACT_FATAL);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "report"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_INFO, ACT_REPORT);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "ignore"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_INFO, ACT_IGNORE);
- added a new log action "ask" which sends the log message to the control panel. It gives the user the option of continue this time, continue and never ask again for this type of log message, or die. - the communication between control.cc and siminterface.cc is still somewhat crude. I'm trying to implement it so that a network protocol based on this interface will be simple. I'll get this cleaned up soon.
2001-06-11 18:03:35 +04:00
else if (!strcmp (action, "ask"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_INFO, ACT_ASK);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: info directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
}
else if (!strcmp(params[0], "debug")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: debug directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
if (strncmp(params[1], "action=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: debug directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
char *action = 7 + params[1];
- change name of action "crash" to "fatal" - change Makefile.in to "cvs-snapshot" information rather than printing the release number, since in fact it's not the same as the release anymore - use #defines to give the actions names (ACT_IGNORE, ACT_REPORT, ACT_FATAL) - register all logfunctions as they call setio, and keep a list so that we can change their settings more easily. I admit I used a static-sized array to store them. Sorry. - instead of printing a prefix [GEN ] for generic messages, just leave the prefix blank [ ]. Otherwise you start wondering what does gen stand for. - avoid reentry into fatal, since fatal can call BX_INFO and friends. This avoids a potential infinite recursion. - now that files other than .bochsrc can be the rc file, print the actual name of the file in error messages.
2001-05-23 06:37:52 +04:00
if (!strcmp(action, "fatal"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_DEBUG, ACT_FATAL);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "report"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_DEBUG, ACT_REPORT);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else if (!strcmp (action, "ignore"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_DEBUG, ACT_IGNORE);
- added a new log action "ask" which sends the log message to the control panel. It gives the user the option of continue this time, continue and never ask again for this type of log message, or die. - the communication between control.cc and siminterface.cc is still somewhat crude. I'm trying to implement it so that a network protocol based on this interface will be simple. I'll get this cleaned up soon.
2001-06-11 18:03:35 +04:00
else if (!strcmp (action, "ask"))
- How to handle default log options has been somewhat confused for a long time, so I've tried to improve it. Now the logfunctions class has a static field default_onoff[] which represents the default actions for each kind of log message. Default_onoff[] is initialized with static data so it should be valid by the time it's used. This can be reached by static accesors logfunctions::set_default_action and logfunctions::get_default_action. It seemed appropriate to put the defaults inside the logfunctions class, rather than in bx_options or siminterface. However, to make them accessible to the config interface, I added similar methods in siminterface that map to the accessors in logfunctions. - logio.cc had two different definitions of LOG_THIS for different halves of the file, which was ugly and confusing. (LOG_THIS is needed for BX_INFO, BX_DEBUG, etc.) I removed the first definition and fixed the minor compile problems that ensued. In the initializers for iofunctions, everything is complicated because of the unpredictable order that constructors get called. They must use this->log to print things, because genlog hasn't been initialized yet. - now if SIM->set_log_action(int mod, int level, int action) is called with mod<0, it sets the action for all modules/devices instead of just one. - modified: bochs.h logio.cc main.cc gui/siminterface.cc gui/siminterface.h
2002-09-20 21:56:22 +04:00
SIM->set_default_log_action (LOGLEV_DEBUG, ACT_ASK);
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: debug directive malformed.", context));
- new, partially implemented, lines in .bochsrc allow run-time choice of what action to take on panic, error, info, and debug. The lines don't have any effect quite yet because of an initialization order problem with the logfunctions.
2001-05-23 00:01:40 +04:00
}
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "romimage")) {
if (num_params != 3) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: romimage directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "file=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: romimage directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[2], "address=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: romimage directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.rom.Opath->set (&params[1][5]);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if ( (params[2][8] == '0') && (params[2][9] == 'x') )
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.rom.Oaddress->set (strtoul (&params[2][8], NULL, 16));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.rom.Oaddress->set (strtoul (&params[2][8], NULL, 10));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
else if (!strcmp(params[0], "optromimage1")) {
if (num_params != 3) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage1 directive: wrong # args.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[1], "file=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage1 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[2], "address=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage2 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Opath->set (&params[1][5]);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
if ( (params[2][8] == '0') && (params[2][9] == 'x') )
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Oaddress->set (strtoul (&params[2][8], NULL, 16));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
else
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[0].Oaddress->set (strtoul (&params[2][8], NULL, 10));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
else if (!strcmp(params[0], "optromimage2")) {
if (num_params != 3) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage2 directive: wrong # args.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[1], "file=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage2 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[2], "address=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage2 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[1].Opath->set (&params[1][5]);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
if ( (params[2][8] == '0') && (params[2][9] == 'x') )
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[1].Oaddress->set (strtoul (&params[2][8], NULL, 16));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
else
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[1].Oaddress->set (strtoul (&params[2][8], NULL, 10));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
else if (!strcmp(params[0], "optromimage3")) {
if (num_params != 3) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage3 directive: wrong # args.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[1], "file=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage3 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[2], "address=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage2 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[2].Opath->set (&params[1][5]);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
if ( (params[2][8] == '0') && (params[2][9] == 'x') )
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[2].Oaddress->set (strtoul (&params[2][8], NULL, 16));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
else
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[2].Oaddress->set (strtoul (&params[2][8], NULL, 10));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
else if (!strcmp(params[0], "optromimage4")) {
if (num_params != 3) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage4 directive: wrong # args.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[1], "file=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage4 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
if (strncmp(params[2], "address=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: optromimage2 directive malformed.", context));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[3].Opath->set (&params[1][5]);
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
if ( (params[2][8] == '0') && (params[2][9] == 'x') )
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[3].Oaddress->set (strtoul (&params[2][8], NULL, 16));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
else
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
bx_options.optrom[3].Oaddress->set (strtoul (&params[2][8], NULL, 10));
- added options to use up to 4 optional romimages
2002-07-24 21:52:34 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "vgaromimage")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: vgaromimage directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.vgarom.Opath->set (params[1]);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(params[0], "vga_update_interval")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: vga_update_interval directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Ovga_update_interval->set (atol(params[1]));
if (bx_options.Ovga_update_interval->get () < 50000) {
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
BX_INFO(("%s: vga_update_interval seems awfully small!", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
else if (!strcmp(params[0], "keyboard_serial_delay")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: keyboard_serial_delay directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Okeyboard_serial_delay->set (atol(params[1]));
if (bx_options.Okeyboard_serial_delay->get () < 5) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR (("%s: keyboard_serial_delay not big enough!", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
else if (!strcmp(params[0], "keyboard_paste_delay")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: keyboard_paste_delay directive: wrong # args.", context));
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
}
bx_options.Okeyboard_paste_delay->set (atol(params[1]));
if (bx_options.Okeyboard_paste_delay->get () < 1000) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR (("%s: keyboard_paste_delay not big enough!", context));
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
}
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "megs")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: megs directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.memory.Osize->set (atol(params[1]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(params[0], "floppy_command_delay")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppy_command_delay directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Ofloppy_command_delay->set (atol(params[1]));
if (bx_options.Ofloppy_command_delay->get () < 100) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: floppy_command_delay not big enough!", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
else if (!strcmp(params[0], "ips")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ips directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Oips->set (atol(params[1]));
if (bx_options.Oips->get () < 200000) {
BX_ERROR(("%s: WARNING: ips is AWFULLY low!", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
else if (!strcmp(params[0], "max_ips")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: max_ips directive: wrong # args.", context));
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
}
- remove references to max_ips and system_clock_sync. If you need to revert, find patches/patch.remove-max-ips.
2001-10-07 04:58:10 +04:00
BX_INFO(("WARNING: max_ips not implemented"));
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
}
else if (!strcmp(params[0], "system_clock_sync")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: system_clock_sync directive malformed.", context));
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: system_clock_sync directive malformed.", context));
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
}
if (params[1][8] == '0' || params[1][8] == '1')
- remove references to max_ips and system_clock_sync. If you need to revert, find patches/patch.remove-max-ips.
2001-10-07 04:58:10 +04:00
BX_INFO (("WARNING: system_clock_sync not implemented"));
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
else
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: system_clock_sync directive malformed.", context));
- added two new bochsrc and control panel options: max_ips and system_clock_sync
2001-06-21 20:59:56 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "mouse")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: mouse directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: mouse directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
if (params[1][8] == '0' || params[1][8] == '1')
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Omouse_enabled->set (params[1][8] - '0');
- now ips, mouse_enabled, vga_update_interval, and rom_path are declared as bx_param_c * types in the bx_options structure. They are initialized in main.cc (bx_init_options) with default values. Access to parameters of this type should always be like this: bx_options.mouse_enabled->get (); bx_options.mouse_enabled->set (newval); Eventually I will be transferring all options to this format.
2001-06-17 03:08:32 +04:00
else
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: mouse directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(params[0], "private_colormap")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: private_colormap directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: private_colormap directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if (params[1][8] == '0' || params[1][8] == '1')
bx_options.Oprivate_colormap->set (params[1][8] - '0');
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: private_colormap directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
else if (!strcmp(params[0], "fullscreen")) {
ok, now the amiga target on cvs is complete
2001-08-16 16:35:52 +04:00
#if BX_WITH_AMIGAOS
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: fullscreen directive malformed.", context));
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: fullscreen directive malformed.", context));
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
}
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
if (params[1][8] == '0' || params[1][8] == '1') {
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
bx_options.Ofullscreen->set (params[1][8] - '0');
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
} else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: fullscreen directive malformed.", context));
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
}
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
#endif
}
else if (!strcmp(params[0], "screenmode")) {
ok, now the amiga target on cvs is complete
2001-08-16 16:35:52 +04:00
#if BX_WITH_AMIGAOS
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: screenmode directive malformed.", context));
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
}
if (strncmp(params[1], "name=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: screenmode directive malformed.", context));
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
}
bx_options.Oscreenmode->set (strdup(&params[1][5]));
#endif
- add option called fullscreen, for Nicholai Benalal's amiga port
2001-08-16 00:17:19 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "sb16")) {
for (i=1; i<num_params; i++) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Opresent->set (1);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (!strncmp(params[i], "midi=", 5)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Omidifile->set (strdup(&params[i][5]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "midimode=", 9)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Omidimode->set (atol(&params[i][9]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "wave=", 5)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Owavefile->set (strdup(&params[i][5]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "wavemode=", 9)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Owavemode->set (atol(&params[i][9]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "log=", 4)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Ologfile->set (strdup(&params[i][4]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "loglevel=", 9)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Ologlevel->set (atol(&params[i][9]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strncmp(params[i], "dmatimer=", 9)) {
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.sb16.Odmatimer->set (atol(&params[i][9]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
}
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
else if (!strcmp(params[0], "parport1")) {
for (i=1; i<num_params; i++) {
- parport1 enable/disable support added. Now you can control the presence of parport1 with the new option "enabled". The old option "enable" only controlled the output. The parport1 is enabled with no output by default. Changes: * bochrc option "enable" replaced by "enabled" * parport option "Oenable" replaced by "Opresent" * bx_parport_options par1 and par2 replaced by an array par[2] * initialize parport1 resources only when enabled * renamed variable "parport_init_list" to "par_ser_init_list" since it contains parport and serial options * documentation and bochsrc updates - the parport variables "output" and "initmode" now belong to the bx_par_t structure - TODO: add parport2 (disabled by default), parport detection in the bios
2002-08-24 14:20:35 +04:00
if (!strncmp(params[i], "enabled=", 8)) {
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
bx_options.par[0].Oenabled->set (atol(&params[i][8]));
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
}
else if (!strncmp(params[i], "file=", 5)) {
- parport1 enable/disable support added. Now you can control the presence of parport1 with the new option "enabled". The old option "enable" only controlled the output. The parport1 is enabled with no output by default. Changes: * bochrc option "enable" replaced by "enabled" * parport option "Oenable" replaced by "Opresent" * bx_parport_options par1 and par2 replaced by an array par[2] * initialize parport1 resources only when enabled * renamed variable "parport_init_list" to "par_ser_init_list" since it contains parport and serial options * documentation and bochsrc updates - the parport variables "output" and "initmode" now belong to the bx_par_t structure - TODO: add parport2 (disabled by default), parport detection in the bios
2002-08-24 14:20:35 +04:00
bx_options.par[0].Ooutfile->set (strdup(&params[i][5]));
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
bx_options.par[0].Oenabled->set (1);
}
else {
BX_ERROR(("%s: unknown parameter for parport1 ignored.", context));
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
}
}
}
#if 0
else if (!strcmp(params[0], "parport2")) {
for (i=1; i<num_params; i++) {
- parport1 enable/disable support added. Now you can control the presence of parport1 with the new option "enabled". The old option "enable" only controlled the output. The parport1 is enabled with no output by default. Changes: * bochrc option "enable" replaced by "enabled" * parport option "Oenable" replaced by "Opresent" * bx_parport_options par1 and par2 replaced by an array par[2] * initialize parport1 resources only when enabled * renamed variable "parport_init_list" to "par_ser_init_list" since it contains parport and serial options * documentation and bochsrc updates - the parport variables "output" and "initmode" now belong to the bx_par_t structure - TODO: add parport2 (disabled by default), parport detection in the bios
2002-08-24 14:20:35 +04:00
if (!strncmp(params[i], "enabled=", 8)) {
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
bx_options.par[1].Oenabled->set (atol(&params[i][8]));
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
}
else if (!strncmp(params[i], "file=", 5)) {
- parport1 enable/disable support added. Now you can control the presence of parport1 with the new option "enabled". The old option "enable" only controlled the output. The parport1 is enabled with no output by default. Changes: * bochrc option "enable" replaced by "enabled" * parport option "Oenable" replaced by "Opresent" * bx_parport_options par1 and par2 replaced by an array par[2] * initialize parport1 resources only when enabled * renamed variable "parport_init_list" to "par_ser_init_list" since it contains parport and serial options * documentation and bochsrc updates - the parport variables "output" and "initmode" now belong to the bx_par_t structure - TODO: add parport2 (disabled by default), parport detection in the bios
2002-08-24 14:20:35 +04:00
bx_options.par[1].Ooutfile->set (strdup(&params[i][5]));
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
bx_options.par[1].Oenabled->set (1);
}
else {
BX_ERROR(("%s: unknown parameter for parport2 ignored.", context));
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
}
}
}
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (!strcmp(params[0], "i440fxsupport")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: i440FXSupport directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: i440FXSupport directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (params[1][8] == '0')
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Oi440FXSupport->set (0);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (params[1][8] == '1')
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.Oi440FXSupport->set (1);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: i440FXSupport directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
else if (!strcmp(params[0], "newharddrivesupport")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: newharddrivesupport directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: newharddrivesupport directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (params[1][8] == '0')
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.OnewHardDriveSupport->set (0);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else if (params[1][8] == '1')
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.OnewHardDriveSupport->set (1);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: newharddrivesupport directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
else if (!strcmp(params[0], "cmosimage")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: cmosimage directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.cmos.Opath->set (strdup(params[1]));
bx_options.cmos.OcmosImage->set (1); // CMOS Image is true
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(params[0], "time0")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: time0 directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.cmos.Otime0->set (atoi(params[1]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
#ifdef MAGIC_BREAKPOINT
else if (!strcmp(params[0], "magic_break")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: magic_break directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "enabled=", 8)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: magic_break directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (params[1][8] == '0') {
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_INFO(("Ignoring magic break points"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
bx_dbg.magic_break_enabled = 0;
}
else if (params[1][8] == '1') {
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_INFO(("Stopping on magic break points"));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
bx_dbg.magic_break_enabled = 1;
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: magic_break directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
#endif
else if (!strcmp(params[0], "ne2k")) {
int tmp[6];
- add options to the string parameter class that allow it to deal with raw hex bytes, for the MAC address.
2001-06-21 23:27:05 +04:00
char tmpchar[6];
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Ovalid->set (0);
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
if ((num_params < 4) || (num_params > 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Oethmod->set ("null");
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (strncmp(params[1], "ioaddr=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[2], "irq=", 4)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[3], "mac=", 4)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Oioaddr->set (strtoul(&params[1][7], NULL, 16));
bx_options.ne2k.Oirq->set (atol(&params[2][4]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
i = sscanf(&params[3][4], "%x:%x:%x:%x:%x:%x",
&tmp[0],&tmp[1],&tmp[2],&tmp[3],&tmp[4],&tmp[5]);
if (i != 6) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k mac address malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
for (i=0;i<6;i++)
- add options to the string parameter class that allow it to deal with raw hex bytes, for the MAC address.
2001-06-21 23:27:05 +04:00
tmpchar[i] = (unsigned char)tmp[i];
bx_options.ne2k.Omacaddr->set (tmpchar);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (num_params > 4) {
if (strncmp(params[4], "ethmod=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Oethmod->set (strdup(&params[4][7]));
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
if (num_params > 5) {
if (strncmp(params[5], "ethdev=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
}
bx_options.ne2k.Oethdev->set (strdup(&params[5][7]));
if (num_params > 6) {
if (strncmp(params[6], "script=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: ne2k directive malformed.", context));
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
}
bx_options.ne2k.Oscript->set (strdup(&params[6][7]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
}
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
bx_options.ne2k.Ovalid->set (1);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(params[0], "load32bitOSImage")) {
if ( (num_params!=4) && (num_params!=5) ) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: load32bitOSImage directive: wrong # args.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[1], "os=", 3)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: load32bitOSImage: directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (!strcmp(&params[1][3], "nullkernel")) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.load32bitOSImage.OwhichOS->set (Load32bitOSNullKernel);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else if (!strcmp(&params[1][3], "linux")) {
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.load32bitOSImage.OwhichOS->set (Load32bitOSLinux);
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: load32bitOSImage: unsupported OS.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[2], "path=", 5)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: load32bitOSImage: directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
if (strncmp(params[3], "iolog=", 6)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: load32bitOSImage: directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.load32bitOSImage.Opath->set (strdup(&params[2][5]));
bx_options.load32bitOSImage.Oiolog->set (strdup(&params[3][6]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
if (num_params == 5) {
if (strncmp(params[4], "initrd=", 7)) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: load32bitOSImage: directive malformed.", context));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
bx_options.load32bitOSImage.Oinitrd->set (strdup(&params[4][7]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
}
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
else if (!strcmp(params[0], "keyboard_type")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: keyboard_type directive: wrong # args.", context));
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
}
if(strcmp(params[1],"xt")==0){
bx_options.Okeyboard_type->set (BX_KBD_XT_TYPE);
}
else if(strcmp(params[1],"at")==0){
bx_options.Okeyboard_type->set (BX_KBD_AT_TYPE);
}
else if(strcmp(params[1],"mf")==0){
bx_options.Okeyboard_type->set (BX_KBD_MF_TYPE);
}
else{
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: keyboard_type directive: wrong arg %s.", context,params[1]));
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
}
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
else if (!strcmp(params[0], "keyboard_mapping")
||!strcmp(params[0], "keyboardmapping")) {
for (i=1; i<num_params; i++) {
if (!strncmp(params[i], "enabled=", 8)) {
bx_options.keyboard.OuseMapping->set (atol(&params[i][8]));
}
else if (!strncmp(params[i], "map=", 4)) {
bx_options.keyboard.Okeymap->set (strdup(&params[i][4]));
}
- new "user" button added to the headerbar. It can send keyboard shortcuts to the guest OS. The shortcut can be defined in the bochsrc or in the config interface. It is possible to change it at runtime. These shortcuts are currently recognized: ctrlaltdel, ctrlaltesc, ctrlaltf1, alttab Here is the list of changes: * userbutton.h and userbutton.xpm added in gui/bitmaps * config options for the userbutton shortcut added * initialize the new button in the gui.cc * the new userbutton handler generates keypresses and relaeses depending on the shortcut keyword * the gui stops adding buttons to the headerbar if not enough space is left. This can happen when the screen width is 320 pixels (done for X11 only). * TODO: build a dialog box for the wxWindows gui
2002-08-09 10:16:43 +04:00
}
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
}
- new "user" button added to the headerbar. It can send keyboard shortcuts to the guest OS. The shortcut can be defined in the bochsrc or in the config interface. It is possible to change it at runtime. These shortcuts are currently recognized: ctrlaltdel, ctrlaltesc, ctrlaltf1, alttab Here is the list of changes: * userbutton.h and userbutton.xpm added in gui/bitmaps * config options for the userbutton shortcut added * initialize the new button in the gui.cc * the new userbutton handler generates keypresses and relaeses depending on the shortcut keyword * the gui stops adding buttons to the headerbar if not enough space is left. This can happen when the screen width is 320 pixels (done for X11 only). * TODO: build a dialog box for the wxWindows gui
2002-08-09 10:16:43 +04:00
else if (!strcmp(params[0], "user_shortcut")) {
if (num_params != 2) {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(("%s: user_shortcut directive: wrong # args.", context));
- new "user" button added to the headerbar. It can send keyboard shortcuts to the guest OS. The shortcut can be defined in the bochsrc or in the config interface. It is possible to change it at runtime. These shortcuts are currently recognized: ctrlaltdel, ctrlaltesc, ctrlaltf1, alttab Here is the list of changes: * userbutton.h and userbutton.xpm added in gui/bitmaps * config options for the userbutton shortcut added * initialize the new button in the gui.cc * the new userbutton handler generates keypresses and relaeses depending on the shortcut keyword * the gui stops adding buttons to the headerbar if not enough space is left. This can happen when the screen width is 320 pixels (done for X11 only). * TODO: build a dialog box for the wxWindows gui
2002-08-09 10:16:43 +04:00
}
if(!strncmp(params[1], "keys=", 4)) {
bx_options.Ouser_shortcut->set (strdup(&params[1][5]));
}
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
else {
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
PARSE_ERR(( "%s: directive '%s' not understood", context, params[0]));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- now parse_line_formatted and parse_line_unformatted return a signed int (0=success, -1=failure). If parse_line_unformatted returns failure, I stop parsing the bochsrc. - implement all parsing BX_PANICs with new PARSE_ERR macro, so that we can easily change the behavior of all parse errors at once. For now, I want it to BX_PANIC and then return -1 (case panic continues). Eventually I might turn it into BX_ERROR and return -1.
2002-09-25 22:31:38 +04:00
return 0;
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
static char *fdtypes[] = {
- added support for 360k floppy images * new floppy type 360k can be used in .bochsrc and the config interface * media type and geometry can be set for the floppy type * BIOS changes to make 360k floppy drives work * bximage can create 360k images now
2002-08-01 11:37:56 +04:00
"none", "1_2", "1_44", "2_88", "720k", "360k"
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
};
int
bx_write_floppy_options (FILE *fp, int drive, bx_floppy_options *opt)
{
BX_ASSERT (drive==0 || drive==1);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if (opt->Otype->get () == BX_FLOPPY_NONE) {
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "# no floppy%c\n", (char)'a'+drive);
return 0;
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_ASSERT (opt->Otype->get () > BX_FLOPPY_NONE && opt->Otype->get () <= BX_FLOPPY_LAST);
fprintf (fp, "floppy%c: %s=\"%s\", status=%s\n",
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
(char)'a'+drive,
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
fdtypes[opt->Otype->get () - BX_FLOPPY_NONE],
opt->Opath->getptr (),
- separation of floppy device type and media type started. This feature needs more work in the floppy and bios code. - floppy and cdrom entries in the runtime config menu can be disabled if the drive wasn't defined in bochsrc or start menu - floppy variable "initial_status" and cdrom variable "inserted" renamed to "status" - unused variable *ips in function build_runtime_options_prompt() disabled
2002-08-04 12:42:34 +04:00
opt->Ostatus->get ()==BX_EJECTED ? "ejected" : "inserted");
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
return 0;
}
int
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_write_ata_options (FILE *fp, Bit8u channel, bx_ata_options *opt)
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
{
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
fprintf (fp, "ata%d: enabled=%d", channel, opt->Opresent->get());
if (opt->Opresent->get()) {
fprintf (fp, ", ioaddr1=0x%x, ioaddr2=0x%x, irq=%d", opt->Oioaddr1->get(),
opt->Oioaddr2->get(), opt->Oirq->get());
}
fprintf (fp, "\n");
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
return 0;
}
int
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
bx_write_atadevice_options (FILE *fp, Bit8u channel, Bit8u drive, bx_atadevice_options *opt)
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
{
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
if (opt->Opresent->get()) {
fprintf (fp, "ata%d-%s: ", channel, drive==0?"master":"slave");
if (opt->Otype->get() == BX_ATA_DEVICE_DISK) {
fprintf (fp, "type=disk, path=\"%s\", cylinders=%d, heads=%d, spt=%d",
opt->Opath->getptr(), opt->Ocylinders->get(), opt->Oheads->get(), opt->Ospt->get());
switch(opt->Otranslation->get()) {
case BX_ATA_TRANSLATION_NONE:
fprintf (fp, ", translation=none");
break;
case BX_ATA_TRANSLATION_LBA:
fprintf (fp, ", translation=lba");
break;
case BX_ATA_TRANSLATION_LARGE:
fprintf (fp, ", translation=large");
break;
}
}
else if (opt->Otype->get() == BX_ATA_DEVICE_CDROM) {
fprintf (fp, "type=cdrom, path=\"%s\", status=%s",
opt->Opath->getptr(),
opt->Ostatus->get ()==BX_EJECTED ? "ejected" : "inserted");
}
switch(opt->Obiosdetect->get()) {
case BX_ATA_BIOSDETECT_NONE:
fprintf (fp, ", biosdetect=none");
break;
case BX_ATA_BIOSDETECT_CMOS:
fprintf (fp, ", biosdetect=cmos");
break;
case BX_ATA_BIOSDETECT_AUTO:
fprintf (fp, ", biosdetect=auto");
break;
}
if (strlen(opt->Omodel->getptr())>0) {
fprintf (fp, ", model=\"%s\"", opt->Omodel->getptr());
}
fprintf (fp, "\n");
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
}
return 0;
}
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
int
bx_write_parport_options (FILE *fp, bx_parport_options *opt, int n)
{
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
fprintf (fp, "parport%d: enabled=%d", n, opt->Oenabled->get ());
if (opt->Oenabled->get ()) {
- parport1 enable/disable support added. Now you can control the presence of parport1 with the new option "enabled". The old option "enable" only controlled the output. The parport1 is enabled with no output by default. Changes: * bochrc option "enable" replaced by "enabled" * parport option "Oenable" replaced by "Opresent" * bx_parport_options par1 and par2 replaced by an array par[2] * initialize parport1 resources only when enabled * renamed variable "parport_init_list" to "par_ser_init_list" since it contains parport and serial options * documentation and bochsrc updates - the parport variables "output" and "initmode" now belong to the bx_par_t structure - TODO: add parport2 (disabled by default), parport detection in the bios
2002-08-24 14:20:35 +04:00
fprintf (fp, ", file=\"%s\"", opt->Ooutfile->getptr ());
- allow configuration of the parallel port in .bochsrc and the config interface menus. Parallel port #1 is implemented, and I left stubs for parallel port #2 in case we want to ever add it. If the parallel port is enabled, the init method of parallel.cc does an fopen() on the output file. If disabled, or if the fopen fails, the file handler remains NULL and no characters are printed. There is no attempt to enable/disable the operation of the parallel port, only the output to a file.
2001-11-12 05:35:09 +03:00
}
fprintf (fp, "\n");
return 0;
}
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
int
bx_write_serial_options (FILE *fp, bx_serial_options *opt, int n)
{
fprintf (fp, "com%d: enabled=%d", n, opt->Oenabled->get ());
if (opt->Oenabled->get ()) {
fprintf (fp, ", dev=\"%s\"", opt->Odev->getptr ());
}
fprintf (fp, "\n");
return 0;
}
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
int
bx_write_sb16_options (FILE *fp, bx_sb16_options *opt)
{
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
if (!opt->Opresent->get ()) {
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "# no sb16\n");
return 0;
}
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
fprintf (fp, "sb16: midimode=%d, midi=%s, wavemode=%d, wave=%s, loglevel=%d, log=%s, dmatimer=%d\n", opt->Omidimode->get (), opt->Omidifile->getptr (), opt->Owavemode->get (), opt->Owavefile->getptr (), opt->Ologlevel->get (), opt->Ologfile->getptr (), opt->Odmatimer->get ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
return 0;
}
int
bx_write_ne2k_options (FILE *fp, bx_ne2k_options *opt)
{
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
if (!opt->Ovalid->get ()) {
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "# no ne2k\n");
return 0;
}
- add options to the string parameter class that allow it to deal with raw hex bytes, for the MAC address.
2001-06-21 23:27:05 +04:00
char *ptr = opt->Omacaddr->getptr ();
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
fprintf (fp, "ne2k: ioaddr=0x%x, irq=%d, mac=%02x:%02x:%02x:%02x:%02x:%02x, ethmod=%s, ethdev=%s, script=%s\n",
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
opt->Oioaddr->get (),
opt->Oirq->get (),
- fixed: mac addresses used to be printed as an 8-digit hex number. Now I AND each byte with 0xff before printing.
2001-06-25 11:12:45 +04:00
(unsigned int)(0xff & ptr[0]),
(unsigned int)(0xff & ptr[1]),
(unsigned int)(0xff & ptr[2]),
(unsigned int)(0xff & ptr[3]),
(unsigned int)(0xff & ptr[4]),
(unsigned int)(0xff & ptr[5]),
- converted ne2k and sb16 to new style parameters and control panel, except for MAC address of the ne2k, which is next.
2001-06-21 22:34:50 +04:00
opt->Oethmod->getptr (),
- added a script directive in ne2k options of .bochsrc - added the script directive management for ne2k options - added the execution of the script (if defined and not 'none') after init of the tun device
2002-05-02 11:54:22 +04:00
opt->Oethdev->getptr (),
opt->Oscript->getptr ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
return 0;
}
int
bx_write_loader_options (FILE *fp, bx_load32bitOSImage_t *opt)
{
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if (opt->OwhichOS->get () == 0) {
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "# no loader\n");
return 0;
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
BX_ASSERT(opt->OwhichOS->get () == Load32bitOSLinux || opt->OwhichOS->get () == Load32bitOSNullKernel);
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "load32bitOSImage: os=%s, path=%s, iolog=%s, initrd=%s\n",
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
(opt->OwhichOS->get () == Load32bitOSLinux) ? "linux" : "nullkernel",
opt->Opath->getptr (),
opt->Oiolog->getptr (),
opt->Oinitrd->getptr ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
return 0;
}
int
bx_write_log_options (FILE *fp, bx_log_options *opt)
{
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
fprintf (fp, "log: %s\n", opt->Ofilename->getptr ());
I reworked and included Carl's patch to have a new bochsrc directive to describe the format of the log prefix. This option can be any string with special tokens being replaced at run time : # %t : 11 decimal digits timer tick # %i : 8 hexadecimal digits of cpu0 current eip # %e : 1 character event type ('i'nfo, 'd'ebug, 'p'anic, 'e'rror) # %d : 5 characters string of the device, between brackets the default is "%t%i%d", so the logprefix is the same as before. New tokens can be easily added or changed if needed. Modified Files: .bochsrc bochs.h logio.cc main.cc gui/control.cc gui/siminterface.h gui/siminterface.cc patches/patch.logfilefmteip
2002-06-26 18:42:35 +04:00
fprintf (fp, "logprefix: %s\n", opt->Oprefix->getptr ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "panic: action=%s\n",
- sync up control.cc (text mode config interface) with wxmain.cc (wxWindows interface) by using get/set_default_log_action. This has very minimal effect on the behavior of the text config interface. - modified: main.cc gui/control.cc
2002-09-20 22:14:27 +04:00
io->getaction(logfunctions::get_default_action (LOGLEV_PANIC)));
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "error: action=%s\n",
- sync up control.cc (text mode config interface) with wxmain.cc (wxWindows interface) by using get/set_default_log_action. This has very minimal effect on the behavior of the text config interface. - modified: main.cc gui/control.cc
2002-09-20 22:14:27 +04:00
io->getaction(logfunctions::get_default_action (LOGLEV_ERROR)));
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "info: action=%s\n",
- sync up control.cc (text mode config interface) with wxmain.cc (wxWindows interface) by using get/set_default_log_action. This has very minimal effect on the behavior of the text config interface. - modified: main.cc gui/control.cc
2002-09-20 22:14:27 +04:00
io->getaction(logfunctions::get_default_action (LOGLEV_INFO)));
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fprintf (fp, "debug: action=%s\n",
- sync up control.cc (text mode config interface) with wxmain.cc (wxWindows interface) by using get/set_default_log_action. This has very minimal effect on the behavior of the text config interface. - modified: main.cc gui/control.cc
2002-09-20 22:14:27 +04:00
io->getaction(logfunctions::get_default_action (LOGLEV_DEBUG)));
- clean up compiler warnings
2001-06-12 00:39:05 +04:00
return 0;
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
}
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
int
bx_write_keyboard_options (FILE *fp, bx_keyboard_options *opt)
{
fprintf (fp, "keyboard_mapping: enabled=%d, map=%s\n", opt->OuseMapping->get(), opt->Okeymap->getptr());
return 0;
}
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
// return values:
// 0: written ok
// -1: failed
// -2: already exists, and overwrite was off
int
bx_write_configuration (char *rc, int overwrite)
{
BX_INFO (("write configuration to %s\n", rc));
// check if it exists. If so, only proceed if overwrite is set.
FILE *fp = fopen (rc, "r");
if (fp != NULL) {
fclose (fp);
if (!overwrite) return -2;
}
fp = fopen (rc, "w");
if (fp == NULL) return -1;
// finally it's open and we can start writing.
fprintf (fp, "# configuration file generated by Bochs\n");
// it would be nice to put this type of function as methods on
// the structs like bx_floppy_options::print or something.
bx_write_floppy_options (fp, 0, &bx_options.floppya);
bx_write_floppy_options (fp, 1, &bx_options.floppyb);
- applied patch.4ata-channels and patch.4ata-channels.bbd - Features : . number of active channels defined at boot-time config . new options in bochsrc . up to 8 devices support (disks or cdroms) . up to 4 cdrom devices can be changed at runtime config . wxwindows config interface
2002-09-23 00:56:12 +04:00
for (Bit8u channel=0; channel<BX_MAX_ATA_CHANNEL; channel++) {
bx_write_ata_options (fp, channel, &bx_options.ata[channel]);
bx_write_atadevice_options (fp, channel, 0, &bx_options.atadevice[channel][0]);
bx_write_atadevice_options (fp, channel, 1, &bx_options.atadevice[channel][1]);
}
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if (strlen (bx_options.rom.Opath->getptr ()) > 0)
fprintf (fp, "romimage: file=%s, address=0x%05x\n", bx_options.rom.Opath->getptr(), (unsigned int)bx_options.rom.Oaddress->get ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
else
fprintf (fp, "# no romimage\n");
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
if (strlen (bx_options.vgarom.Opath->getptr ()) > 0)
fprintf (fp, "vgaromimage: %s\n", bx_options.vgarom.Opath->getptr ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
else
fprintf (fp, "# no vgaromimage\n");
- moved optrom[1-4] options to an array of 4 elements. Option reading/writing should really be done in a for loop. This was just a test to check if the new ata options could be handled that way.
2002-08-23 02:38:40 +04:00
if (strlen (bx_options.optrom[0].Opath->getptr ()) > 0)
fprintf (fp, "optromimage1: file=%s, address=0x%05x\n", bx_options.optrom[0].Opath->getptr(), (unsigned int)bx_options.optrom[0].Oaddress->get ());
if (strlen (bx_options.optrom[1].Opath->getptr ()) > 0)
fprintf (fp, "optromimage2: file=%s, address=0x%05x\n", bx_options.optrom[1].Opath->getptr(), (unsigned int)bx_options.optrom[1].Oaddress->get ());
if (strlen (bx_options.optrom[2].Opath->getptr ()) > 0)
fprintf (fp, "optromimage3: file=%s, address=0x%05x\n", bx_options.optrom[2].Opath->getptr(), (unsigned int)bx_options.optrom[2].Oaddress->get ());
if (strlen (bx_options.optrom[3].Opath->getptr ()) > 0)
fprintf (fp, "optromimage4: file=%s, address=0x%05x\n", bx_options.optrom[3].Opath->getptr(), (unsigned int)bx_options.optrom[3].Oaddress->get ());
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
fprintf (fp, "megs: %d\n", bx_options.memory.Osize->get ());
- parport1 enable/disable support added. Now you can control the presence of parport1 with the new option "enabled". The old option "enable" only controlled the output. The parport1 is enabled with no output by default. Changes: * bochrc option "enable" replaced by "enabled" * parport option "Oenable" replaced by "Opresent" * bx_parport_options par1 and par2 replaced by an array par[2] * initialize parport1 resources only when enabled * renamed variable "parport_init_list" to "par_ser_init_list" since it contains parport and serial options * documentation and bochsrc updates - the parport variables "output" and "initmode" now belong to the bx_par_t structure - TODO: add parport2 (disabled by default), parport detection in the bios
2002-08-24 14:20:35 +04:00
bx_write_parport_options (fp, &bx_options.par[0], 1);
//bx_write_parport_options (fp, &bx_options.par[1], 2);
- renamed serial and parallel options "Opresent" to "Oenabled" and "*_PRESENT" to "*_ENABLED" - bx_serial_options for all 4 ports moved into an array com[4] - serial port com1 is enabled by default - detection of com2, com3 and com4 config options disabled for now - new parameter "enabled" added to the serial bochsrc options - error handling for serial and parallel bochsrc options changed. The unhandled BX_PANICs are replaced by BX_ERRORs. - new function bx_write_serial_options() added - serial destructor restores original terminal settings only when serial port is enabled and the tty_id is valid
2002-08-24 21:11:33 +04:00
bx_write_serial_options (fp, &bx_options.com[0], 1);
//bx_write_serial_options (fp, &bx_options.com[1], 2);
//bx_write_serial_options (fp, &bx_options.com[2], 3);
//bx_write_serial_options (fp, &bx_options.com[3], 4);
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
bx_write_sb16_options (fp, &bx_options.sb16);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
int bootdrive = bx_options.Obootdrive->get ();
- added "floppy" and "disk" as available directive to the boot: option - legacy "c" and "a" are still supported
2002-09-24 13:50:16 +04:00
fprintf (fp, "boot: %s\n", (bootdrive==BX_BOOT_FLOPPYA) ? "floppy" : (bootdrive==BX_BOOT_DISKC) ? "disk" : "cdrom");
- floppy boot signature stuff fixed * added "skip" to the label of the configuration option * write the option "disabled" into the config file, not "enabled"
2002-05-25 17:16:55 +04:00
fprintf (fp, "floppy_bootsig_check: disabled=%d\n", bx_options.OfloppySigCheck->get ());
- tweaks to get rid of compile warnings
2001-09-11 20:56:48 +04:00
fprintf (fp, "vga_update_interval: %u\n", bx_options.Ovga_update_interval->get ());
fprintf (fp, "keyboard_serial_delay: %u\n", bx_options.Okeyboard_serial_delay->get ());
- apply Christophe's patch.paste-for-dos. I will make minor tweaks as separate revisions.
2002-03-26 16:51:48 +03:00
fprintf (fp, "keyboard_paste_delay: %u\n", bx_options.Okeyboard_paste_delay->get ());
- tweaks to get rid of compile warnings
2001-09-11 20:56:48 +04:00
fprintf (fp, "floppy_command_delay: %u\n", bx_options.Ofloppy_command_delay->get ());
- correct problem in the ips line when saving a bochsrc, which I clumsily added in 1.71 or so.
2001-10-08 06:02:47 +04:00
fprintf (fp, "ips: %u\n", bx_options.Oips->get ());
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
fprintf (fp, "mouse: enabled=%d\n", bx_options.Omouse_enabled->get ());
fprintf (fp, "private_colormap: enabled=%d\n", bx_options.Oprivate_colormap->get ());
ok, now the amiga target on cvs is complete
2001-08-16 16:35:52 +04:00
#if BX_WITH_AMIGAOS
- add string parameter called screenmode - put #if BX_USE_AMIGAOS...#endif around fullscreen and screenmode, since they only apply to amiga
2001-08-16 06:00:31 +04:00
fprintf (fp, "fullscreen: enabled=%d\n", bx_options.Ofullscreen->get ());
fprintf (fp, "screenmode: name=\"%s\"\n", bx_options.Oscreenmode->getptr ());
#endif
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
fprintf (fp, "i440fxsupport: enabled=%d\n", bx_options.Oi440FXSupport->get ());
fprintf (fp, "time0: %u\n", bx_options.cmos.Otime0->get ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
bx_write_ne2k_options (fp, &bx_options.ne2k);
- convert nearly all bx_options to parameter form. All options that have been converted into parameters temporarily have the letter "O" appended to their name. I don't want to keep it this way, but it has helped in the conversion process because the compiler refuses to compile the old uses of the name. Before I started using the "O" trick, there were many bugs like this: if (bx_options.diskc.present) {...} This was legal with the new parameters, but it was testing whether the parameter structure had been created, instead of testing the value of the present parameter. Renaming present to Opresent turns this into a compile error, which points out the incorrect use of the param. - the "--disable-control-panel" no longer works, I'm afraid. I can no longer support this and continue progress.
2001-06-20 18:01:39 +04:00
fprintf (fp, "newharddrivesupport: enabled=%d\n", bx_options.OnewHardDriveSupport->get ());
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
bx_write_loader_options (fp, &bx_options.load32bitOSImage);
bx_write_log_options (fp, &bx_options.log);
- Added XFree86 keyboard mapping (us, fr, de)
2001-12-14 20:56:37 +03:00
bx_write_keyboard_options (fp, &bx_options.keyboard);
. Added a keyboard_type option in configuration file . Modified answer of keyboard controler to a keyboard-identify command depending on keyboard_type . Added the keyboard_type option in bochsrc man page
2001-12-12 13:43:36 +03:00
fprintf (fp, "keyboard_type: %s\n", bx_options.Okeyboard_type->get ()==BX_KBD_XT_TYPE?"xt":
bx_options.Okeyboard_type->get ()==BX_KBD_AT_TYPE?"at":"mf");
- implemented bx_write_configuration which, for the first time ever, writes a bochsrc for you. - since there were two options related to logging, I moved them both into a new struct called bx_log_options. This follows the pattern used by other devices. - in control.cc: removed option 1 from main menu, the one that said "Read options from bochsrc.txt." This was identical to choosing the next option, "Read options from..." and only saved you one keystroke, so I removed it.
2001-06-11 10:35:18 +04:00
fclose (fp);
return 0;
}
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#endif // #if BX_PROVIDE_MAIN
void
bx_signal_handler( int signum)
{
- fix signal handling in wxWindows. The problem was that a signal gets delivered to both the GUI and simulator thread, so they both call bx_signal_handler. This can lead to deadlock as multiple threads enter BX_PANIC and try to show a dialog box at once. To solve the problem, I made a function isSimThread() which can be called from anywhere. If the bx_signal_handler is called from any thread OTHER THAN the simulation thread, it returns without doing anything. As a result, only one thread is allowed to enter the signal handler code, and now control-C works correctly.
2002-09-05 11:48:39 +04:00
#if BX_WITH_WX
// in a multithreaded environment, a signal such as SIGINT can be sent to all
// threads. This function is only intended to handle signals in the
// simulator thread. It will simply return if called from any other thread.
// Otherwise the BX_PANIC() below can be called in multiple threads at
// once, leading to multiple threads trying to display a dialog box,
// leading to GUI deadlock.
if (!isSimThread ()) {
BX_INFO (("bx_signal_handler: ignored sig %d because it wasn't called from the simulator thread", signum));
return;
}
#endif
- give the GUI signal handler first priority (before, BX_SHOW_IPS took precedence). This allows GUIs which want to take over SIGALRM to do so. Presently, no GUI uses this.
2001-05-09 00:18:05 +04:00
#if BX_GUI_SIGHANDLER
// GUI signal handler gets first priority, if the mask says it's wanted
if ((1<<signum) & bx_gui.get_sighandler_mask ()) {
bx_gui.sighandler (signum);
return;
}
#endif
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
#if BX_SHOW_IPS
extern unsigned long ips_count;
if (signum == SIGALRM ) {
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_INFO(("ips = %lu", ips_count));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
ips_count = 0;
#ifndef __MINGW32__
signal(SIGALRM, bx_signal_handler);
alarm( 1 );
#endif
return;
}
#endif
- merged BRANCH-smp-bochs into main branch. For details see comments in BRANCH-smp-bochs revisions. - The general task was to make multiple CPU's which communicate through their APICs. So instead of BX_CPU and BX_MEM, we now have BX_CPU(x) and BX_MEM(y). For an SMP simulation you have several processors in a shared memory space, so there might be processors BX_CPU(0..3) but only one memory space BX_MEM(0). For cosimulation, you could have BX_CPU(0) with BX_MEM(0), then BX_CPU(1) with BX_MEM(1). WARNING: Cosimulation is almost certainly broken by the SMP changes. - to simulate multiple CPUs, you have to give each CPU time to execute in turn. This is currently implemented using debugger guards. The cpu loop steps one CPU for a few instructions, then steps the next CPU for a few instructions, etc. - there is some limited support in the debugger for two CPUs, for example printing information from each CPU when single stepping.
2001-05-23 12:16:07 +04:00
#if BX_GUI_SIGHANDLER
if ((1<<signum) & bx_gui.get_sighandler_mask ()) {
bx_gui.sighandler (signum);
return;
}
#endif
strip '\n' from BX_{INFO,DEBUG,ERROR,PANIC} don't need it, moved the output of it into the general io functions. saves space, as well as removes the confusing output if a '\n' is left off
2001-05-30 22:56:02 +04:00
BX_PANIC(("SIGNAL %u caught", signum));
- entered original Bochs snapshot bochs-2000_0325a.tar.gz from ftp.bochs.com
2001-04-10 05:04:59 +04:00
}
merge in BRANCH-io-cleanup. To see the commit logs for this use either cvsweb or cvs update -r BRANCH-io-cleanup and then 'cvs log' the various files. In general this provides a generic interface for logging. logfunctions:: is a class that is inherited by some classes, and also . allocated as a standalone global called 'genlog'. All logging uses . one of the ::info(), ::error(), ::ldebug(), ::panic() methods of this . class through 'BX_INFO(), BX_ERROR(), BX_DEBUG(), BX_PANIC()' macros . respectively. . . An example usage: . BX_INFO(("Hello, World!\n")); iofunctions:: is a class that is allocated once by default, and assigned as the iofunction of each logfunctions instance. It is this class that maintains the file descriptor and other output related code, at this point using vfprintf(). At some future point, someone may choose to write a gui 'console' for bochs to which messages would be redirected simply by assigning a different iofunction class to the various logfunctions objects. More cleanup is coming, but this works for now. If you want to see alot of debugging output, in main.cc, change onoff[LOGLEV_DEBUG]=0 to =1. Comments, bugs, flames, to me: todd@fries.net
2001-05-15 18:49:57 +04:00
Reference in New Issue Copy Permalink