--- np2/pccore.c	2004/01/13 05:30:58	1.44
+++ np2/pccore.c	2004/01/22 08:40:30	1.46
@@ -53,8 +53,8 @@
 				3, {0x0c, 0x0c, 0x08, 0x06, 0x03, 0x0c}, 64, 64, 64, 64, 64,
 				1, 0x82,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
-				1, 80, 0, 0,
-				{"", ""}, "", "", ""};
+				3, 1, 80, 0, 0,
+				{"", ""}, {"", "", "", ""}, "", "", ""};
 
 	PCCORE	pccore = {	PCBASECLOCK25, 4,
 						0, PCMODEL_VX, 0, 0,
@@ -135,20 +135,22 @@ static void setvsyncclock(void) {
 	pccore.vsyncclock = cnt - pccore.dispclock;
 }
 
-static void setpcclock(const char *modelstr, UINT base, UINT multiple) {
+static void pccore_set(void) {
 
 	UINT8	model;
+	UINT32	multiple;
 
+	ZeroMemory(&pccore, sizeof(pccore));
 	model = PCMODEL_VX;
-	if (!milstr_cmp(modelstr, str_VM)) {
+	if (!milstr_cmp(np2cfg.model, str_VM)) {
 		model = PCMODEL_VM;
 	}
-	else if (!milstr_cmp(modelstr, str_EPSON)) {
+	else if (!milstr_cmp(np2cfg.model, str_EPSON)) {
 		model = PCMODEL_EPSON | PCMODEL_VM;
 	}
 	pccore.model = model;
 
-	if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {
+	if (np2cfg.baseclock >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {
 		pccore.baseclock = PCBASECLOCK25;			// 2.5MHz
 		pccore.cpumode = 0;
 	}
@@ -156,6 +158,7 @@ static void setpcclock(const char *model
 		pccore.baseclock = PCBASECLOCK20;			// 2.0MHz
 		pccore.cpumode = CPUMODE_8MHz;
 	}
+	multiple = np2cfg.multiple;
 	if (multiple == 0) {
 		multiple = 1;
 	}
@@ -170,6 +173,27 @@ static void setpcclock(const char *model
 	pccore.vsyncclock = pccore.realclock * 5 / 3102;
 	pccore.keyboardclock = pccore.realclock / 1920;
 	pccore.midiclock = pccore.realclock / 3125;
+
+	// 拡張メモリ
+	pccore.extmem = 0;
+
+	// HDDの接続 (I/Oの使用状態が変わるので..
+//	if (np2cfg.dipsw[1] & 0x20) {
+		pccore.hddif |= PCHDD_IDE;
+//	}
+	pccore.hddif |= PCHDD_SCSI;
+
+	// サウンドボードの接続
+	pccore.sound = np2cfg.SOUND_SW;
+
+	// その他CBUSの接続
+	pccore.device = 0;
+	if (np2cfg.pc9861enable) {
+		pccore.device |= PCCBUS_PC9861K;
+	}
+	if (np2cfg.mpuenable) {
+		pccore.device |= PCCBUS_MPU98;
+	}
 }
 
 
@@ -316,7 +340,8 @@ void pccore_reset(void) {
 		sound_init();
 	}
 
-	setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple);
+	pccore_set();
+
 	sound_changeclock();
 	beep_changeclock();
 	nevent_init();
@@ -543,12 +568,47 @@ void screenvsync(NEVENTITEM item) {
 
 // ---------------------------------------------------------------------------
 
+// #define	IPTRACE			(1 << 16)
+
+#if IPTRACE
+static UINT		trpos;
+static UINT32	treip[IPTRACE];
+
+void iptrace_out(void) {
+
+	FILEH	fh;
+	UINT	s;
+	UINT32	eip;
+	char	buf[32];
+
+	s = trpos;
+	if (s > IPTRACE) {
+		s -= IPTRACE;
+	}
+	else {
+		s = 0;
+	}
+	fh = file_create_c("his.txt");
+	while(s < trpos) {
+		eip = treip[s & (IPTRACE - 1)];
+		s++;
+		SPRINTF(buf, "%.4x:%.4x\r\n", (eip >> 16), eip & 0xffff);
+		file_write(fh, buf, strlen(buf));
+	}
+	file_close(fh);
+}
+#endif
+
+
 #if defined(TRACE)
 static int resetcnt = 0;
 static int execcnt = 0;
 int piccnt = 0;
+int tr = 0;
 #endif
 
+	UINT	cflg;
+
 void pccore_exec(BOOL draw) {
 
 	drawframe = draw;
@@ -597,8 +657,33 @@ void pccore_exec(BOOL draw) {
 		}
 #else
 		while(CPU_REMCLOCK > 0) {
-			TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
-			i286x_step();
+#if IPTRACE
+			treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;
+			trpos++;
+#endif
+			if (tr) {
+				TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
+			}
+#if 0
+			if ((tr & 2) && (mem[0x0471e] == '\\')) {
+				TRACEOUT(("DTA BREAK %.4x:%.4x", CPU_CS, CPU_IP));
+				TRACEOUT(("0471:000e %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x",
+	mem[0x0471e+0], mem[0x0471e+1], mem[0x0471e+2], mem[0x0471e+3],
+	mem[0x0471e+4], mem[0x0471e+5], mem[0x0471e+6], mem[0x0471e+7]));
+				tr -= 2;
+			}
+			// DOS6
+			if (CPU_CS == 0xffd0) {
+				if (CPU_IP == 0xc4c2) {
+					TRACEOUT(("DS:DX = %.4x:%.4x / CX = %.4x", CPU_DS, CPU_DX, CPU_CX));
+				}
+				else if (CPU_IP == 0xc21d) {
+					TRACEOUT(("-> DS:BX = %.4x:%.4x", CPU_DS, CPU_BX));
+				}
+			}
+#endif
+//			i286x_step();
+			i286c_step();
 		}
 #endif
 		nevent_progress();