--- np2/pccore.c	2004/05/07 11:42:29	1.87
+++ np2/pccore.c	2004/06/18 07:42:13	1.90
@@ -259,8 +259,8 @@ void pccore_cfgupdate(void) {
 
 	renewal = FALSE;
 	for (i=0; i<8; i++) {
-		if (np2cfg.memsw[i] != mem[MEMB_MSW + i*4]) {
-			np2cfg.memsw[i] = mem[MEMB_MSW + i*4];
+		if (np2cfg.memsw[i] != mem[MEMX_MSW + i*4]) {
+			np2cfg.memsw[i] = mem[MEMX_MSW + i*4];
 			renewal = TRUE;
 		}
 	}
@@ -616,7 +616,7 @@ void pccore_exec(BOOL draw) {
 #endif
 		}
 
-#if 0 // ndef TRACE
+#if !defined(SINGLESTEPONLY)
 		if (CPU_REMCLOCK > 0) {
 			if (!(CPU_TYPE & CPUTYPE_V30)) {
 				CPU_EXEC();
@@ -631,28 +631,6 @@ void pccore_exec(BOOL draw) {
 			treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;
 			trpos++;
 #endif
-#if 0
-			if ((CPU_CS == 0xf800) && (CPU_IP == 0x0B5B)) {
-				TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x",
-							mem[0x9000], mem[0x9001],
-							mem[0x9002], mem[0x9003],
-							mem[0x9004], mem[0x9005],
-							mem[0x9006], mem[0x9007],
-							mem[0x9008], mem[0x9009]));
-			}
-			if ((CPU_CS == 0xf800) && (CPU_IP == 0x15FF)) {
-				TRACEOUT(("DX = %.4x / DS:DI = %.4x:%.4x [%.2x]",
-									CPU_DX, CPU_DS, CPU_DI, mem[0xa3fe0]));
-			}
-#endif
-#if 0
-			if (CPU_IP == 0x2E4F) {
-				TRACEOUT(("CS = %.4x - 0x2e4f", CPU_CS));
-			}
-#endif
-			if (CPU_CS == 0xfd80) {
-				TRACEOUT(("%.4x:%.4x - %.2x", CPU_CS, CPU_IP, CPU_AH));
-			}
 			i286x_step();
 //			i286c_step();
 		}