applying SF patch #545 Speling fixes
This commit is contained in:
parent
d7d80aa61c
commit
96e2c50bef
@ -159,7 +159,7 @@
|
||||
# IGNORE_BAD_MSRS:
|
||||
# Ignore MSR references that Bochs does not understand; print a warning
|
||||
# message instead of generating #GP exception. This option is enabled
|
||||
# by default but will not be avaiable if configurable MSRs are enabled.
|
||||
# by default but will not be available if configurable MSRs are enabled.
|
||||
#
|
||||
# MWAIT_IS_NOP:
|
||||
# When this option is enabled MWAIT will not put the CPU into a sleep state.
|
||||
@ -435,7 +435,7 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
|
||||
# This defines the Voodoo Graphics emulation (experimental). Currently
|
||||
# supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The
|
||||
# Voodoo2 support is not yet complete, but almost usable. The Banshee and
|
||||
# Voodoo3 support is under construction, but basicly usable. The 2D/3D cards
|
||||
# Voodoo3 support is under construction, but basically usable. The 2D/3D cards
|
||||
# require an external VGA BIOS the vga extension option to be set to 'voodoo'.
|
||||
# If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5).
|
||||
# The gui screen update timing for all models is controlled by the related 'vga'
|
||||
@ -1118,7 +1118,7 @@ speaker: enabled=1, mode=sound
|
||||
# The optionsX parameter can be used to assign specific options to the device
|
||||
# connected to the corresponding USB port. Currently this feature is used to
|
||||
# set the speed reported by device ('low', 'full', 'high' or 'super'). The
|
||||
# availabe speed choices depend on both HC and device. The option 'debug' turns
|
||||
# available speed choices depend on both HC and device. The option 'debug' turns
|
||||
# on debug output for the device at connection time.
|
||||
# For the USB 'disk' device the optionsX parameter can be used to specify an
|
||||
# alternative redolog file (journal) of some image modes. For 'vvfat' mode USB
|
||||
|
@ -53,7 +53,7 @@ Detailed change log :
|
||||
- Voodoo2 model now working after some fixes and implementation of the
|
||||
CMDFIFO (using FIFO thread) and one of the bitBLT functions.
|
||||
- Added Voodoo Banshee / Voodoo3 emulation support (still under construction,
|
||||
but basicly usable). The AGP models are available if chipset is i440BX.
|
||||
but basically usable). The AGP models are available if chipset is i440BX.
|
||||
- Display (general)
|
||||
- Added basic DDC support for Bochs VBE, Cirrus and Voodoo Banshee / Voodoo3
|
||||
adapters (reporting plug&play monitor "Bochs Screen").
|
||||
@ -1103,7 +1103,7 @@ Detailed change log :
|
||||
[2905385] Bochs crash
|
||||
[2901481] Instruction SYSRET and SS(PL)
|
||||
[2900632] Broken long mode RETF to outer priviledge with null SS
|
||||
[1429011] Use bx_phyaddr_t for physaddr vars and bx_adress for lin adr
|
||||
[1429011] Use bx_phyaddr_t for physaddr vars and bx_address for lin adr
|
||||
|
||||
- these S.F. feature requests were closed/implemented
|
||||
[2955911] RPM preuninstall scriptlet removes /core
|
||||
@ -2010,7 +2010,7 @@ Detailed change log :
|
||||
|
||||
- CPU
|
||||
- fixed XMM registers restore in FXRSTOR instruction (Andrej Palkovsky)
|
||||
- print registers dump to the log if tripple fault occured
|
||||
- print registers dump to the log if tripple fault occurred
|
||||
- fixed PANIC in LTR instruction (Stanislav)
|
||||
- added virtual 8086 mode extensions (VME) implementation, to enable
|
||||
configure with --enable-vme (Stanislav)
|
||||
@ -2528,7 +2528,7 @@ Detailed change log :
|
||||
#1112836 PGE-Bit crashes Bochs
|
||||
#947586 The specification difference in x86-64 emulation
|
||||
#1117145 Push reset Button, APIC0 Error occur
|
||||
#1123043 fpu stack pointer changed *despite* fault occured (e.g. #pf)
|
||||
#1123043 fpu stack pointer changed *despite* fault occurred (e.g. #pf)
|
||||
#1122066 PANIC: iret: IP > descriptor limit when installing os/2 warp
|
||||
#809574 rm -f segfaults
|
||||
#593952 SuSE rm segfaults
|
||||
@ -2706,7 +2706,7 @@ Changes in 2.1.1 (February 8, 2004):
|
||||
- notify display libraries on change of bpp (Volker)
|
||||
- fix bug in int13h function 0x10 (Volker)
|
||||
- fix floppy dialog error on win2k (Volker)
|
||||
- fix adress check in TSS IO permission bitmap (Christophe)
|
||||
- fix address check in TSS IO permission bitmap (Christophe)
|
||||
- fix buffer overflow vulnerability pointed out by SeSoX (Christophe)
|
||||
- updates for MacOS compile (Daniel Gimpelevich)
|
||||
|
||||
|
@ -561,11 +561,11 @@ void bx_dbg_exception(unsigned cpu, Bit8u vector, Bit16u error_code)
|
||||
if (BX_CPU(dbg_cpu)->trace || bx_dbg.exceptions)
|
||||
{
|
||||
if (vector <= BX_XM_EXCEPTION) {
|
||||
dbg_printf("CPU %d: Exception 0x%02x - %s occured (error_code=0x%04x)\n",
|
||||
dbg_printf("CPU %d: Exception 0x%02x - %s occurred (error_code=0x%04x)\n",
|
||||
cpu, vector, exception[vector], error_code);
|
||||
}
|
||||
else {
|
||||
dbg_printf("CPU %d: Exception 0x%02x occured (error_code=0x%04x)\n",
|
||||
dbg_printf("CPU %d: Exception 0x%02x occurred (error_code=0x%04x)\n",
|
||||
cpu, vector, error_code);
|
||||
}
|
||||
}
|
||||
@ -575,7 +575,7 @@ void bx_dbg_interrupt(unsigned cpu, Bit8u vector, Bit16u error_code)
|
||||
{
|
||||
if (BX_CPU(dbg_cpu)->trace || bx_dbg.interrupts)
|
||||
{
|
||||
dbg_printf("CPU %d: Interrupt 0x%02x occured (error_code=0x%04x)\n",
|
||||
dbg_printf("CPU %d: Interrupt 0x%02x occurred (error_code=0x%04x)\n",
|
||||
cpu, vector, error_code);
|
||||
}
|
||||
}
|
||||
@ -2781,7 +2781,7 @@ void bx_dbg_restore_command(const char *param_name, const char *restore_path)
|
||||
dbg_printf("restoring param (%s) state from file (%s/%s)\n",
|
||||
param_name, path, param_name);
|
||||
if (! SIM->restore_bochs_param(SIM->get_bochs_root(), path, param_name)) {
|
||||
dbg_printf("Error: error occured during restore\n");
|
||||
dbg_printf("Error: error occurred during restore\n");
|
||||
}
|
||||
else {
|
||||
bx_sr_after_restore_state();
|
||||
|
@ -1087,7 +1087,7 @@ help_command:
|
||||
}
|
||||
| BX_TOKEN_HELP BX_TOKEN_TRACEMEM '\n'
|
||||
{
|
||||
dbg_printf("trace-mem on - print all memory accesses occured during instruction execution\n");
|
||||
dbg_printf("trace-mem on - print all memory accesses occurred during instruction execution\n");
|
||||
dbg_printf("trace-mem off - disable memory accesses tracing\n");
|
||||
free($1);free($2);
|
||||
}
|
||||
|
@ -429,7 +429,7 @@ void bx_init_options()
|
||||
#endif
|
||||
new bx_param_bool_c(cpu_param,
|
||||
"reset_on_triple_fault", "Enable CPU reset on triple fault",
|
||||
"Enable CPU reset if triple fault occured (highly recommended)",
|
||||
"Enable CPU reset if triple fault occurred (highly recommended)",
|
||||
1);
|
||||
#if BX_CPU_LEVEL >= 5
|
||||
new bx_param_bool_c(cpu_param,
|
||||
@ -1021,7 +1021,7 @@ void bx_init_options()
|
||||
250);
|
||||
new bx_param_num_c(keyboard,
|
||||
"paste_delay", "Keyboard paste delay",
|
||||
"Approximate time in microseconds between attemps to paste characters to the keyboard controller.",
|
||||
"Approximate time in microseconds between attempts to paste characters to the keyboard controller.",
|
||||
1000, BX_MAX_BIT32U,
|
||||
100000);
|
||||
bx_param_bool_c *use_kbd_mapping = new bx_param_bool_c(keyboard,
|
||||
@ -1289,7 +1289,7 @@ void bx_init_options()
|
||||
ioaddr = new bx_param_num_c(ata_res[channel],
|
||||
"ioaddr1",
|
||||
"I/O Address 1",
|
||||
"IO adress of ata command block",
|
||||
"IO address of ata command block",
|
||||
0, 0xffff,
|
||||
ata_default_ioaddr1[channel]);
|
||||
ioaddr->set_base(16);
|
||||
@ -1298,7 +1298,7 @@ void bx_init_options()
|
||||
ioaddr2 = new bx_param_num_c(ata_res[channel],
|
||||
"ioaddr2",
|
||||
"I/O Address 2",
|
||||
"IO adress of ata control block",
|
||||
"IO address of ata control block",
|
||||
0, 0xffff,
|
||||
ata_default_ioaddr2[channel]);
|
||||
ioaddr2->set_base(16);
|
||||
|
@ -575,7 +575,7 @@ void BX_CPU_C::prefetch(void)
|
||||
if (EIP == (Bit32u) BX_CPU_THIS_PTR prev_rip) {
|
||||
Bit32u dr6_bits = code_breakpoint_match(laddr);
|
||||
if (dr6_bits & BX_DEBUG_TRAP_HIT) {
|
||||
BX_ERROR(("#DB: x86 code breakpoint catched"));
|
||||
BX_ERROR(("#DB: x86 code breakpoint caught"));
|
||||
BX_CPU_THIS_PTR debug_trap |= dr6_bits;
|
||||
exception(BX_DB_EXCEPTION, 0);
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ const char* cpu_state_string(unsigned state)
|
||||
"in shutdown",
|
||||
"waiting for SIPI",
|
||||
"executing mwait",
|
||||
"executing mwait inhibit interrups",
|
||||
"executing mwait inhibit interrupts",
|
||||
"unknown state"
|
||||
};
|
||||
|
||||
|
@ -53,7 +53,7 @@ void BX_CPU_C::FPU_stack_underflow(bxInstruction_c *i, int stnr, int pop_stack)
|
||||
FPU_exception(i, FPU_EX_Stack_Underflow);
|
||||
}
|
||||
|
||||
/* Returns unmasked exceptions if occured */
|
||||
/* Returns unmasked exceptions if occurred */
|
||||
unsigned BX_CPU_C::FPU_exception(bxInstruction_c *i, unsigned exception, bx_bool is_store)
|
||||
{
|
||||
/* Extract only the bits which we use to set the status word */
|
||||
@ -119,7 +119,7 @@ unsigned BX_CPU_C::FPU_exception(bxInstruction_c *i, unsigned exception, bx_bool
|
||||
}
|
||||
}
|
||||
|
||||
// If #P unmasked exception occured the result still has to be
|
||||
// If #P unmasked exception occurred the result still has to be
|
||||
// written to the destination.
|
||||
unmasked &= ~FPU_EX_Precision;
|
||||
|
||||
|
@ -661,7 +661,7 @@ bx_bool BX_CPP_AttrRegparmN(2) BX_CPU_C::wrmsr(Bit32u index, Bit64u val_64)
|
||||
return handle_unknown_wrmsr(index, val_64);
|
||||
}
|
||||
if (! isValidMSR_FixedMTRR(val_64)) {
|
||||
BX_ERROR(("WRMSR: attempt to write invalid Memory Type to MSR_MTRRFIX16K regsiter !"));
|
||||
BX_ERROR(("WRMSR: attempt to write invalid Memory Type to MSR_MTRRFIX16K register !"));
|
||||
return 0;
|
||||
}
|
||||
BX_CPU_THIS_PTR msr.mtrrfix16k[index - BX_MSR_MTRRFIX16K_80000] = val_64;
|
||||
|
@ -654,7 +654,7 @@ int BX_CPU_C::check_entry_PAE(const char *s, Bit64u entry, Bit64u reserved, unsi
|
||||
|
||||
if (entry & PAGE_DIRECTORY_NX_BIT) {
|
||||
if (rw == BX_EXECUTE) {
|
||||
BX_DEBUG(("PAE %s: non-executable page fault occured", s));
|
||||
BX_DEBUG(("PAE %s: non-executable page fault occurred", s));
|
||||
*nx_fault = 1;
|
||||
}
|
||||
}
|
||||
|
@ -662,7 +662,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::VERR_Ew(bxInstruction_c *i)
|
||||
}
|
||||
/* readable, non-conforming code segment */
|
||||
if ((descriptor.dpl<CPL) || (descriptor.dpl<selector.rpl)) {
|
||||
BX_DEBUG(("VERR: non-conforming code not withing priv level"));
|
||||
BX_DEBUG(("VERR: non-conforming code not within priv level"));
|
||||
clear_ZF(); /* inaccessible */
|
||||
}
|
||||
else {
|
||||
@ -671,7 +671,7 @@ void BX_CPP_AttrRegparmN(1) BX_CPU_C::VERR_Ew(bxInstruction_c *i)
|
||||
}
|
||||
else { /* data segment */
|
||||
if ((descriptor.dpl<CPL) || (descriptor.dpl<selector.rpl)) {
|
||||
BX_DEBUG(("VERR: data seg not withing priv level"));
|
||||
BX_DEBUG(("VERR: data seg not within priv level"));
|
||||
clear_ZF(); /* not accessible */
|
||||
}
|
||||
else {
|
||||
|
@ -2395,21 +2395,21 @@ disk image <emphasis>size</emphasis>. Returns 0.
|
||||
<emphasis>int create(const char* filename, const char* type, Bit64u size);</emphasis>
|
||||
creates a new empty redolog file, with header and catalog, named <emphasis>filename</emphasis>
|
||||
of type <emphasis>type</emphasis> for a <emphasis>size</emphasis> bytes image.
|
||||
Returns 0 for OK or -1 if a problem occured.
|
||||
Returns 0 for OK or -1 if a problem occurred.
|
||||
</para>
|
||||
<para>
|
||||
<emphasis>int create(int filedes, const char* type, Bit64u size);</emphasis>
|
||||
creates a new empty redolog file, with header and catalog, in a previously
|
||||
opened file described by <emphasis>filedes</emphasis>, of type <emphasis>type</emphasis>
|
||||
for a <emphasis>size</emphasis> bytes image.
|
||||
Returns 0 for OK or -1 if a problem occured.
|
||||
Returns 0 for OK or -1 if a problem occurred.
|
||||
</para>
|
||||
<para>
|
||||
<emphasis>int open(const char* filename, const char* type, Bit64u size);</emphasis>
|
||||
opens a redolog file named <emphasis>filename</emphasis>, and checks
|
||||
for consistency of header values against a <emphasis>type</emphasis> and
|
||||
<emphasis>size</emphasis>.
|
||||
Returns 0 for OK or -1 if a problem occured.
|
||||
Returns 0 for OK or -1 if a problem occurred.
|
||||
</para>
|
||||
<para>
|
||||
<emphasis>int open(const char* filename, const char* type, Bit64u size, int flags);</emphasis>
|
||||
@ -2426,7 +2426,7 @@ closes a redolog file.
|
||||
seeks at logical data offset <emphasis>offset</emphasis> in a redolog.
|
||||
<emphasis>offset</emphasis> must be a multiple of 512.
|
||||
Only SEEK_SET and SEEK_CUR are supported for <emphasis>whence</emphasis>.
|
||||
Returns -1 if a problem occured, or the current logical offset in
|
||||
Returns -1 if a problem occurred, or the current logical offset in
|
||||
the redolog.
|
||||
</para>
|
||||
<para>
|
||||
@ -2535,7 +2535,7 @@ as an undoable disk image. The image mode of this base image is auto-detected.
|
||||
All supported disk image modes can be used here. The associated
|
||||
redolog will be named <emphasis>pathname</emphasis> with a
|
||||
<emphasis>UNDOABLE_REDOLOG_EXTENSION</emphasis> suffix, unless set in the
|
||||
constructor. Returns 0 for OK or -1 if a problem occured.
|
||||
constructor. Returns 0 for OK or -1 if a problem occurred.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
@ -2552,7 +2552,7 @@ off_t lseek(off_t offset, int whence);
|
||||
seeks at logical data position <emphasis>offset</emphasis> in
|
||||
the undoable disk image.
|
||||
Only SEEK_SET and SEEK_CUR are supported for <emphasis>whence</emphasis>.
|
||||
Returns -1 if a problem occured, or the current logical
|
||||
Returns -1 if a problem occurred, or the current logical
|
||||
offset in the undoable disk image.
|
||||
</para>
|
||||
|
||||
@ -2618,7 +2618,7 @@ int open(const char* pathname);
|
||||
opens the disk image <emphasis>pathname</emphasis> in read-only mode,
|
||||
as a volatile disk image. The image mode is auto-detected. The associated
|
||||
redolog will be named <emphasis>pathname</emphasis> with a random suffix,
|
||||
unless set in the constructor. Returns 0 for OK or -1 if a problem occured.
|
||||
unless set in the constructor. Returns 0 for OK or -1 if a problem occurred.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
@ -2636,7 +2636,7 @@ off_t lseek(off_t offset, int whence);
|
||||
seeks at logical data position <emphasis>offset</emphasis> in
|
||||
the volatile disk image.
|
||||
Only SEEK_SET and SEEK_CUR are supported for <emphasis>whence</emphasis>.
|
||||
Returns -1 if a problem occured, or the current logical offset in
|
||||
Returns -1 if a problem occurred, or the current logical offset in
|
||||
the volatile disk image.
|
||||
</para>
|
||||
|
||||
@ -2698,7 +2698,7 @@ object. This disk image logical length is <emphasis>size</emphasis> bytes.
|
||||
int open(const char* pathname);
|
||||
</emphasis>
|
||||
opens the growing disk image <emphasis>pathname</emphasis>,
|
||||
Returns 0 for OK or -1 if a problem occured.
|
||||
Returns 0 for OK or -1 if a problem occurred.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
@ -2715,7 +2715,7 @@ off_t lseek(off_t offset, int whence);
|
||||
seeks at logical data position <emphasis>offset</emphasis> in
|
||||
the growable disk image.
|
||||
Only SEEK_SET and SEEK_CUR are supported for <emphasis>whence</emphasis>.
|
||||
Returns -1 if a problem occured, or the current logical offset in
|
||||
Returns -1 if a problem occurred, or the current logical offset in
|
||||
the grwoing image.
|
||||
</para>
|
||||
|
||||
|
@ -2484,7 +2484,7 @@ SMP, x86_64 support) and the devices options (e.g. PCI, USB, Cirrus graphics).
|
||||
<entry>no</entry>
|
||||
<entry>Enable experimental 3dfx Voodoo Graphics emulation. The Voodoo1 is
|
||||
known to work, the Voodoo2 support is not yet complete, but almost usable.
|
||||
The Banshee / Voodoo3 support is under construction, but basicly usable.
|
||||
The Banshee / Voodoo3 support is under construction, but basically usable.
|
||||
For more information see <xref linkend="voodoo-notes">.
|
||||
</entry>
|
||||
</row>
|
||||
@ -3492,7 +3492,7 @@ See example in msrs.def.
|
||||
<para>
|
||||
Ignore MSR references that Bochs does not understand; print a warning message
|
||||
instead of generating #GP exception. This option is enabled by default but
|
||||
will not be avaiable if configurable MSRs are enabled.
|
||||
will not be available if configurable MSRs are enabled.
|
||||
</para>
|
||||
<para><anchor id="bochsopt-cpu-ips"><command>ips</command></para>
|
||||
<para>
|
||||
@ -3860,7 +3860,7 @@ Example:
|
||||
This defines the Voodoo Graphics emulation (experimental). Currently
|
||||
supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'.
|
||||
The Voodoo2 support is not yet complete, but almost usable. The Banshee /
|
||||
Voodoo3 support is under construction, but basicly usable. The 2D/3D cards
|
||||
Voodoo3 support is under construction, but basically usable. The 2D/3D cards
|
||||
require an external VGA BIOS the vga extension option to be set to 'voodoo'.
|
||||
If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5).
|
||||
The gui screen update timing for all models is controlled by the related
|
||||
@ -4918,7 +4918,7 @@ at runtime.
|
||||
The options<replaceable>X</replaceable> parameter can be used to assign specific
|
||||
options to the device connected to the corresponding USB port. Currently this
|
||||
feature is used to set the speed reported by device ('low', 'full', 'high' or
|
||||
'super'). The availabe speed choices depend on both HC and device. The option
|
||||
'super'). The available speed choices depend on both HC and device. The option
|
||||
'debug' turns on debug output for the device at connection time. For the USB
|
||||
'disk' device the optionsX parameter can be used to specify an alternative
|
||||
redolog file (journal) of some image modes. For 'vvfat' mode USB disks the optionsX
|
||||
|
@ -172,7 +172,7 @@ ignore_bad_msrs:
|
||||
|
||||
Ignore MSR references that Bochs does not understand; print a warning
|
||||
message instead of generating #GP exception. This option is enabled
|
||||
by default but will not be avaiable if configurable MSRs are enabled.
|
||||
by default but will not be available if configurable MSRs are enabled.
|
||||
|
||||
ips:
|
||||
|
||||
@ -485,7 +485,7 @@ Examples:
|
||||
This defines the Voodoo Graphics emulation (experimental). Currently
|
||||
supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'.
|
||||
The Voodoo2 support is not yet complete, but almost usable. The Banshee /
|
||||
Voodoo3 support is under construction, but basicly usable. The 2D/3D cards
|
||||
Voodoo3 support is under construction, but basically usable. The 2D/3D cards
|
||||
require an external VGA BIOS the vga extension option to be set to 'voodoo'.
|
||||
If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5).
|
||||
The gui screen update timing for all models is controlled by the related
|
||||
@ -1229,7 +1229,7 @@ changed at runtime.
|
||||
The optionsX parameter can be used to assign specific options to the device
|
||||
connected to the corresponding USB port. Currently this feature is used to
|
||||
set the speed reported by device ('low', 'full', 'high' or 'super'). The
|
||||
availabe speed choices depend on both HC and device. The option 'debug' turns
|
||||
available speed choices depend on both HC and device. The option 'debug' turns
|
||||
on debug output for the device at connection time.
|
||||
For the USB 'disk' device the optionsX parameter can be used to specify an
|
||||
alternative redolog file (journal) of some image modes. For 'vvfat' mode USB
|
||||
|
@ -1081,7 +1081,7 @@ void LoadRegList()
|
||||
++itemnum;
|
||||
}
|
||||
}
|
||||
// display System regsiters (if requested)
|
||||
// display System registers (if requested)
|
||||
// displaying these once may be necessary for column resizing
|
||||
if (SeeReg[2] || (ResizeColmns != FALSE && NeedSysRresize != FALSE))
|
||||
{
|
||||
|
@ -606,7 +606,7 @@ int bx_term_gui_c::set_clipboard_text(char *text_snapshot, Bit32u len)
|
||||
|
||||
bx_bool bx_term_gui_c::palette_change(Bit8u index, Bit8u red, Bit8u green, Bit8u blue)
|
||||
{
|
||||
BX_DEBUG(("color pallete request (%d,%d,%d,%d) ignored", index,red,green,blue));
|
||||
BX_DEBUG(("color palette request (%d,%d,%d,%d) ignored", index,red,green,blue));
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
@ -245,7 +245,7 @@ void bx_cmos_c::init(void)
|
||||
BX_PANIC(("CMOS: error reading cmos file."));
|
||||
}
|
||||
close(fd);
|
||||
BX_INFO(("successfuly read from image file '%s'.",
|
||||
BX_INFO(("successfully read from image file '%s'.",
|
||||
SIM->get_param_string(BXPN_CMOSIMAGE_PATH)->getptr()));
|
||||
BX_CMOS_THIS s.rtc_mode_12hour = ((BX_CMOS_THIS s.reg[REG_STAT_B] & 0x02) == 0);
|
||||
BX_CMOS_THIS s.rtc_mode_binary = ((BX_CMOS_THIS s.reg[REG_STAT_B] & 0x04) != 0);
|
||||
|
@ -1220,7 +1220,7 @@ Bit32u bx_vga_c::vbe_write(Bit32u address, Bit32u value, unsigned io_len)
|
||||
// virt_height >=yres
|
||||
// virt_width*virt_height < MAX_VIDEO_MEMORY
|
||||
|
||||
// basicly 2 situations
|
||||
// basically 2 situations
|
||||
|
||||
// situation 1:
|
||||
// MAX_VIDEO_MEMORY / virt_width >= yres
|
||||
|
@ -1102,7 +1102,7 @@ Bit32u bx_hard_drive_c::read(Bit32u address, unsigned io_len)
|
||||
(unsigned) address));
|
||||
}
|
||||
|
||||
BX_PANIC(("hard drive: shouldnt get here!"));
|
||||
BX_PANIC(("hard drive: shouldn't get here!"));
|
||||
return(0);
|
||||
|
||||
return_value32:
|
||||
|
@ -30,7 +30,7 @@
|
||||
//
|
||||
// the idea is to provide a software multiport 'ethernet hub' and allow
|
||||
// communication between multiple bochs instances on the same machine
|
||||
// entirely in userspace and without need for root priviledges.
|
||||
// entirely in userspace and without need for root privileges.
|
||||
//
|
||||
// The config line in .bochsrc should look like:
|
||||
//
|
||||
@ -225,7 +225,7 @@ bx_socket_pktmover_c::bx_socket_pktmover_c(const char *netif,
|
||||
#ifndef WIN32
|
||||
this->fd = INVALID_SOCKET;
|
||||
if (errno == EACCES)
|
||||
BX_PANIC(("eth_socket: insufficient priviledges to open socket"));
|
||||
BX_PANIC(("eth_socket: insufficient privileges to open socket"));
|
||||
else
|
||||
BX_PANIC(("eth_socket: could not open socket: %s", strerror(errno)));
|
||||
#else
|
||||
|
@ -2346,7 +2346,7 @@ void bx_sb16_c::opl_timerevent()
|
||||
} else {
|
||||
mask = 0x3ff;
|
||||
}
|
||||
if (((++OPL.timer[i]) & mask) == 0) { // overflow occured, set flags accordingly
|
||||
if (((++OPL.timer[i]) & mask) == 0) { // overflow occurred, set flags accordingly
|
||||
OPL.timer[i] = OPL.timerinit[i]; // reset the counter
|
||||
if ((OPL.tmask[i/2] >> (6 - (i % 2))) == 0) { // set flags only if unmasked
|
||||
writelog(MIDILOG(5), "OPL Timer Interrupt: Chip %d, Timer %d", i/2, 1 << (i % 2));
|
||||
|
@ -68,7 +68,7 @@
|
||||
BX_SB16_IOADLIBLEN should be 2 or 4. If 0, Ports 0x388.. don't
|
||||
get used, but the OPL2 can still be accessed at 0x228..0x229.
|
||||
If 2, the usual Adlib emulation is enabled. If 4, an OPL3 is
|
||||
emulated at adresses 0x388..0x38b, or two separate OPL2's.
|
||||
emulated at addresses 0x388..0x38b, or two separate OPL2's.
|
||||
*/
|
||||
|
||||
#define BX_SB16_MIX_REG 0x100 // total number of mixer registers
|
||||
@ -226,7 +226,7 @@ private:
|
||||
Bit16u timer[4]; // two timers on each chip
|
||||
Bit16u timerinit[4]; // initial timer counts
|
||||
int tmask[2]; // the timer masking byte for both chips
|
||||
int tflag[2]; // shows if the timer overflow has occured
|
||||
int tflag[2]; // shows if the timer overflow has occurred
|
||||
} opl;
|
||||
|
||||
struct bx_sb16_mixer_struct {
|
||||
|
@ -846,7 +846,7 @@ Bit32s scsi_device_t::scsi_send_command(Bit32u tag, Bit8u *buf, int lun, bx_bool
|
||||
r->async_mode = async;
|
||||
break;
|
||||
case 0x35:
|
||||
BX_DEBUG(("Syncronise cache (sector " FMT_LL "d, count %d)", lba, len));
|
||||
BX_DEBUG(("Synchronise cache (sector " FMT_LL "d, count %d)", lba, len));
|
||||
// TODO: flush cache
|
||||
break;
|
||||
case 0x43:
|
||||
|
@ -307,8 +307,8 @@ Bit32u bx_uhci_core_c::read(Bit32u address, unsigned io_len)
|
||||
val = hub.usb_sof.sof_timing;
|
||||
break;
|
||||
|
||||
case 0x14: // port #3 non existant, but linux systems check it to see if there are more than 2
|
||||
BX_ERROR(("read from non existant offset 0x14 (port #3)"));
|
||||
case 0x14: // port #3 non existent, but linux systems check it to see if there are more than 2
|
||||
BX_ERROR(("read from non existent offset 0x14 (port #3)"));
|
||||
val = 0xFF7F;
|
||||
break;
|
||||
|
||||
@ -488,8 +488,8 @@ void bx_uhci_core_c::write(Bit32u address, Bit32u value, unsigned io_len)
|
||||
hub.usb_sof.sof_timing = value;
|
||||
break;
|
||||
|
||||
case 0x14: // port #3 non existant, but linux systems check it to see if there are more than 2
|
||||
BX_ERROR(("write to non existant offset 0x14 (port #3)"));
|
||||
case 0x14: // port #3 non existent, but linux systems check it to see if there are more than 2
|
||||
BX_ERROR(("write to non existent offset 0x14 (port #3)"));
|
||||
break;
|
||||
|
||||
case 0x10: // port #1
|
||||
|
@ -95,6 +95,6 @@ main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
close(fd);
|
||||
printf("CMOS data successfuly written to file '%s'.\n", argv[1]);
|
||||
printf("CMOS data successfully written to file '%s'.\n", argv[1]);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user