diff --git a/src/emu/cpuintrf.h b/src/emu/cpuintrf.h
index 3746d2452fe..4395344dd78 100644
--- a/src/emu/cpuintrf.h
+++ b/src/emu/cpuintrf.h
@@ -459,6 +459,7 @@ CPU_GET_INFO( dummy );
 #define CPU_DUMMY CPU_GET_INFO_NAME( dummy )
 
 
+
 /***************************************************************************
     FUNCTION PROTOTYPES
 ***************************************************************************/
diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c
index 4d583472d33..a12e78f9c47 100644
--- a/src/emu/debug/debugvw.c
+++ b/src/emu/debug/debugvw.c
@@ -1268,6 +1268,8 @@ static void registers_view_recompute(debug_view *view)
 		{
 			if (regnum >= table->entrycount)
 				break;
+			if ((table->entrylist[regnum].validmask & table->subtypemask) == 0)
+				continue;
 			regid = table->entrylist[regnum].index;
 		}
 		else