mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update user docs

This commit is contained in:
Stanislav Shwartsman 2008-12-28 20:49:03 +00:00
parent e182e74a4d
commit 6367d3c5d2
4 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.142 2008-12-28 20:30:48 sshwarts Exp $
// $Id: config.cc,v 1.143 2008-12-28 20:49:03 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -464,8 +464,7 @@ void bx_init_options()
"msrs",
"Configurable MSR definition file",
"Set path to the configurable MSR definition file",
"msrs.def",
BX_PATHNAME_LEN+1);
"", BX_PATHNAME_LEN);
#endif
new bx_param_string_c(cpu_param,
"vendor_string",
@ -3544,18 +3543,22 @@ int bx_write_configuration(const char *rc, int overwrite)
fprintf(fp, "vga_update_interval: %u\n", SIM->get_param_num(BXPN_VGA_UPDATE_INTERVAL)->get());
fprintf(fp, "vga: extension=%s\n", SIM->get_param_string(BXPN_VGA_EXTENSION)->getptr());
#if BX_SUPPORT_SMP
fprintf(fp, "cpu: count=%u:%u:%u, ips=%u, quantum=%d, reset_on_triple_fault=%d, cpuid_limit_winnt=%d\n",
fprintf(fp, "cpu: count=%u:%u:%u, ips=%u, quantum=%d, ",
SIM->get_param_num(BXPN_CPU_NPROCESSORS)->get(), SIM->get_param_num(BXPN_CPU_NCORES)->get(),
SIM->get_param_num(BXPN_CPU_NTHREADS)->get(), SIM->get_param_num(BXPN_IPS)->get(),
SIM->get_param_num(BXPN_SMP_QUANTUM)->get(),
SIM->get_param_bool(BXPN_RESET_ON_TRIPLE_FAULT)->get(),
SIM->get_param_bool(BXPN_CPUID_LIMIT_WINNT)->get());
SIM->get_param_num(BXPN_SMP_QUANTUM)->get());
#else
fprintf(fp, "cpu: count=1, ips=%u, reset_on_triple_fault=%d, cpuid_limit_winnt=%d\n",
SIM->get_param_num(BXPN_IPS)->get(),
fprintf(fp, "cpu: count=1, ips=%u, ", SIM->get_param_num(BXPN_IPS)->get());
#endif
fprintf(fp, "reset_on_triple_fault=%d, cpuid_limit_winnt=%d",
SIM->get_param_bool(BXPN_RESET_ON_TRIPLE_FAULT)->get(),
SIM->get_param_bool(BXPN_CPUID_LIMIT_WINNT)->get());
#endif
#if BX_CONFIGURE_MSRS
strptr = SIM->get_param_string(BXPN_CONFIGURABLE_MSRS_PATH)->getptr();
if (strlen(strptr) > 0)
fprintf(fp, "msrs==\"%s\"", strptr);
#endif
fprintf(fp, "\n");
fprintf(fp, "text_snapshot_check: enabled=%d\n", SIM->get_param_bool(BXPN_TEXT_SNAPSHOT_CHECK)->get());
fprintf(fp, "private_colormap: enabled=%d\n", SIM->get_param_bool(BXPN_PRIVATE_COLORMAP)->get());
#if BX_WITH_AMIGAOS

7
bochs/doc/docbook/user/user.dbk
View File

@ -1,7 +1,7 @@
<!--
================================================================
doc/docbook/user/user.dbk
$Id: user.dbk,v 1.247 2008-10-01 09:44:40 sshwarts Exp $
$Id: user.dbk,v 1.248 2008-12-28 20:49:03 sshwarts Exp $
This is the top level file for the Bochs Users Manual.
================================================================
@ -3071,6 +3071,11 @@ will be completely bogus !
Determine whether to limit maximum CPUID function to 3. This mode is required
to workaround WinNT installation and boot issues.
</para>
<para><command>msrs</command></para>
<para>
Define path to user CPU Model Specific Registers (MSRs) specification.
See example in msrs.def.
</para>
<para><command>vendor_string</command></para>
<para>
Set the CPUID vendor string returned by CPUID(0x0). This should be a

5
bochs/doc/man/bochsrc.5
View File

@ -142,6 +142,11 @@ cpuid_limit_winnt:
Determine whether to limit maximum CPUID function to 3. This mode is
required to workaround WinNT installation and boot issues.
msrs:
Define path to user CPU Model Specific Registers (MSRs) specification.
See example in msrs.def.
vendor_string:
Set the CPUID vendor string returned by CPUID(0x0). This should be a

7
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.387 2008-12-18 19:37:05 sshwarts Exp $
// $Id: main.cc,v 1.388 2008-12-28 20:49:03 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -990,6 +990,11 @@ void bx_init_hardware()
BX_INFO((" processors: %d (cores=%u, HT threads=%u)", BX_SMP_PROCESSORS,
SIM->get_param_num(BXPN_CPU_NCORES)->get(), SIM->get_param_num(BXPN_CPU_NTHREADS)->get()));
BX_INFO((" A20 line support: %s",BX_SUPPORT_A20?"yes":"no"));
#if BX_CONFIGURE_MSRS
const char *msrs_file = SIM->get_param_string(BXPN_CONFIGURABLE_MSRS_PATH)->getptr();
if(strlen(msrs_file) > 0)
BX_INFO((" load configurable MSRs from file %s", msrs_file));
#endif
BX_INFO((" APIC support: %s",BX_SUPPORT_APIC?"yes":"no"));
BX_INFO(("CPU configuration"));
BX_INFO((" level: %d",BX_CPU_LEVEL));