osd/modules/debugger/debuggdbstub.cpp: proper Z80 architecture support in the gdbstub

assisted: GLM-5.1
ref: https://sourceware.org/git/\?p\=binutils-gdb.git\;a\=blob_plain\;f\=gdb/features/z80.c\;hb\=HEAD

Author: holub

src/devices/cpu/z80/kc82.h

@@ -23,7 +23,7 @@ class kc82_device : public z80_device
 public:
 	enum
 	{
-		KC82_B1 = Z80_WZ + 1, KC82_B2, KC82_B3, KC82_B4,
+		KC82_B1 = Z80__LAST + 1, KC82_B2, KC82_B3, KC82_B4,
 		KC82_A1, KC82_A2, KC82_A3
 	};
 

src/devices/cpu/z80/z80.cpp

@@ -675,7 +675,7 @@ void z80_device::device_start()
 	save_item(NAME(m_tmp_irq_vector));
 	save_item(NAME(m_shared_data.w));
 	save_item(NAME(m_shared_data2.w));
-	save_item(NAME(m_rtemp));
+	save_item(NAME(m_irtmp.w));
 	save_item(NAME(m_ref));
 
 	// Reset registers to their initial values
@@ -710,7 +710,7 @@ void z80_device::device_start()
 	m_busack_state = 0;
 	m_ea = 0;
 	m_service_attention = 0;
-	m_rtemp = 0;
+	m_irtmp.w = 0;
 
 	space(AS_PROGRAM).cache(m_args);
 	space(has_space(AS_OPCODES) ? AS_OPCODES : AS_PROGRAM).cache(m_opcodes);
@@ -744,8 +744,9 @@ void z80_device::device_start()
 	state_add(Z80_DE2,         "DE2",       m_de2.w);
 	state_add(Z80_HL2,         "HL2",       m_hl2.w);
 	state_add(Z80_WZ,          "WZ",        WZ);
-	state_add(Z80_R,           "R",         m_rtemp).callimport().callexport();
+	state_add(Z80_R,           "R",         m_irtmp.b.l).callimport().callexport();
 	state_add(Z80_I,           "I",         m_i);
+	state_add(Z80_IR,          "IR",        m_irtmp.w).noshow().callimport().callexport();
 	state_add(Z80_IM,          "IM",        m_im).mask(0x3);
 	state_add(Z80_IFF1,        "IFF1",      m_iff1).mask(0x1);
 	state_add(Z80_IFF2,        "IFF2",      m_iff2).mask(0x1);
@@ -844,9 +845,12 @@ void z80_device::state_import(const device_state_entry &entry)
 	case Z80_F: case Z80_AF:
 		set_f(F);
 		break;
+	case Z80_IR:
+		m_i = m_irtmp.b.h;
+		[[fallthrough]];
 	case Z80_R:
-		m_r = m_rtemp & 0x7f;
-		m_r2 = m_rtemp & 0x80;
+		m_r = m_irtmp.b.l & 0x7f;
+		m_r2 = m_irtmp.b.l & 0x80;
 		break;
 
 	default:
@@ -861,8 +865,8 @@ void z80_device::state_export(const device_state_entry &entry)
 	case Z80_F: case Z80_AF:
 		F = get_f();
 		break;
-	case Z80_R:
-		m_rtemp = (m_r & 0x7f) | (m_r2 & 0x80);
+	case Z80_IR: case Z80_R:
+		m_irtmp.w = (m_i << 8) | ((m_r & 0x7f) | (m_r2 & 0x80));
 		break;
 
 	default:

src/devices/cpu/z80/z80.h

@@ -22,7 +22,8 @@ enum
 	Z80_AF, Z80_BC, Z80_DE, Z80_HL,
 	Z80_IX, Z80_IY, Z80_AF2, Z80_BC2, Z80_DE2, Z80_HL2,
 	Z80_R, Z80_I, Z80_IM, Z80_IFF1, Z80_IFF2, Z80_HALT,
-	Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3, Z80_WZ
+	Z80_DC0, Z80_DC1, Z80_DC2, Z80_DC3, Z80_WZ, Z80_IR,
+	Z80__LAST = Z80_IR
 };
 
 class z80_device : public cpu_device, public z80_daisy_chain_interface
@@ -208,7 +209,7 @@ class z80_device : public cpu_device, public z80_daisy_chain_interface
 	int    m_tmp_irq_vector;
 	PAIR16 m_shared_data;
 	PAIR16 m_shared_data2;
-	u8     m_rtemp;
+	PAIR16 m_irtmp;
 
 	u32    m_ref;
 	u8     m_m1_cycles;

src/devices/cpu/z80/z84c015.h

@@ -16,7 +16,7 @@
 
 enum
 {
-	Z84_WCR = Z80_WZ + 1, Z84_MWBR, Z84_CSBR, Z84_MCR
+	Z84_WCR = Z80__LAST + 1, Z84_MWBR, Z84_CSBR, Z84_MCR
 };
 
 /***************************************************************************

src/osd/modules/debugger/debuggdbstub.cpp

@@ -359,7 +359,7 @@ static const gdb_register_map gdb_register_map_z80 =
 	"z80",
 	{
 		{
-			"mame.z80",
+			"org.gnu.gdb.z80.cpu",
 			{
 				{ "AF",  "af",  false, TYPE_INT },
 				{ "BC",  "bc",  false, TYPE_INT },
@@ -373,6 +373,7 @@ static const gdb_register_map gdb_register_map_z80 =
 				{ "IY",  "iy",  false, TYPE_INT },
 				{ "SP",  "sp",  true,  TYPE_DATA_POINTER },
 				{ "PC",  "pc",  true,  TYPE_CODE_POINTER },
+				{ "IR",  "ir",  false, TYPE_INT },
 			}
 		}
 	}