--- np2/pccore.c	2004/05/07 11:42:29	1.87
+++ np2/pccore.c	2004/06/20 00:56:26	1.91
@@ -41,7 +41,7 @@
 #include	"debugsub.h"
 
 
-	const char	np2version[] = NP2VER_CORE;
+const OEMCHAR np2version[] = OEMTEXT(NP2VER_CORE);
 
 	NP2CFG	np2cfg = {
 				0, 1, 0, 32, 0, 0, 0x40,
@@ -49,7 +49,7 @@
 				{0x3e, 0x73, 0x7b}, 0,
 				0, 0, {1, 1, 6, 1, 8, 1},
 
-				"VX", PCBASECLOCK25, 4,
+				OEMTEXT("VX"), PCBASECLOCK25, 4,
 				{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e},
 				1, 1, 2, 1, 0x000000, 0xffffff,
 				22050, 500, 4, 0,
@@ -58,18 +58,18 @@
 				1, 0x82,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
 				3, 1, 80, 0, 0,
-				{"", ""},
+				{OEMTEXT(""), OEMTEXT("")},
 #if defined(SUPPORT_SCSI)
-				{"", "", "", ""},
+				{OEMTEXT(""), OEMTEXT(""), OEMTEXT(""), OEMTEXT("")},
 #endif
-				"", "", ""};
+				OEMTEXT(""), OEMTEXT(""), OEMTEXT("")};
 
 	PCCORE	pccore = {	PCBASECLOCK25, 4,
 						0, PCMODEL_VX, 0, 0, {0x3e, 0x73, 0x7b}, 0,
 						0, 0,
 						4 * PCBASECLOCK25};
 
-	BYTE	screenupdate = 3;
+	UINT8	screenupdate = 3;
 	int		screendispflag = 1;
 	int		soundrenewal = 0;
 	BOOL	drawframe;
@@ -79,9 +79,9 @@
 
 // ---------------------------------------------------------------------------
 
-void getbiospath(char *path, const char *fname, int maxlen) {
+void getbiospath(OEMCHAR *path, const OEMCHAR *fname, int maxlen) {
 
-const char	*p;
+const OEMCHAR	*p;
 
 	p = np2cfg.biospath;
 	if (p[0]) {
@@ -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;
 		}
 	}
@@ -603,20 +603,10 @@ void pccore_exec(BOOL draw) {
 		pic_irq();
 		if (CPU_RESETREQ) {
 			CPU_RESETREQ = 0;
-#if 1
 			CPU_SHUT();
-#else
-			CPU_CS = 0xf000;
-			CS_BASE = 0xf0000;
-			CPU_IP = 0xfff0;
-#if defined(CPUCORE_IA32)
-			CPU_DX = 0x0300;
-#endif
-			CPU_CLEARPREFETCH();
-#endif
 		}
 
-#if 0 // ndef TRACE
+#if !defined(SINGLESTEPONLY)
 		if (CPU_REMCLOCK > 0) {
 			if (!(CPU_TYPE & CPUTYPE_V30)) {
 				CPU_EXEC();
@@ -631,28 +621,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();
 		}