--- np2/pccore.c	2005/03/23 08:07:47	1.103
+++ np2/pccore.c	2005/05/20 13:59:45	1.106
@@ -141,6 +141,12 @@ static void pccore_set(void) {
 	// HDDの接続 (I/Oの使用状態が変わるので..
 	if (np2cfg.dipsw[1] & 0x20) {
 		pccore.hddif |= PCHDD_IDE;
+#if defined(SUPPORT_IDEIO)
+		sxsi_setdevtype(0x02, SXSIDEV_CDROM);
+#endif
+	}
+	else {
+		sxsi_setdevtype(0x02, SXSIDEV_NC);
 	}
 
 	// 拡張メモリ
@@ -222,11 +228,6 @@ void pccore_init(void) {
 	dispsync_initialize();
 	sxsi_initialize();
 
-	// CDドライブの接続
-#if defined(SUPPORT_IDEIO)
-	sxsi_setdevtype(0x02, SXSIDEV_CDROM);
-#endif
-
 	font_initialize();
 	font_load(np2cfg.fontfile, TRUE);
 	maketext_initialize();
@@ -358,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();
@@ -563,6 +564,8 @@ void screenvsync(NEVENTITEM item) {
 
 // ---------------------------------------------------------------------------
 
+// #define SINGLESTEPONLY
+
 #if defined(TRACE)
 static int resetcnt = 0;
 static int execcnt = 0;
@@ -601,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();
@@ -609,6 +613,11 @@ void pccore_exec(BOOL draw) {
 				CPU_EXECV30();
 			}
 		}
+#else
+		while(CPU_REMCLOCK > 0) {
+			CPU_STEPEXEC();
+		}
+#endif
 		nevent_progress();
 	}
 	artic_callback();