--- np2/pccore.c	2004/01/13 05:30:58	1.44
+++ np2/pccore.c	2004/01/23 16:57:20	1.51
@@ -5,7 +5,6 @@
 #include	"sysmng.h"
 #include	"timemng.h"
 #include	"cpucore.h"
-#include	"np2ver.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"cbuscore.h"
@@ -29,12 +28,13 @@
 #include	"fddfile.h"
 #include	"fdd_mtr.h"
 #include	"sxsi.h"
-#include	"calendar.h"
-#include	"timing.h"
-#include	"debugsub.h"
 #if defined(SUPPORT_HOSTDRV)
 #include	"hostdrv.h"
 #endif
+#include	"np2ver.h"
+#include	"calendar.h"
+#include	"timing.h"
+#include	"debugsub.h"
 
 
 	const char	np2version[] = NP2VER_CORE;
@@ -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,
@@ -76,6 +76,7 @@ static const BYTE msw_default[8] =
 	int		soundrenewal = 0;
 	BOOL	drawframe;
 	UINT	drawcount = 0;
+	BOOL	hardwarereset = FALSE;
 
 
 // ---------------------------------------------------------------------------
@@ -135,20 +136,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 +159,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 +174,29 @@ static void setpcclock(const char *model
 	pccore.vsyncclock = pccore.realclock * 5 / 3102;
 	pccore.keyboardclock = pccore.realclock / 1920;
 	pccore.midiclock = pccore.realclock / 3125;
+
+	// 拡張メモリ
+	if (!(np2cfg.dipsw[2] & 0x80)) {
+		pccore.extmem = np2cfg.EXTMEM;
+	}
+
+	// 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;
+	}
 }
 
 
@@ -266,6 +293,8 @@ void pccore_term(void) {
 	mpu98ii_destruct();
 
 	sxsi_trash();
+
+	CPU_DEINITIALIZE();
 }
 
 
@@ -290,6 +319,13 @@ void pccore_reset(void) {
 
 	int		i;
 
+	soundmng_stop();
+	if (soundrenewal) {
+		soundrenewal = 0;
+		sound_term();
+		sound_init();
+	}
+
 	ZeroMemory(mem, 0x10fff0);									// ver0.28
 	ZeroMemory(mem + VRAM1_B, 0x18000);
 	ZeroMemory(mem + VRAM1_E, 0x08000);
@@ -309,30 +345,25 @@ void pccore_reset(void) {
 	fddfile_reset2dmode();
 	bios0x18_16(0x20, 0xe1);
 
-	soundmng_stop();
-	if (soundrenewal) {
-		soundrenewal = 0;
-		sound_term();
-		sound_init();
+	pccore_set();
+	nevent_init();
+	CPU_SETEXTMEM(pccore.extmem);
+	if (pccore.model & PCMODEL_EPSON) {			// RAM ctrl
+		CPU_RAM_D000 = 0xffff;
 	}
 
-	setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple);
+
 	sound_changeclock();
 	beep_changeclock();
-	nevent_init();
-
 	sound_reset();
 #if defined(SUPPORT_WAVEMIX)
 	wavemix_bind();
 #endif
 
-	if (pccore.model & PCMODEL_EPSON) {			// RAM ctrl
-		CPU_RAM_D000 = 0xffff;
-	}
 
 	iocore_reset();								// サウンドでpicを呼ぶので…
 	cbuscore_reset();
-	fmboard_reset(np2cfg.SOUND_SW);
+	fmboard_reset(pccore.sound);
 
 	i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0);
 	iocore_build();
@@ -340,7 +371,6 @@ void pccore_reset(void) {
 	cbuscore_bind();
 	fmboard_bind();
 
-	timing_reset();
 	fddmtr_init();
 	calendar_init();
 	vram_init();
@@ -366,11 +396,12 @@ void pccore_reset(void) {
 	CPU_CLEARPREFETCH();
 	sysmng_cpureset();
 
-	soundmng_play();
-
 #if defined(SUPPORT_HOSTDRV)
 	hostdrv_reset();
 #endif
+
+	timing_reset();
+	soundmng_play();
 }
 
 static void drawscreen(void) {
@@ -543,12 +574,47 @@ void screenvsync(NEVENTITEM item) {
 
 // ---------------------------------------------------------------------------
 
+// #define	IPTRACE			(1 << 12)
+
+#if defined(TRACE) && IPTRACE
+static UINT		trpos = 0;
+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;
+UINT	cflg;
 #endif
 
+
 void pccore_exec(BOOL draw) {
 
 	drawframe = draw;
@@ -597,8 +663,42 @@ void pccore_exec(BOOL draw) {
 		}
 #else
 		while(CPU_REMCLOCK > 0) {
-			TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
+#if IPTRACE
+			treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;
+			trpos++;
+#endif
+#if 0
+			if (tr) {
+				if ((CPU_CS == 0xf760) || (CPU_CS == 0xf990)) {
+					TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
+				}
+			}
+#endif
+#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
+#if 0
+			if ((CPU_CS == 0x0620) || (CPU_CS == 0x08a0)) {
+				TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
+			}
+#endif
 			i286x_step();
+//			i286c_step();
 		}
 #endif
 		nevent_progress();
@@ -610,6 +710,12 @@ void pccore_exec(BOOL draw) {
 	S98_sync();
 	sound_sync();													// happy!
 
+	if (hardwarereset) {
+		hardwarereset = FALSE;
+		pccore_cfgupdate();
+		pccore_reset();
+	}
+
 #if defined(TRACE)
 	execcnt++;
 	if (execcnt >= 60) {