From 064b1f2051c814bc84032f430dddfbe831c9963a Mon Sep 17 00:00:00 2001
From: Andrei Holub <andrei.holub@gmail.com>
Date: Fri, 4 Apr 2025 15:31:06 -0400
Subject: [PATCH] tidy

---
 src/devices/cpu/z80/nsc800.cpp | 6 ------
 src/devices/cpu/z80/r800.cpp   | 6 ------
 src/devices/cpu/z80/z80.cpp    | 6 ------
 src/devices/cpu/z80/z80make.py | 5 +++++
 src/devices/cpu/z80/z80n.cpp   | 6 ------
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/devices/cpu/z80/nsc800.cpp b/src/devices/cpu/z80/nsc800.cpp
index d94734527e7..63d25fe8a71 100644
--- a/src/devices/cpu/z80/nsc800.cpp
+++ b/src/devices/cpu/z80/nsc800.cpp
@@ -49,12 +49,6 @@ void nsc800_device::device_reset()
 //-------------------------------------------------
 void nsc800_device::execute_run()
 {
-	if (m_wait_state)
-	{
-		m_icount = 0; // stalled
-		return;
-	}
-
 	#include "cpu/z80/ncs800.hxx"
 }
 
diff --git a/src/devices/cpu/z80/r800.cpp b/src/devices/cpu/z80/r800.cpp
index 69b28fd6ac5..648735462e6 100644
--- a/src/devices/cpu/z80/r800.cpp
+++ b/src/devices/cpu/z80/r800.cpp
@@ -99,11 +99,5 @@ void r800_device::muluw(u16 value)
 
 void r800_device::execute_run()
 {
-	if (m_wait_state)
-	{
-		m_icount = 0; // stalled
-		return;
-	}
-
 	#include "cpu/z80/r800.hxx"
 }
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index 99601d7860b..ba96ac62beb 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -704,12 +704,6 @@ void z80_device::device_reset()
  ****************************************************************************/
 void z80_device::execute_run()
 {
-	if (m_wait_state)
-	{
-		m_icount = 0; // stalled
-		return;
-	}
-
 	#include "cpu/z80/z80.hxx"
 }
 
diff --git a/src/devices/cpu/z80/z80make.py b/src/devices/cpu/z80/z80make.py
index cba4f6e344e..51e4214e1e9 100644
--- a/src/devices/cpu/z80/z80make.py
+++ b/src/devices/cpu/z80/z80make.py
@@ -220,6 +220,11 @@ class OpcodeList:
 
     def save_exec(self, f):
         prefix = None
+        print("if (m_wait_state)", file=f)
+        print("{", file=f)
+        print("	m_icount = 0; // stalled", file=f)
+        print("	goto leave;", file=f)
+        print("}", file=f)
         print("start:", file=f)
         print("switch (u8(m_ref >> 16)) // prefix", file=f)
         print("{", file=f)
diff --git a/src/devices/cpu/z80/z80n.cpp b/src/devices/cpu/z80/z80n.cpp
index 4398586ed70..52e804d69d1 100644
--- a/src/devices/cpu/z80/z80n.cpp
+++ b/src/devices/cpu/z80/z80n.cpp
@@ -33,12 +33,6 @@ z80n_device::z80n_device(const machine_config &mconfig, const char *tag, device_
 
 void z80n_device::execute_run()
 {
-	if (m_wait_state)
-	{
-		m_icount = 0; // stalled
-		return;
-	}
-
 	#include "cpu/z80/z80n.hxx"
 }