--- np2/pccore.c	2005/03/24 01:42:46	1.104
+++ np2/pccore.c	2005/05/20 13:59:45	1.106
@@ -359,7 +359,7 @@ void pccore_reset(void) {
 	cbuscore_reset();
 	fmboard_reset(pccore.sound);
 
-	i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0);
+	MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0);
 	iocore_build();
 	iocore_bind();
 	cbuscore_bind();
@@ -564,6 +564,8 @@ void screenvsync(NEVENTITEM item) {
 
 // ---------------------------------------------------------------------------
 
+// #define SINGLESTEPONLY
+
 #if defined(TRACE)
 static int resetcnt = 0;
 static int execcnt = 0;
@@ -602,6 +604,7 @@ void pccore_exec(BOOL draw) {
 			CPU_RESETREQ = 0;
 			CPU_SHUT();
 		}
+#if !defined(SINGLESTEPONLY)
 		if (CPU_REMCLOCK > 0) {
 			if (!(CPU_TYPE & CPUTYPE_V30)) {
 				CPU_EXEC();
@@ -610,6 +613,11 @@ void pccore_exec(BOOL draw) {
 				CPU_EXECV30();
 			}
 		}
+#else
+		while(CPU_REMCLOCK > 0) {
+			CPU_STEPEXEC();
+		}
+#endif
 		nevent_progress();
 	}
 	artic_callback();