From de14b5930a46f48416a3fe5ff2c0fd645c623f75 Mon Sep 17 00:00:00 2001 From: Wengier Date: Fri, 19 Nov 2021 03:35:12 -0500 Subject: [PATCH] update config ref --- README.md | 2 +- contrib/windows/installer/dosbox-x.reference.setup.conf | 9 +++++++-- dosbox-x.reference.conf | 6 ++++-- dosbox-x.reference.full.conf | 7 ++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 98775a921..ba7fe3576 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Although based on the DOSBox project, DOSBox-X is now a separate project because * Support for more DOS commands and built-in external tools -* Support for CPU types like Pentium Pro and MMX instructions +* Support for CPU types like Pentium Pro/II and MMX instructions * Support for IDE interfaces and improved Windows 3.x/9x emulation diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf index 46b4fd976..c1cdee3df 100644 --- a/contrib/windows/installer/dosbox-x.reference.setup.conf +++ b/contrib/windows/installer/dosbox-x.reference.setup.conf @@ -704,6 +704,7 @@ pc-98 anex86 font = # vtext2: V-text screen mode 2 for the DOS/V emulation. Set "machine=svga_et4000" for all available options; enter command "VTEXT 2" for this mode. # Possible values: xga, xga24, sxga, sxga24, svga. # use20pixelfont: Enables 20 pixel font will be used instead of the 24 pixel system font for the Japanese DOS/V emulation (with V-text enabled). +# j3100: With dosv=jp and this option enabled, the Toshiba J-3100 will be emulated. dosv = off getsysfont = true fontxsbcs = @@ -718,6 +719,7 @@ fepcontrol = both vtext1 = svga vtext2 = xga use20pixelfont = false +j3100 = false [video] #DOSBOX-X-ADV:# vmemdelay: VGA Memory I/O delay in nanoseconds. Set to -1 to use default, 0 to disable. @@ -998,6 +1000,8 @@ vsyncrate = 75 #DOSBOX-X-ADV:# WARNING: Leaving this option enabled while installing Windows 95/98/ME can cause crashes. #DOSBOX-X-ADV:# enable cmpxchg8b: Enable Pentium CMPXCHG8B instruction. Enable this explicitly if using software that uses this instruction. #DOSBOX-X-ADV:# You must enable this option to run Windows ME because portions of the kernel rely on this instruction. +#DOSBOX-X-ADV:# enable syscall: Allow SYSENTER/SYSEXIT instructions. This option is only meaningful when cputype=pentium_ii. +#DOSBOX-X-ADV:# #DOSBOX-X-ADV:# ignore undefined msr: Ignore RDMSR/WRMSR on undefined registers. Normally the CPU will fire an Invalid Opcode exception in that case. #DOSBOX-X-ADV:# This option is off by default, enable if using software or drivers that assumes the presence of #DOSBOX-X-ADV:# certain MSR registers without checking. If you are using certain versions of the 3dfx Glide drivers for MS-DOS @@ -1018,7 +1022,7 @@ vsyncrate = 75 #DOSBOX-X-ADV:# # cputype: CPU Type used in emulation. auto emulates a 486 which tolerates Pentium instructions. # experimental enables newer instructions not normally found in the CPU types emulated by DOSBox, such as FISTTP. -# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, experimental. +# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, pentium_ii, experimental. # cycles: Number of instructions DOSBox-X tries to emulate each millisecond. # Setting this value too high results in sound dropouts and lags. # Cycles can be set in 3 ways: @@ -1060,7 +1064,7 @@ vsyncrate = 75 #DOSBOX-X-ADV:# then jump to realmode with B still set (aka Huge Unreal mode). Needed for Project Angel. #DOSBOX-X-ADV-SEE:# #DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -#DOSBOX-X-ADV-SEE:# -> segment limits; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device; integration device pnp; realbig16 +#DOSBOX-X-ADV-SEE:# -> segment limits; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device; integration device pnp; realbig16 #DOSBOX-X-ADV-SEE:# core = auto fpu = true @@ -1073,6 +1077,7 @@ fpu = true #DOSBOX-X-ADV:report fdiv bug = false #DOSBOX-X-ADV:enable msr = true #DOSBOX-X-ADV:enable cmpxchg8b = true +#DOSBOX-X-ADV:enable syscall = true #DOSBOX-X-ADV:ignore undefined msr = false #DOSBOX-X-ADV:interruptible rep string op = -1 #DOSBOX-X-ADV:dynamic core cache block size = 32 diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index 04e7d3e4c..73e01545f 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -339,6 +339,7 @@ pc-98 anex86 font = # vtext2: V-text screen mode 2 for the DOS/V emulation. Set "machine=svga_et4000" for all available options; enter command "VTEXT 2" for this mode. # Possible values: xga, xga24, sxga, sxga24, svga. # use20pixelfont: Enables 20 pixel font will be used instead of the 24 pixel system font for the Japanese DOS/V emulation (with V-text enabled). +# j3100: With dosv=jp and this option enabled, the Toshiba J-3100 will be emulated. dosv = off getsysfont = true fontxsbcs = @@ -353,6 +354,7 @@ fepcontrol = both vtext1 = svga vtext2 = xga use20pixelfont = false +j3100 = false [video] # vmemsize: Amount of video memory in megabytes. @@ -394,7 +396,7 @@ vsyncrate = 75 # fpu: Enable FPU emulation # cputype: CPU Type used in emulation. auto emulates a 486 which tolerates Pentium instructions. # experimental enables newer instructions not normally found in the CPU types emulated by DOSBox, such as FISTTP. -# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, experimental. +# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, pentium_ii, experimental. # cycles: Number of instructions DOSBox-X tries to emulate each millisecond. # Setting this value too high results in sound dropouts and lags. # Cycles can be set in 3 ways: @@ -413,7 +415,7 @@ vsyncrate = 75 # Do not disable if Windows 9x is configured around PnP devices, you will likely confuse it. # # Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details): -# -> segment limits; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device; integration device pnp; realbig16 +# -> segment limits; double fault; reset on triple fault; always report double fault; always report triple fault; allow lmsw to exit protected mode; report fdiv bug; enable msr; enable cmpxchg8b; enable syscall; ignore undefined msr; interruptible rep string op; dynamic core cache block size; cycle emulation percentage adjust; use dynamic core with paging on; ignore opcode 63; apmbios pnp; apmbios version; apmbios allow realmode; apmbios allow 16-bit protected mode; apmbios allow 32-bit protected mode; integration device; integration device pnp; realbig16 # core = auto fpu = true diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf index e73e7d610..329e2bf6e 100644 --- a/dosbox-x.reference.full.conf +++ b/dosbox-x.reference.full.conf @@ -684,6 +684,7 @@ pc-98 show graphics layer on initialize = true # vtext2: V-text screen mode 2 for the DOS/V emulation. Set "machine=svga_et4000" for all available options; enter command "VTEXT 2" for this mode. # Possible values: xga, xga24, sxga, sxga24, svga. # use20pixelfont: Enables 20 pixel font will be used instead of the 24 pixel system font for the Japanese DOS/V emulation (with V-text enabled). +# j3100: With dosv=jp and this option enabled, the Toshiba J-3100 will be emulated. dosv = off getsysfont = true fontxsbcs = @@ -698,6 +699,7 @@ fepcontrol = both vtext1 = svga vtext2 = xga use20pixelfont = false +j3100 = false [video] # vmemdelay: VGA Memory I/O delay in nanoseconds. Set to -1 to use default, 0 to disable. @@ -974,6 +976,8 @@ vsyncrate = 75 # WARNING: Leaving this option enabled while installing Windows 95/98/ME can cause crashes. # enable cmpxchg8b: Enable Pentium CMPXCHG8B instruction. Enable this explicitly if using software that uses this instruction. # You must enable this option to run Windows ME because portions of the kernel rely on this instruction. +# enable syscall: Allow SYSENTER/SYSEXIT instructions. This option is only meaningful when cputype=pentium_ii. +# # ignore undefined msr: Ignore RDMSR/WRMSR on undefined registers. Normally the CPU will fire an Invalid Opcode exception in that case. # This option is off by default, enable if using software or drivers that assumes the presence of # certain MSR registers without checking. If you are using certain versions of the 3dfx Glide drivers for MS-DOS @@ -994,7 +998,7 @@ vsyncrate = 75 # # cputype: CPU Type used in emulation. auto emulates a 486 which tolerates Pentium instructions. # experimental enables newer instructions not normally found in the CPU types emulated by DOSBox, such as FISTTP. -# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, experimental. +# Possible values: auto, 8086, 8086_prefetch, 80186, 80186_prefetch, 286, 286_prefetch, 386, 386_prefetch, 486old, 486old_prefetch, 486, 486_prefetch, pentium, pentium_mmx, ppro_slow, pentium_ii, experimental. # cycles: Number of instructions DOSBox-X tries to emulate each millisecond. # Setting this value too high results in sound dropouts and lags. # Cycles can be set in 3 ways: @@ -1045,6 +1049,7 @@ allow lmsw to exit protected mode = auto report fdiv bug = false enable msr = true enable cmpxchg8b = true +enable syscall = true ignore undefined msr = false interruptible rep string op = -1 dynamic core cache block size = 32