From b860e736f6b04c19344ecf658dc125a80da97075 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 30 Mar 2025 06:29:08 +1100 Subject: [PATCH] Miscelaneous minor fixes: Changed "Exception Points" to "Exceptionpoints" in the debugger documentation and help. This better matches "Watchpoints" and "Registerpoints". Also, it's very confusing that you see the help topic listing showing "Exception Points" but typing "help Exception Points" doesn't actually work. cpu/e132xs: Fixed a flags issue in the recompiler. misc/dgpix.cpp: Demoted The X-Files to not working with unemulated protection. skeleton/turnierdart.cpp: The srcclean on this file was missed. --- docs/source/conf.py | 4 +- docs/source/debugger/exceptionpoint.rst | 74 ++++++++++++------------ src/devices/cpu/e132xs/e132xsdrc_ops.hxx | 6 +- src/emu/debug/debughlp.cpp | 56 +++++++++--------- src/mame/misc/dgpix.cpp | 4 +- src/mame/skeleton/turnierdart.cpp | 6 +- 6 files changed, 76 insertions(+), 74 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 6d405ec8f20..ec88e24fcd9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ copyright = u'1997-2025, MAMEdev and contributors' # built documents. # # The short X.Y version. -version = '0.275' +version = '0.276' # The full version, including alpha/beta/rc tags. -release = '0.275' +release = '0.276' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/debugger/exceptionpoint.rst b/docs/source/debugger/exceptionpoint.rst index 52a8ee67a19..46ce7b8d41a 100644 --- a/docs/source/debugger/exceptionpoint.rst +++ b/docs/source/debugger/exceptionpoint.rst @@ -1,21 +1,21 @@ .. _debugger-exceptionpoint-list: -Exception Point Debugger Commands -================================= +Exceptionpoint Debugger Commands +================================ :ref:`debugger-command-epset` - sets a new exception point + sets a new exceptionpoint :ref:`debugger-command-epclear` - clears a specific exception point or all exception points + clears a specific exceptionpoint or all exceptionpoints :ref:`debugger-command-epdisable` - disables a specific exception point or all exception points + disables a specific exceptionpoint or all exceptionpoints :ref:`debugger-command-epenable` - enables a specific exception point or all exception points + enables a specific exceptionpoint or all exceptionpoints :ref:`debugger-command-eplist` - lists exception points + lists exceptionpoints -Exception points halt execution and activate the debugger when -a CPU raises a particular exception number. +Exceptionpoints halt execution and activate the debugger when a CPU +raises a particular exception number. .. _debugger-command-epset: @@ -25,24 +25,24 @@ epset **ep[set] [,[,]]** -Sets a new exception point for exceptions of type ****. The +Sets a new exceptionpoint for exceptions of type ****. The optional **** parameter lets you specify an expression that -will be evaluated each time the exception point is hit. If the result -of the expression is true (non-zero), the exception point will actually +will be evaluated each time the exceptionpoint is hit. If the result +of the expression is true (non-zero), the exceptionpoint will actually halt execution at the start of the exception handler; otherwise, execution will continue with no notification. The optional **** -parameter provides a command that is executed whenever the exception -point is hit and the **** is true. Note that you may need to -embed the action within braces ``{ }`` in order to prevent commas and -semicolons from being interpreted as applying to the ``epset`` command -itself. +parameter provides a command that is executed whenever the +exceptionpoint is hit and the **** is true. Note that you +may need to embed the action within braces ``{ }`` in order to prevent +commas and semicolons from being interpreted as applying to the +``epset`` command itself. The numbering of exceptions depends upon the CPU type. Causes of exceptions may include internally or externally vectored interrupts, errors occurring within instructions and system calls. -Each exception point that is set is assigned an index which can be used -in other exception point commands to reference this exception point. +Each exceptionpoint that is set is assigned an index which can be used +in other exceptionpoint commands to reference this exceptionpoint. Examples: @@ -60,17 +60,17 @@ epclear **epclear [[,…]]** -The epclear command clears exception points. If **** is -specified, only the requested exception points are cleared, otherwise -all exception points are cleared. +The epclear command clears exceptionpoints. If **** is +specified, only the requested exceptionpoints are cleared, otherwise +all exceptionpoints are cleared. Examples: ``epclear 3`` - Clear exception point index 3. + Clear exceptionpoint index 3. ``epclear`` - Clear all exception points. + Clear all exceptionpoints. Back to :ref:`debugger-exceptionpoint-list` @@ -82,19 +82,19 @@ epdisable **epdisable [[,…]]** -The epdisable command disables exception points. If **** is -specified, only the requested exception points are disabled, otherwise -all exception points are disabled. Note that disabling an exception -point does not delete it, it just temporarily marks the exception -point as inactive. +The epdisable command disables exceptionpoints. If **** is +specified, only the requested exceptionpoints are disabled, otherwise +all exceptionpoints are disabled. Note that disabling an +exceptionpoint does not delete it, it just temporarily marks the +exceptionpoint as inactive. Examples: ``epdisable 3`` - Disable exception point index 3. + Disable exceptionpoint index 3. ``epdisable`` - Disable all exception points. + Disable all exceptionpoints. Back to :ref:`debugger-exceptionpoint-list` @@ -106,17 +106,17 @@ epenable **epenable [[,…]]** -The epenable command enables exception points. If **** is -specified, only the requested exception points are enabled, otherwise -all exception points are enabled. +The epenable command enables exceptionpoints. If **** is +specified, only the requested exceptionpoints are enabled, otherwise +all exceptionpoints are enabled. Examples: ``epenable 3`` - Enable exception point index 3. + Enable exceptionpoint index 3. ``epenable`` - Enable all exception points. + Enable all exceptionpoints. Back to :ref:`debugger-exceptionpoint-list` @@ -128,7 +128,7 @@ eplist **eplist** -The eplist command lists all the current exception points, along with +The eplist command lists all the current exceptionpoints, along with their index and any conditions or actions attached to them. Back to :ref:`debugger-exceptionpoint-list` diff --git a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx index 90c80928f7d..d5c39b3a59c 100644 --- a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx +++ b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx @@ -1633,8 +1633,10 @@ void hyperstone_device::generate_movi(drcuml_block &block, compiler_state &compi UML_AND(block, DRC_SR, DRC_SR, ~(Z_MASK | N_MASK)); - if (src) - UML_OR(block, DRC_SR, DRC_SR, (src & 0x80000000) ? (Z_MASK | N_MASK) : Z_MASK); + if (!src) + UML_OR(block, DRC_SR, DRC_SR, Z_MASK); + else if (src & 0x80000000) + UML_OR(block, DRC_SR, DRC_SR, N_MASK); #if MISSIONCRAFT_FLAGS UML_AND(block, DRC_SR, DRC_SR, ~V_MASK); diff --git a/src/emu/debug/debughlp.cpp b/src/emu/debug/debughlp.cpp index 76102402bcb..8e5fa1b9c64 100644 --- a/src/emu/debug/debughlp.cpp +++ b/src/emu/debug/debughlp.cpp @@ -46,7 +46,7 @@ const help_item f_static_help_list[] = " Breakpoints\n" " Watchpoints\n" " Registerpoints\n" - " Exception Points\n" + " Exceptionpoints\n" " Expressions\n" " Comments\n" " Cheats\n" @@ -195,14 +195,14 @@ const help_item f_static_help_list[] = { "exceptionpoints", "\n" - "Exception Point Commands\n" + "Exceptionpoint Commands\n" "Type help for further details on each command\n" "\n" - " ep[set] [,[,]] -- sets exception point on \n" - " epclear [] -- clears a given exception point or all if no specified\n" - " epdisable [] -- disabled a given exception point or all if no specified\n" - " epenable [] -- enables a given exception point or all if no specified\n" - " eplist -- lists all the exception points\n" + " ep[set] [,[,]] -- sets exceptionpoint on \n" + " epclear [] -- clears a given exceptionpoint or all if no specified\n" + " epdisable [] -- disabled a given exceptionpoint or all if no specified\n" + " epenable [] -- enables a given exceptionpoint or all if no specified\n" + " eplist -- lists all the exceptionpoints\n" }, { "expressions", @@ -1592,12 +1592,12 @@ const help_item f_static_help_list[] = "\n" " ep[set] [,[,]]\n" "\n" - "Sets a new exception point for exceptions of type on the currently visible CPU. " + "Sets a new exceptionpoint for exceptions of type on the currently visible CPU. " "The optional parameter lets you specify an expression that will be evaluated " - "each time the exception point is hit. If the result of the expression is true (non-zero), " - "the exception point will actually halt execution at the start of the exception handler; " + "each time the exceptionpoint is hit. If the result of the expression is true (non-zero), " + "the exceptionpoint will actually halt execution at the start of the exception handler; " "otherwise, execution will continue with no notification. The optional parameter " - "provides a command that is executed whenever the exception point is hit and the " + "provides a command that is executed whenever the exceptionpoint is hit and the " " is true. Note that you may need to embed the action within braces { } in order " "to prevent commas and semicolons from being interpreted as applying to the epset command " "itself.\n" @@ -1606,8 +1606,8 @@ const help_item f_static_help_list[] = "internally or externally vectored interrupts, errors occurring within instructions and " "system calls.\n" "\n" - "Each exception point that is set is assigned an index which can be used in other " - "exception point commands to reference this exception point.\n" + "Each exceptionpoint that is set is assigned an index which can be used in other " + "exceptionpoint commands to reference this exceptionpoint.\n" "\n" "Examples:\n" "\n" @@ -1620,57 +1620,57 @@ const help_item f_static_help_list[] = "\n" " epclear [[,...]]\n" "\n" - "The epclear command clears exception points. If is specified, only the requested " - "exception points are cleared, otherwise all exception points are cleared.\n" + "The epclear command clears exceptionpoints. If is specified, only the requested " + "exceptionpoints are cleared, otherwise all exceptionpoints are cleared.\n" "\n" "Examples:\n" "\n" "epclear 3\n" - " Clear exception point index 3.\n" + " Clear exceptionpoint index 3.\n" "\n" "epclear\n" - " Clear all exception points.\n" + " Clear all exceptionpoints.\n" }, { "epdisable", "\n" " epdisable [[,...]]\n" "\n" - "The epdisable command disables exception points. If is specified, only the requested " - "exception points are disabled, otherwise all exception points are disabled. Note that " - "disabling an exception point does not delete it, it just temporarily marks the exception " - "point as inactive.\n" + "The epdisable command disables exceptionpoints. If is specified, only the requested " + "exceptionpoints are disabled, otherwise all exceptionpoints are disabled. Note that " + "disabling an exceptionpoint does not delete it, it just temporarily marks the " + "exceptionpoint as inactive.\n" "\n" "Examples:\n" "\n" "epdisable 3\n" - " Disable exception point index 3.\n" + " Disable exceptionpoint index 3.\n" "\n" "epdisable\n" - " Disable all exception points.\n" + " Disable all exceptionpoints.\n" }, { "epenable", "\n" " epenable [[,...]]\n" "\n" - "The epenable command enables exception points. If is specified, only the " - "requested exception points are enabled, otherwise all exception points are enabled.\n" + "The epenable command enables exceptionpoints. If is specified, only the " + "requested exceptionpoints are enabled, otherwise all exceptionpoints are enabled.\n" "\n" "Examples:\n" "\n" "epenable 3\n" - " Enable exception point index 3.\n" + " Enable exceptionpoint index 3.\n" "\n" "epenable\n" - " Enable all exception points.\n" + " Enable all exceptionpoints.\n" }, { "eplist", "\n" " eplist\n" "\n" - "The eplist command lists all the current exception points, along with their index and " + "The eplist command lists all the current exceptionpoints, along with their index and " "any conditions or actions attached to them.\n" }, { diff --git a/src/mame/misc/dgpix.cpp b/src/mame/misc/dgpix.cpp index 0a7ba5403f6..016ec37e8e6 100644 --- a/src/mame/misc/dgpix.cpp +++ b/src/mame/misc/dgpix.cpp @@ -993,8 +993,8 @@ void dgpix_bmkey_state::init_btplay2k() GAME( 1999, elfin, 0, dgpix, dgpix, dgpix_typea_state, init_elfin, ROT0, "dgPIX Entertainment Inc.", "Elfin", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1999, jumpjump, 0, dgpix, dgpix, dgpix_typea_state, init_jumpjump, ROT0, "dgPIX Entertainment Inc.", "Jump Jump", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1999, xfiles, 0, dgpix, dgpix, dgpix_typea_state, init_xfiles, ROT0, "dgPIX Entertainment Inc.", "The X-Files", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1999, xfilesk, xfiles, dgpix, dgpix, dgpix_typea_state, init_xfilesk, ROT0, "dgPIX Entertainment Inc.", "The X-Files (Censored, Korea)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAME( 1999, kdynastg, 0, dgpix_kdynastg, dgpix, dgpix_typea_state, init_kdynastg, ROT0, "EZ Graphics", "King of Dynast Gear (version 1.8)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1999, xfilesk, xfiles, dgpix, dgpix, dgpix_typea_state, init_xfilesk, ROT0, "dgPIX Entertainment Inc.", "The X-Files (censored, Korea)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) +GAME( 1999, kdynastg, 0, dgpix_kdynastg, dgpix, dgpix_typea_state, init_kdynastg, ROT0, "EZ Graphics", "King of Dynast Gear (version 1.8)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1999, letsdnce, 0, dgpix, letsdnce, dgpix_bmkey_state, init_letsdnce, ROT0, "dgPIX Entertainment Inc.", "Let's Dance", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 2000, btplay2k, 0, dgpix, btplay2k, dgpix_bmkey_state, init_btplay2k, ROT0, "dgPIX Entertainment Inc.", "Beat Player 2000", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 2000, fmaniac2p, 0, dgpix, dgpix, dgpix_typea_state, empty_init, ROT0, "Saero Entertainment", "Fishing Maniac 2+", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/skeleton/turnierdart.cpp b/src/mame/skeleton/turnierdart.cpp index a9455dfa31c..b4093f8df3b 100644 --- a/src/mame/skeleton/turnierdart.cpp +++ b/src/mame/skeleton/turnierdart.cpp @@ -2,7 +2,7 @@ // copyright-holders: /************************************************************************ -Skeleton driver for "Turnier Dart" darts machine from Löwen S.P.O.R.T. +Skeleton driver for "Turnier Dart" darts machine from Löwen S.P.O.R.T. (NSM-Löwen, now Löwen Entertainment, part of Novomatic Group). PCB silkscreened "Valley Recreation Products - Coyright © 1997". @@ -113,7 +113,7 @@ ROM_END /* Older version, with the following games: GAMES OPTION I OPTION II - --------------- -------------- ----------------- + --------------- -------------- ----------------- 301 DOUBLE IN TEAM: 2 SPIELEN 501 DOUBLE OUT TEAM: 4 SPIELEN 701 MASTERS OUT HANDICAP @@ -122,7 +122,7 @@ ROM_END HI SCORE CUT THROAT SHANGHAI MASTERS CRCKET 301 ELIMINATION CUT THROAT - SPLIT SCORE + SPLIT SCORE RAPID FIRE */ ROM_START(turnierda)