-bus/isa/ubpnic.cpp: Added side effect checks.

-cpu/uml.cpp: Added a simplification rule for pathological cases of
 SEXT.

-docs: Documented the DRC UML SEXT instruction.

-Tidied some random stuff.

Author: cuavas

docs/source/techspecs/uml_instructions.rst

@@ -2126,6 +2126,60 @@ Simplification rules
   ``src1`` and ``src2`` operands refer to the same memory location or
   register.
 
+.. _umlinst-sext:
+
+SEXT
+~~~~
+
+Sign extend an integer value.
+
++--------------------------+---------------------------------------+
+| Disassembly              | Usage                                 |
++==========================+=======================================+
+| .. code-block::          | .. code-block::                       |
+|                          |                                       |
+|     sext    dst,src,size |     UML_SEXT(block, dst, src, size);  |
+|     dsext   dst,src,size |     UML_DSEXT(block, dst, src, size); |
++--------------------------+---------------------------------------+
+
+Sets ``dst`` to the value of ``src`` sign extended from the size
+specified by the ``size`` operand to the instruction size.
+
+Operands
+^^^^^^^^
+
+dst (32-bit or 64-bit – memory, integer register)
+    The destination where the sign extended value will be stored.
+src (32-bit or 64-bit – memory, integer register, immediate, map variable)
+    The value to sign extend.
+size (access size)
+    The size of the value to sign extend.  Must be ``SIZE_BYTE``
+    (8-bit), ``SIZE_WORD`` (16-bit) or ``SIZE_DWORD`` (32-bit).
+
+Flags
+^^^^^
+
+carry (C)
+    Undefined.
+overflow (V)
+    Undefined.
+zero (Z)
+    Set if the result is zero, or cleared otherwise.
+sign (S)
+    Set to the value of the most significant bit of the result (set if
+    the result is a negative signed integer value, or cleared
+    otherwise).
+unordered (U)
+    Undefined.
+
+Simplification rules
+^^^^^^^^^^^^^^^^^^^^
+
+* Converted to :ref:`MOV <umlinst-mov>`, :ref:`AND <umlinst-and>` or
+  :ref:`OR <umlinst-or>` if the ``src`` operand is an immediate value or
+  if the ``size`` operand specifies a size no smaller than the
+  instruction size.
+
 .. _umlinst-lzcnt:
 
 LZCNT

src/devices/bus/isa/ubpnic.cpp

@@ -84,8 +84,8 @@ class isa8_ubpnic_device
 		, m_buf(nullptr)
 		, m_idx(nullptr)
 		, m_int_state(false)
-{
-}
+	{
+	}
 
 protected:
 	virtual tiny_rom_entry const *device_rom_region() const override ATTR_COLD;
@@ -212,42 +212,50 @@ void isa8_ubpnic_device::mem_map(address_map &map)
 
 u8 isa8_ubpnic_device::txinit_r()
 {
-	LOGMASKED(LOG_REGR, "%s: txinit_r\n", machine().describe_context());
+	if (!machine().side_effects_disabled())
+	{
+		LOGMASKED(LOG_REGR, "%s: txinit_r\n", machine().describe_context());
 
-	m_intstat &= ~(INTSTAT_TPKTOK | INTSTAT_TXDONE);
+		m_intstat &= ~(INTSTAT_TPKTOK | INTSTAT_TXDONE);
 
-	// trigger dma transfer
-	txdrq_w(1);
+		// trigger dma transfer
+		txdrq_w(1);
+	}
 
 	return 0;
 }
 
 u8 isa8_ubpnic_device::clrpav_r()
 {
-	LOGMASKED(LOG_REGR, "%s: clrpav_r\n", machine().describe_context());
+	if (!machine().side_effects_disabled())
+	{
+		LOGMASKED(LOG_REGR, "%s: clrpav_r\n", machine().describe_context());
 
-	// initialize next empty page if rx buffer was full
-	if (rxb_full())
-		m_idx[m_epppav & EPP_EPP] = 0;
+		// initialize next empty page if rx buffer was full
+		if (rxb_full())
+			m_idx[m_epppav & EPP_EPP] = 0;
 
-	m_epppav &= ~EPP_PAV;
+		m_epppav &= ~EPP_PAV;
 
-	if (!(m_intstat & INTSTAT_PAVINT))
-		irq<INTSTAT_PAVINT>(0);
+		if (!(m_intstat & INTSTAT_PAVINT))
+			irq<INTSTAT_PAVINT>(0);
+	}
 
 	return 0;
 }
 
 u8 isa8_ubpnic_device::intstat_r()
 {
-	LOGMASKED(LOG_REGR, "%s: intstat_r 0x%02x\n", machine().describe_context(), m_intstat);
+	if (!machine().side_effects_disabled())
+		LOGMASKED(LOG_REGR, "%s: intstat_r 0x%02x\n", machine().describe_context(), m_intstat);
 
 	return m_intstat;
 }
 
 u8 isa8_ubpnic_device::epppav_r()
 {
-	LOGMASKED(LOG_REGR, "%s: epppav_r 0x%02x\n", machine().describe_context(), m_epppav);
+	if (!machine().side_effects_disabled())
+		LOGMASKED(LOG_REGR, "%s: epppav_r 0x%02x\n", machine().describe_context(), m_epppav);
 
 	return m_epppav;
 }
@@ -327,6 +335,7 @@ void isa8_ubpnic_device::intctl_w(u8 data)
 
 	interrupt();
 }
+
 void isa8_ubpnic_device::fppmie_w(u8 data)
 {
 	LOGMASKED(LOG_REGW, "%s: fppmie_w 0x%02x\n", machine().describe_context(), data);
@@ -338,7 +347,8 @@ void isa8_ubpnic_device::fppmie_w(u8 data)
 
 u8 isa8_ubpnic_device::rpidx_r(offs_t offset)
 {
-	LOGMASKED(LOG_REGR, "%s: rpidx_r 0x%02x data 0x%02x\n", machine().describe_context(), offset, m_idx[offset]);
+	if (!machine().side_effects_disabled())
+		LOGMASKED(LOG_REGR, "%s: rpidx_r 0x%02x data 0x%02x\n", machine().describe_context(), offset, m_idx[offset]);
 
 	return m_idx[offset];
 }
@@ -352,7 +362,8 @@ void isa8_ubpnic_device::rpidx_w(offs_t offset, u8 data)
 
 u8 isa8_ubpnic_device::buf_r(offs_t offset)
 {
-	LOGMASKED(LOG_BUF, "%s: buf_r 0x%02x data 0x%02x\n", machine().describe_context(), offset, m_buf[offset]);
+	if (!machine().side_effects_disabled())
+		LOGMASKED(LOG_BUF, "%s: buf_r 0x%02x data 0x%02x\n", machine().describe_context(), offset, m_buf[offset]);
 
 	return m_buf[offset];
 }

src/devices/bus/thomson/cd90_351.cpp

@@ -10,11 +10,39 @@
 
 #include "emu.h"
 #include "cd90_351.h"
+
+#include "imagedev/floppy.h"
+#include "machine/thmfc1.h"
+
 #include "formats/sap_dsk.h"
 #include "formats/thom_dsk.h"
-#include "machine/thmfc1.h"
 
-DEFINE_DEVICE_TYPE(CD90_351, cd90_351_device, "cd90_351", "Thomson CD 90-351 Diskette Controller")
+namespace {
+
+class cd90_351_device : public device_t, public thomson_extension_interface
+{
+public:
+	cd90_351_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~cd90_351_device() = default;
+
+	virtual void rom_map(address_map &map) override ATTR_COLD;
+	virtual void io_map(address_map &map) override ATTR_COLD;
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
+	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
+	virtual void device_start() override ATTR_COLD;
+	virtual void device_reset() override ATTR_COLD;
+
+private:
+	required_memory_region m_rom;
+	memory_bank_creator m_rom_bank;
+
+	static void floppy_formats(format_registration &fr);
+	static void floppy_drives(device_slot_interface &device);
+
+	void bank_w(u8 data);
+};
 
 cd90_351_device::cd90_351_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, CD90_351, tag, owner, clock),
@@ -86,3 +114,7 @@ void cd90_351_device::bank_w(u8 data)
 	logerror("bank_w %d\n", data & 3);
 	m_rom_bank->set_entry(data & 3);
 }
+
+} // anonymous namespace
+
+DEFINE_DEVICE_TYPE_PRIVATE(CD90_351, thomson_extension_interface, cd90_351_device, "cd90_351", "Thomson CD 90-351 Diskette Controller")

src/devices/bus/thomson/cd90_351.h

@@ -5,38 +5,13 @@
 //
 // Handles up to two 3.5 dual-sided drives (DD 90-352)
 // or up to two 2.8 dual-sided QDD drivers (QD 90-280)
-
 #ifndef MAME_BUS_THOMSON_CD90_351_H
 #define MAME_BUS_THOMSON_CD90_351_H
 
-#include "extension.h"
-#include "imagedev/floppy.h"
-
-class cd90_351_device : public device_t, public thomson_extension_interface
-{
-public:
-	cd90_351_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-	virtual ~cd90_351_device() = default;
-
-	virtual void rom_map(address_map &map) override ATTR_COLD;
-	virtual void io_map(address_map &map) override ATTR_COLD;
+#pragma once
 
-protected:
-	virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD;
-	virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
-	virtual void device_start() override ATTR_COLD;
-	virtual void device_reset() override ATTR_COLD;
-
-private:
-	required_memory_region m_rom;
-	memory_bank_creator m_rom_bank;
-
-	static void floppy_formats(format_registration &fr);
-	static void floppy_drives(device_slot_interface &device);
-
-	void bank_w(u8 data);
-};
+#include "extension.h"
 
-DECLARE_DEVICE_TYPE(CD90_351, cd90_351_device)
+DECLARE_DEVICE_TYPE(CD90_351, thomson_extension_interface)
 
 #endif

src/devices/cpu/uml.cpp

@@ -427,6 +427,19 @@ struct uml::instruction::simplify_op
 			}
 			convert_to_mov_immediate(inst, val);
 		}
+		else if ((1 << inst.param(2).size()) >= inst.size())
+		{
+			if (inst.flags())
+			{
+				inst.m_opcode = OP_AND;
+				inst.m_param[2] = size_mask(inst);
+			}
+			else
+			{
+				inst.m_opcode = OP_MOV;
+				inst.m_numparams = 2;
+			}
+		}
 	}
 
 	static void roland(instruction &inst)

src/devices/video/upd7220.cpp

@@ -1426,14 +1426,12 @@ void upd7220_device::process_fifo()
 			LOGCMD3("WDAT PATTERN=%04x\n", m_pattern);
 			if (m_figs.m_figure_type)
 				break;
-			LOGCMD3("- CR=%02x (%02x %02x) (%c) EAD=%06x - FIGS DC=%04x\n"
-				, m_cr
-				, m_pr[2]
-				, m_pr[1]
-				, m_pr[1] ? m_pr[1]:' '
-				, m_ead
-				, m_figs.m_dc
-			);
+			LOGCMD3("- CR=%02x (%02x %02x) (%c) EAD=%06x - FIGS DC=%04x\n",
+					m_cr,
+					m_pr[2], m_pr[1],
+					m_pr[1] ? m_pr[1] : ' ',
+					m_ead,
+					m_figs.m_dc);
 			fifo_set_direction(FIFO_WRITE);
 
 			wdat((m_cr & 0x18) >> 3,m_cr & 3);

src/mame/atari/atarisy2.h

@@ -5,17 +5,23 @@
     Atari System 2 hardware
 
 *************************************************************************/
+#ifndef MAME_ATARI_ATARISY2_H
+#define MAME_ATARI_ATARISY2_H
+
+#pragma once
+
+#include "atarimo.h"
+#include "slapstic.h"
 
 #include "cpu/m6502/m6502.h"
 #include "cpu/t11/t11.h"
 #include "machine/gen_latch.h"
-#include "slapstic.h"
 #include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "sound/pokey.h"
 #include "sound/tms5220.h"
 #include "sound/ymopm.h"
-#include "atarimo.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "tilemap.h"
@@ -53,18 +59,18 @@ class atarisy2_state : public driver_device
 		, m_leds(*this, "led%u", 0U)
 	{ }
 
-	void init_ssprint();
-	void init_apb();
-	void init_csprint();
-	void init_paperboy();
-	void init_720();
+	void init_ssprint() ATTR_COLD;
+	void init_apb() ATTR_COLD;
+	void init_csprint() ATTR_COLD;
+	void init_paperboy() ATTR_COLD;
+	void init_720() ATTR_COLD;
 
-	void atarisy2(machine_config &config);
-	void apb(machine_config &config);
-	void paperboy(machine_config &config);
-	void ssprint(machine_config &config);
-	void _720(machine_config &config);
-	void csprint(machine_config &config);
+	void atarisy2(machine_config &config) ATTR_COLD;
+	void apb(machine_config &config) ATTR_COLD;
+	void paperboy(machine_config &config) ATTR_COLD;
+	void ssprint(machine_config &config) ATTR_COLD;
+	void _720(machine_config &config) ATTR_COLD;
+	void csprint(machine_config &config) ATTR_COLD;
 
 protected:
 	virtual void machine_start() override ATTR_COLD;
@@ -167,3 +173,5 @@ class atarisy2_state : public driver_device
 	void main_map(address_map &map) ATTR_COLD;
 	void sound_map(address_map &map) ATTR_COLD;
 };
+
+#endif // MAME_ATARI_ATARISY2_H

src/mame/dynax/hanafuda.h

@@ -1,5 +1,11 @@
 // license:BSD-3-Clause
 // copyright-holders:Fabio Priuli
+#ifndef MAME_DYNAX_HANAFUDA_H
+#define MAME_DYNAX_HANAFUDA_H
+
+#pragma once
 
 INPUT_PORTS_EXTERN(dynax_hanafuda_keys);
 INPUT_PORTS_EXTERN(dynax_hanafuda_keys_bet);
+
+#endif // MAME_DYNAX_HANAFUDA_H