joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add option to specify "auto" for "use dynamic core with paging on", which turns on this option when 386 paging is used. Change default to "auto"

Browse Source
This commit is contained in:
koolkdev
2021-01-26 23:24:04 +02:00
parent 5be263f8f4
commit c547055c19
6 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@@ -919,6 +919,7 @@ vsyncrate = 75
# use dynamic core with paging on: Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.
# If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.
# If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.
# If set to auto, this option will be enabled when 386 paging is enabled.
#DOSBOX-X-ADV:# ignore opcode 63: When debugging, do not report illegal opcode 0x63.
#DOSBOX-X-ADV:# Enable this option to ignore spurious errors while debugging from within Windows 3.1/9x/ME
# apmbios: Emulate Advanced Power Management BIOS calls
@@ -957,7 +958,7 @@ cycles = auto
cycleup = 10
cycledown = 20
cycle emulation percentage adjust = 0
use dynamic core with paging on = true
use dynamic core with paging on = auto
#DOSBOX-X-ADV:ignore opcode 63 = true
apmbios = true
#DOSBOX-X-ADV:apmbios pnp = false

3
dosbox-x.reference.conf
View File

@@ -282,6 +282,7 @@ vsyncrate = 75
# use dynamic core with paging on: Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.
# If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.
# If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.
# If set to auto, this option will be enabled when 386 paging is enabled.
# apmbios: Emulate Advanced Power Management BIOS calls
core = auto
fpu = true
@@ -290,7 +291,7 @@ cycles = auto
cycleup = 10
cycledown = 20
cycle emulation percentage adjust = 0
use dynamic core with paging on = true
use dynamic core with paging on = auto
apmbios = true
[keyboard]

3
dosbox-x.reference.full.conf
View File

@@ -919,6 +919,7 @@ vsyncrate = 75
# use dynamic core with paging on: Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.
# If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.
# If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.
# If set to auto, this option will be enabled when 386 paging is enabled.
# ignore opcode 63: When debugging, do not report illegal opcode 0x63.
# Enable this option to ignore spurious errors while debugging from within Windows 3.1/9x/ME
# apmbios: Emulate Advanced Power Management BIOS calls
@@ -957,7 +958,7 @@ cycles = auto
cycleup = 10
cycledown = 20
cycle emulation percentage adjust = 0
use dynamic core with paging on = true
use dynamic core with paging on = auto
ignore opcode 63 = true
apmbios = true
apmbios pnp = false

10
src/cpu/cpu.cpp
View File

@@ -78,6 +78,7 @@ bool report_fdiv_bug = false;
extern bool ignore_opcode_63;
extern bool use_dynamic_core_with_paging;
extern bool auto_determine_dynamic_core_paging;
bool cpu_double_fault_enable;
bool cpu_triple_fault_reset;
@@ -3286,11 +3287,18 @@ public:
report_fdiv_bug = section->Get_bool("report fdiv bug");
ignore_opcode_63 = section->Get_bool("ignore opcode 63");
use_dynamic_core_with_paging = section->Get_bool("use dynamic core with paging on");
cpu_double_fault_enable = section->Get_bool("double fault");
cpu_triple_fault_reset = section->Get_bool("reset on triple fault");
cpu_allow_big16 = section->Get_bool("realbig16");
std::string dynamic_core_paging = section->Get_string("use dynamic core with paging on");
auto_determine_dynamic_core_paging = dynamic_core_paging == "auto";
if (auto_determine_dynamic_core_paging) {
use_dynamic_core_with_paging = PAGING_Enabled();
} else {
use_dynamic_core_with_paging = dynamic_core_paging == "true";
}
if (cpu_allow_big16) {
/* FIXME: GCC 4.8: How is this an empty body? Explain. */
LOG(LOG_CPU,LOG_DEBUG)("Emulation of the B (big) bit in real mode enabled\n");

3
src/cpu/paging.cpp
View File

@@ -267,6 +267,7 @@ void PrintPageInfo(const char* string, PhysPt lin_addr, bool writing, bool prepa
*/
bool use_dynamic_core_with_paging = false; /* allow dynamic core even with paging (AT YOUR OWN RISK!!!!) */
bool auto_determine_dynamic_core_paging = false; /* enable use_dynamic_core_with_paging when paging is enabled */
bool dosbox_allow_nonrecursive_page_fault = false; /* when set, do nonrecursive mode (when executing instruction) */
void PAGING_PageFault(PhysPt lin_addr,Bitu page_addr,Bitu faultcode) {
@@ -1438,6 +1439,8 @@ void PAGING_Enable(bool enabled) {
/* If paging is disabled, we work from a default paging table */
if (paging.enabled==enabled) return;
paging.enabled=enabled;
if (auto_determine_dynamic_core_paging)
use_dynamic_core_with_paging = enabled;
if (enabled) {
// LOG(LOG_PAGING,LOG_NORMAL)("Enabled");
PAGING_SetDirBase(paging.cr3);

11
src/dosbox.cpp
View File

@@ -1079,6 +1079,7 @@ void DOSBOX_SetupConfigSections(void) {
const char* pc98videomodeopt[] = { "", "24khz", "31khz", "15khz", 0};
const char* aspectmodes[] = { "false", "true", "0", "1", "yes", "no", "nearest", "bilinear", 0};
const char *vga_ac_mapping_settings[] = { "", "auto", "4x4", "4low", "first16", 0 };
const char* dynamic_core_with_paging_settings[] = { "auto", "true", "false", 0 };
const char* hostkeys[] = {
"ctrlalt", "ctrlshift", "altshift", "mapper", 0 };
@@ -2317,11 +2318,13 @@ void DOSBOX_SetupConfigSections(void) {
Pint->Set_help("The percentage adjustment for use with the \"Emulate CPU speed\" feature. Default is 0 (no adjustment), but you can adjust it (between -25% and 25%) if necessary.");
Pint->SetBasic(true);
Pbool = secprop->Add_bool("use dynamic core with paging on",Property::Changeable::Always,true);
Pbool->Set_help("Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.\n"
Pstring = secprop->Add_string("use dynamic core with paging on",Property::Changeable::Always,"auto");
Pstring->Set_values(dynamic_core_with_paging_settings);
Pstring->Set_help("Allow dynamic cores (dynamic_x86 and dynamic_rec) to be used with 386 paging enabled.\n"
"If the dynamic_x86 core is set, this allows Windows 9x/ME to run properly, but may somewhat decrease the performance.\n"
"If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.");
Pbool->SetBasic(true);
"If the dynamic_rec core is set, this disables the dynamic core if the 386 paging functions are currently enabled.\n"
"If set to auto, this option will be enabled when 386 paging is enabled.");
Pstring->SetBasic(true);
Pbool = secprop->Add_bool("ignore opcode 63",Property::Changeable::Always,true);
Pbool->Set_help("When debugging, do not report illegal opcode 0x63.\n"