diff --git a/bochs/.bochsrc b/bochs/.bochsrc index f332573ae..2f1286445 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -88,8 +88,25 @@ romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000 # without SMP support, it won't accept values different from 1. # # IPS: -# Emulated Instructions Per Second. See description under option IPS: -# more below. +# Emulated Instructions Per Second. This is the number of IPS that bochs +# is capable of running on your machine. You can recompile Bochs with +# --enable-show-ips option enabled, to find your workstation's capability. +# Measured IPS value will then be logged into your log file. +# +# IPS is used to calibrate many time-dependent events within the bochs +# simulation. For example, changing IPS affects the frequency of VGA +# updates, the duration of time before a key starts to autorepeat, and +# the measurement of BogoMips and other benchmarks. +# +# Examples: +# Machine Mips +# ________________________________________________________________ +# 2.1Ghz Athlon XP with Linux 2.6/g++ 3.4 12 to 15 Mips +# 1.6Ghz Intel P4 with Win2000/g++ 3.3 5 to 7 Mips +# 650Mhz Athlon K-7 with Linux 2.4.4/egcs-2.91.66 2 to 2.5 Mips +# 400Mhz Pentium II with Linux 2.0.36/egcs-1.0.3 1 to 1.8 Mips +# 166Mhz 64bit Sparc with Solaris 2.x approx 0.75 Mips +# 200Mhz Pentium with Linux 2.x approx 0.5 Mips #======================================================================= cpu: count=1, ips=10000000 @@ -274,30 +291,6 @@ ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, sp #boot: floppy boot: disk -#======================================================================= -# IPS: -# Emulated Instructions Per Second. This is the number of IPS that bochs -# is capable of running on your machine. You can recompile Bochs with -# --enable-show-ips option enabled, to find your workstation's capability. -# Measured IPS value will then be logged into your log file. -# -# IPS is used to calibrate many time-dependent events within the bochs -# simulation. For example, changing IPS affects the frequency of VGA -# updates, the duration of time before a key starts to autorepeat, and -# the measurement of BogoMips and other benchmarks. -# -# Examples: -# Machine Mips -# ________________________________________________________________ -# 1.6Ghz Intel P4 with Win2000/g++ 3.3 5 to 7 Mips -# 650Mhz Athlon K-7 with Linux 2.4.4/egcs-2.91.66 2 to 2.5 Mips -# 400Mhz Pentium II with Linux 2.0.36/egcs-1.0.3 1 to 1.8 Mips -# 166Mhz 64bit Sparc with Solaris 2.x approx 0.75 Mips -# 200Mhz Pentium with Linux 2.x approx 0.5 Mips -# -#======================================================================= -ips: 10000000 - #======================================================================= # CLOCK: # This defines the parameters of the clock inside Bochs: @@ -482,7 +475,7 @@ parport1: enabled=1, file="parport.out" # dmatimer: # microseconds per second for a DMA cycle. Make it smaller to fix # non-continuous sound. 750000 is usually a good value. This needs a -# reasonably correct setting for IPS. +# reasonably correct setting for the IPS parameter of the CPU option. # # For an example look at the next line: #======================================================================= @@ -493,8 +486,8 @@ parport1: enabled=1, file="parport.out" # VGA_UPDATE_INTERVAL: # Video memory is scanned for updates and screen updated every so many # virtual seconds. The default is 40000, about 25Hz. Keep in mind that -# you must tweak the 'ips:' directive to be as close to the number of -# emulated instructions-per-second your workstation can do, for this +# you must tweak the 'cpu: ips=N' directive to be as close to the number +# of emulated instructions-per-second your workstation can do, for this # to be accurate. # # Examples: @@ -727,6 +720,13 @@ keyboard_mapping: enabled=0, map= #======================================================================= #gdbstub: enabled=0, port=1234, text_base=0, data_base=0, bss_base=0 +#======================================================================= +# IPS: +# The IPS directive is DEPRECATED. Use the parameter IPS of the CPU +# directive instead. +#======================================================================= +#ips: 10000000 + #======================================================================= # for Macintosh, use the style of pathnames in the following # examples. diff --git a/bochs/config.cc b/bochs/config.cc index 5086b970b..e4d6c94ad 100755 --- a/bochs/config.cc +++ b/bochs/config.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: config.cc,v 1.69 2006-01-23 18:39:10 sshwarts Exp $ +// $Id: config.cc,v 1.70 2006-01-25 20:07:35 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -2742,9 +2742,9 @@ static Bit32s parse_line_formatted(char *context, int num_params, char *params[] PARSE_ERR (("%s: keyboard_paste_delay not big enough!", context)); } } else if (!strcmp(params[0], "floppy_command_delay")) { - PARSE_WARN(("%s: floppy_command_delay is deprecated (now using hardware timing).", context)); + PARSE_WARN(("%s: floppy_command_delay is DEPRECATED (now using hardware timing).", context)); } else if (!strcmp(params[0], "ips")) { - PARSE_WARN(("%s: ips directive is deprecated (use cpu directive parameter 'ips').", context)); + PARSE_WARN(("%s: ips directive is DEPRECATED (use cpu directive parameter 'ips').", context)); if (num_params != 2) { PARSE_ERR(("%s: ips directive: wrong # args.", context)); } @@ -2904,9 +2904,9 @@ static Bit32s parse_line_formatted(char *context, int num_params, char *params[] } else if (!strncmp(params[i], "option2=", 6)) { bx_options.usb[idx].Ooption2->set (strdup(¶ms[i][6])); } else if (!strncmp(params[i], "ioaddr=", 7)) { - PARSE_WARN(("%s: usb ioaddr is now deprecated (assigned by BIOS).", context)); + PARSE_WARN(("%s: usb ioaddr is now DEPRECATED (assigned by BIOS).", context)); } else if (!strncmp(params[i], "irq=", 4)) { - PARSE_WARN(("%s: usb irq is now deprecated (assigned by BIOS).", context)); + PARSE_WARN(("%s: usb irq is now DEPRECATED (assigned by BIOS).", context)); } else { PARSE_WARN(("%s: unknown parameter '%s' for usb%d ignored.", context, params[i], idx+1)); } @@ -3114,9 +3114,9 @@ static Bit32s parse_line_formatted(char *context, int num_params, char *params[] if (!strncmp(params[i], "enabled=", 8)) { if (atol(¶ms[i][8]) == 0) valid |= 0x80; } else if (!strncmp(params[i], "ioaddr=", 7)) { - PARSE_WARN(("%s: pnic ioaddr is now deprecated (assigned by BIOS).", context)); + PARSE_WARN(("%s: pnic ioaddr is now DEPRECATED (assigned by BIOS).", context)); } else if (!strncmp(params[i], "irq=", 4)) { - PARSE_WARN(("%s: pnic irq is now deprecated (assigned by BIOS).", context)); + PARSE_WARN(("%s: pnic irq is now DEPRECATED (assigned by BIOS).", context)); } else if (!strncmp(params[i], "mac=", 4)) { n = sscanf(¶ms[i][4], "%x:%x:%x:%x:%x:%x", &tmp[0],&tmp[1],&tmp[2],&tmp[3],&tmp[4],&tmp[5]); @@ -3245,11 +3245,11 @@ static Bit32s parse_line_formatted(char *context, int num_params, char *params[] // Old timing options have been replaced by the 'clock' option else if (!strcmp(params[0], "pit")) // Deprecated { - PARSE_ERR(("WARNING: pit directive is deprecated, use clock: instead")); + PARSE_ERR(("ERROR: pit directive is DEPRECATED, use clock: instead")); } else if (!strcmp(params[0], "time0")) // Deprectated { - PARSE_ERR(("WARNING: time0 directive is deprecated, use clock: instead")); + PARSE_ERR(("ERROR: time0 directive is DEPRECATED, use clock: instead")); } else { diff --git a/bochs/doc/docbook/user/user.dbk b/bochs/doc/docbook/user/user.dbk index e550392bd..cfd5c8791 100644 --- a/bochs/doc/docbook/user/user.dbk +++ b/bochs/doc/docbook/user/user.dbk @@ -1,7 +1,7 @@