sinclair/specnext_copper.cpp: Improved logging (#14248)

Author: holub

src/mame/sinclair/specnext.cpp

@@ -41,17 +41,16 @@
 #include "speaker.h"
 
 
-#define LOG_IO    (1U << 1)
-#define LOG_MEM   (1U << 2)
-#define LOG_WARN  (1U << 3)
+#define LOG_IO     (1U << 1)
+#define LOG_MEM    (1U << 2)
+#define LOG_COPPER (1U << 3)
 
-//#define VERBOSE ( LOG_GENERAL | LOG_IO | /*LOG_MEM |*/ LOG_WARN )
+//#define VERBOSE ( LOG_GENERAL | LOG_IO | /*LOG_MEM |*/ LOG_COPPER )
 #include "logmacro.h"
 
-#define LOGIO(...)    LOGMASKED(LOG_IO,    __VA_ARGS__)
-#define LOGMEM(...)   LOGMASKED(LOG_MEM,   __VA_ARGS__)
-#define LOGWARN(...)  LOGMASKED(LOG_WARN,  __VA_ARGS__)
-
+#define LOGIO(...)     LOGMASKED(LOG_IO,     __VA_ARGS__)
+#define LOGMEM(...)    LOGMASKED(LOG_MEM,    __VA_ARGS__)
+#define LOGCOPPER(...) LOGMASKED(LOG_COPPER, __VA_ARGS__)
 
 namespace {
 
@@ -911,7 +910,7 @@ void specnext_state::update_video_mode()
 
 	m_eff_nr_03_machine_timing = m_nr_03_machine_timing;
 	m_eff_nr_05_5060 = m_nr_05_5060;
-	LOG("%s: %s %dHz", machine_name, is_hdmi ? "HDMI" : "VGA", m_nr_05_5060 ? 60 : 50);
+	LOG("%s: %s %dHz\n", machine_name, is_hdmi ? "HDMI" : "VGA", m_nr_05_5060 ? 60 : 50);
 }
 
 u32 specnext_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
@@ -1211,24 +1210,34 @@ attotime specnext_state::copper_until_pos_r(u16 pos)
 	const u16 vcount = BIT(pos, 0, 9);
 	const u16 hcount = BIT(pos, 9, 6) << 3;
 	if (vcount > m_video_timings.max_vc || hcount > m_video_timings.max_hc)
+	{
+		LOGCOPPER("[%s] HALT\n", m_copper->tag());
 		return attotime::never;
+	}
 	else
 	{
 		if (BIT(pos, 15))  // MOVE
 		{
 			u16 vtarget = cvc_to_vpos(vcount);
-			u16 htarget = ((hcount/* + 12*/) + m_video_timings.min_hactive + m_screen->width()) % m_screen->width();
+			u16 htarget = ((hcount/* + 12*/) + m_video_timings.min_hactive + m_video_timings.max_hc) %  m_video_timings.max_hc;
 			if (htarget < (m_video_timings.min_hactive))
 				vtarget = (vtarget + 1) % m_screen->height();
 			htarget <<= 1;
-			if (vtarget != m_screen->vpos() || htarget > m_screen->hpos())
+			const u16 vpos = m_screen->vpos();
+			const u16 hpos = m_screen->hpos();
+			LOGCOPPER("[%s] [%02x, %03x] WAIT(%02x+%02x, %03x)\n", m_copper->tag(), vpos, hpos >> 1, m_nr_64_copper_offset, vcount, hcount);
+			if (vtarget != vpos || htarget > hpos)
 				return m_screen->time_until_pos(vtarget, htarget);
 			else
+			{
+				LOGCOPPER("[%s] !WAIT\n", m_copper->tag());
 				return attotime::zero;
+			}
 		}
 		else // FRAME or RESET
 		{
 			assert(!vcount && !hcount);
+			LOGCOPPER("[%s] FRAME (0, 0)\n", m_copper->tag());
 			return m_screen->time_until_pos(cvc_to_vpos(0), m_video_timings.min_hactive << 1);
 		}
 	}
@@ -1715,7 +1724,7 @@ u8 specnext_state::reg_r(offs_t nr_register)
 	default:
 		port_253b_dat = 0x00;
 		if (!machine().side_effects_disabled())
-			LOGWARN("rR: %X -> %x\n", nr_register, port_253b_dat);
+			LOG("rR: %X -> %x\n", nr_register, port_253b_dat);
 	}
 
 	return port_253b_dat;
@@ -2330,7 +2339,7 @@ void specnext_state::reg_w(offs_t nr_wr_reg, u8 nr_wr_dat)
 		LOG("Debug: #%02X\n", nr_wr_dat); // LED
 		break;
 	default:
-		LOGWARN("wR: %X <- %x\n", nr_wr_reg, nr_wr_dat);
+		LOG("wR: %X <- %x\n", nr_wr_reg, nr_wr_dat);
 		break;
 	}
 

src/mame/sinclair/specnext_copper.cpp

@@ -14,12 +14,14 @@
 
 #define LOG_CTRL  (1U << 1)
 #define LOG_DATA  (1U << 2)
+#define LOG_EXEC  (1U << 3)
 
-#define VERBOSE ( LOG_GENERAL /*| LOG_CTRL | LOG_DATA*/ )
+//#define VERBOSE ( LOG_GENERAL /*| LOG_CTRL | LOG_DATA*/ | LOG_EXEC )
 #include "logmacro.h"
 
 #define LOGCTRL(...) LOGMASKED(LOG_CTRL, __VA_ARGS__)
 #define LOGDATA(...) LOGMASKED(LOG_DATA, __VA_ARGS__)
+#define LOGEXEC(...) LOGMASKED(LOG_EXEC, __VA_ARGS__)
 
 
 // device type definition
@@ -82,6 +84,7 @@ TIMER_CALLBACK_MEMBER(specnext_copper_device::timer_callback)
 
 	if (m_copper_dout == 1) // if we are on MOVE, clear the output for the next cycle
 	{
+		LOGEXEC("MOVE(%02x, %02x)\n", (m_copper_list_data >> 8) & 0x7f, m_copper_list_data & 0xff);
 		m_out_nextreg_cb((m_copper_list_data >> 8) & 0x7f, m_copper_list_data & 0xff);
 		m_copper_dout = 0;
 	}