diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
index 89ad95cf1..74e19a9c2 100644
--- a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
+++ b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
@@ -10,7 +10,7 @@
Emulation
-
+
diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf
index bb0adc3af..329e31a23 100644
--- a/contrib/windows/installer/dosbox-x.reference.setup.conf
+++ b/contrib/windows/installer/dosbox-x.reference.setup.conf
@@ -663,50 +663,52 @@ pc-98 anex86 font =
#DOSBOX-X-ADV:pc-98 show graphics layer on initialize = true
[dosv]
-# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
-# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
-# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
-# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
-# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
-# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
-# Possible values: off, jp, ko, chs, cht, cn, tw.
-# getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation.
-# If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font.
-# fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used.
-# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
-#DOSBOX-X-ADV:# fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode.
-# fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
-# For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
-# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
-# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used.
-# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
-# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
-#DOSBOX-X-ADV:# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode.
-# gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output.
-# yen: Enables the Japanese yen symbol at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation.
-#DOSBOX-X-ADV:# del: Maps the undefined del symbol (0x7F) to the next character (0x80) for the Japanese DOS/V and other Japanese mode emulations.
-# fepcontrol: FEP control API for the DOS/V emulation.
-# Possible values: ias, mskanji, both.
-#DOSBOX-X-ADV:# vtext: V-text screen mode for the DOS/V emulation.
-#DOSBOX-X-ADV:# vtext2: V-text screen mode 2 for the DOS/V emulation.
+# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
+# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
+# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
+# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
+# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
+# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
+# Possible values: off, jp, ko, chs, cht, cn, tw.
+# getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation.
+# If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font.
+# fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used.
+# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
+#DOSBOX-X-ADV:# fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode.
+# fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
+# For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
+# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
+# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used.
+# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
+# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
+#DOSBOX-X-ADV:# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode.
+# gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output.
+# yen: Enables the Japanese yen symbol at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation.
+#DOSBOX-X-ADV:# del: Maps the undefined del symbol (0x7F) to the next character (0x80) for the Japanese DOS/V and other Japanese mode emulations.
+# fepcontrol: FEP control API for the DOS/V emulation.
+# Possible values: ias, mskanji, both.
+#DOSBOX-X-ADV:# vtext: V-text screen mode for the DOS/V emulation.
+#DOSBOX-X-ADV:# vtext2: V-text screen mode 2 for the DOS/V emulation.
+#DOSBOX-X-ADV:# use20pixelfont: Enables 20 pixel font will be used instead of the 24 pixel system font for the Japanese DOS/V emulation.
#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:# -> fontxsbcs24; fontxdbcs24; del; vtext; vtext2
+#DOSBOX-X-ADV-SEE:# -> fontxsbcs24; fontxdbcs24; del; vtext; vtext2; use20pixelfont
#DOSBOX-X-ADV-SEE:#
-dosv = off
-getsysfont = true
-fontxsbcs =
-fontxsbcs16 =
-#DOSBOX-X-ADV:fontxsbcs24 =
-fontxdbcs =
-fontxdbcs14 =
-#DOSBOX-X-ADV:fontxdbcs24 =
-gbk = false
-yen = false
-#DOSBOX-X-ADV:del = true
-fepcontrol = both
-#DOSBOX-X-ADV:vtext = svga
-#DOSBOX-X-ADV:vtext2 = xga
+dosv = off
+getsysfont = true
+fontxsbcs =
+fontxsbcs16 =
+#DOSBOX-X-ADV:fontxsbcs24 =
+fontxdbcs =
+fontxdbcs14 =
+#DOSBOX-X-ADV:fontxdbcs24 =
+gbk = false
+yen = false
+#DOSBOX-X-ADV:del = true
+fepcontrol = both
+#DOSBOX-X-ADV:vtext = svga
+#DOSBOX-X-ADV:vtext2 = xga
+#DOSBOX-X-ADV:use20pixelfont = false
[video]
#DOSBOX-X-ADV:# vmemdelay: VGA Memory I/O delay in nanoseconds. Set to -1 to use default, 0 to disable.
@@ -1004,7 +1006,8 @@ vsyncrate = 75
#DOSBOX-X-ADV:# of the dynamic core.
#DOSBOX-X-ADV:#
# cputype: CPU Type used in emulation. auto emulates a 486 which tolerates Pentium instructions.
-# 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 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.
# 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:
diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf
index 227826ea0..3fe45579b 100644
--- a/dosbox-x.reference.conf
+++ b/dosbox-x.reference.conf
@@ -325,7 +325,7 @@ pc-98 anex86 font =
# Possible values: ias, mskanji, both.
#
# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
-# -> fontxsbcs24; fontxdbcs24; del; vtext; vtext2
+# -> fontxsbcs24; fontxdbcs24; del; vtext; vtext2; use20pixelfont
#
dosv = off
getsysfont = true
@@ -376,7 +376,8 @@ vsyncrate = 75
# Possible values: auto, dynamic, dynamic_x86, dynamic_nodhfpu, dynamic, dynamic_rec, normal, full, simple.
# fpu: Enable FPU emulation
# cputype: CPU Type used in emulation. auto emulates a 486 which tolerates Pentium instructions.
-# 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 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.
# 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:
diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf
index 4d2efe94f..7aaba17e4 100644
--- a/dosbox-x.reference.full.conf
+++ b/dosbox-x.reference.full.conf
@@ -643,46 +643,48 @@ pc-98 anex86 font =
pc-98 show graphics layer on initialize = true
[dosv]
-# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
-# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
-# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
-# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
-# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
-# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
-# Possible values: off, jp, ko, chs, cht, cn, tw.
-# getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation.
-# If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font.
-# fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used.
-# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
-# fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode.
-# fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
-# For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
-# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
-# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used.
-# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
-# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
-# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode.
-# gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output.
-# yen: Enables the Japanese yen symbol at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation.
-# del: Maps the undefined del symbol (0x7F) to the next character (0x80) for the Japanese DOS/V and other Japanese mode emulations.
-# fepcontrol: FEP control API for the DOS/V emulation.
-# Possible values: ias, mskanji, both.
-# vtext: V-text screen mode for the DOS/V emulation.
-# vtext2: V-text screen mode 2 for the DOS/V emulation.
-dosv = off
-getsysfont = true
-fontxsbcs =
-fontxsbcs16 =
-fontxsbcs24 =
-fontxdbcs =
-fontxdbcs14 =
-fontxdbcs24 =
-gbk = false
-yen = false
-del = true
-fepcontrol = both
-vtext = svga
-vtext2 = xga
+# dosv: Enable DOS/V emulation and specify which version to emulate. This option is intended for use with games or software
+# originating from East Asia (China, Japan, Korea) that use the double byte character set (DBCS) encodings and DOS/V extensions
+# to display Japanese (jp), Chinese (chs/cht/cn/tw), or Korean (ko) text. Note that enabling DOS/V replaces 80x25 text mode with
+# a EGA/VGA graphics mode that emulates text mode to display the characters and may be incompatible with non-Asian software that
+# assumes direct access to the text mode via segment 0xB800. For a general DOS environment with CJK support please disable DOS/V
+# emulation and use TrueType font (TTF) output with a CJK code page (932, 936, 949, 950) and TTF font with CJK characters instead.
+# Possible values: off, jp, ko, chs, cht, cn, tw.
+# getsysfont: If enabled, DOSBox-X will try to get and use the system fonts on Windows and Linux platforms for the DOS/V emulation.
+# If this cannot be done, then DOSBox-X will try to use the internal Japanese DOS/V font, or you can specify a different font.
+# fontxsbcs: FONTX2 file used to rendering SBCS characters (8x19) in DOS/V or JEGA mode. If not specified, the default one will be used.
+# fontxsbcs16: FONTX2 file used to rendering SBCS characters (8x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
+# fontxsbcs24: FONTX2 file used to rendering SBCS characters (12x24) in DOS/V mode.
+# fontxdbcs: FONTX2 file used to rendering DBCS characters (16x16) in DOS/V or JEGA mode. If not specified, the default one will be used.
+# For Simplified Chinese DOS/V, loading the HZK16 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
+# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
+# fontxdbcs14: FONTX2 file used to rendering SBCS characters (14x14) for Configuration Tool and Mapper Editor. If not specified, the default one will be used.
+# For Simplified Chinese DOS/V, loading the HZK14 font file (https://github.com/aguegu/BitmapFont/tree/master/font) is also supported.
+# For Traditional Chinese DOS/V, loading the STDFONT.15 font file from the ETen Chinese DOS system is also supported.
+# fontxdbcs24: FONTX2 file used to rendering SBCS characters (24x24) in DOS/V mode.
+# gbk: Enables the GBK extension (in addition to the standard GB2312 charset) for the Simplified Chinese DOS/V emulation or TTF output.
+# yen: Enables the Japanese yen symbol at 5ch if it is found at 7fh in a custom SBCS font for the Japanese DOS/V or JEGA emulation.
+# del: Maps the undefined del symbol (0x7F) to the next character (0x80) for the Japanese DOS/V and other Japanese mode emulations.
+# fepcontrol: FEP control API for the DOS/V emulation.
+# Possible values: ias, mskanji, both.
+# vtext: V-text screen mode for the DOS/V emulation.
+# vtext2: V-text screen mode 2 for the DOS/V emulation.
+# use20pixelfont: Enables 20 pixel font will be used instead of the 24 pixel system font for the Japanese DOS/V emulation.
+dosv = off
+getsysfont = true
+fontxsbcs =
+fontxsbcs16 =
+fontxsbcs24 =
+fontxdbcs =
+fontxdbcs14 =
+fontxdbcs24 =
+gbk = false
+yen = false
+del = true
+fepcontrol = both
+vtext = svga
+vtext2 = xga
+use20pixelfont = false
[video]
# vmemdelay: VGA Memory I/O delay in nanoseconds. Set to -1 to use default, 0 to disable.
@@ -976,7 +978,8 @@ vsyncrate = 75
# of the dynamic core.
#
# cputype: CPU Type used in emulation. auto emulates a 486 which tolerates Pentium instructions.
-# 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 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.
# 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:
diff --git a/include/build_timestamp.h b/include/build_timestamp.h
index 1a1914582..9ae8347fd 100644
--- a/include/build_timestamp.h
+++ b/include/build_timestamp.h
@@ -1,4 +1,4 @@
/*auto-generated*/
-#define UPDATED_STR "Aug 2, 2021 1:57:38pm"
-#define GIT_COMMIT_HASH "201cdaf"
+#define UPDATED_STR "Aug 31, 2021 9:20:06pm"
+#define GIT_COMMIT_HASH "a6ccb1b"
#define COPYRIGHT_END_YEAR "2021"