--- np2/pccore.c	2004/01/23 06:03:40	1.47
+++ np2/pccore.c	2004/01/25 07:53:08	1.54
@@ -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;
@@ -76,6 +76,7 @@ static const BYTE msw_default[8] =
 	int		soundrenewal = 0;
 	BOOL	drawframe;
 	UINT	drawcount = 0;
+	BOOL	hardwarereset = FALSE;
 
 
 // ---------------------------------------------------------------------------
@@ -139,6 +140,7 @@ static void pccore_set(void) {
 
 	UINT8	model;
 	UINT32	multiple;
+	UINT8	extsize;
 
 	ZeroMemory(&pccore, sizeof(pccore));
 	model = PCMODEL_VX;
@@ -175,13 +177,19 @@ static void pccore_set(void) {
 	pccore.midiclock = pccore.realclock / 3125;
 
 	// 拡張メモリ
-	pccore.extmem = 0;
+	extsize = 0;
+	if (!(np2cfg.dipsw[2] & 0x80)) {
+		extsize = min(np2cfg.EXTMEM, 13);
+	}
+	pccore.extmem = extsize;
 
 	// HDDの接続 (I/Oの使用状態が変わるので..
-//	if (np2cfg.dipsw[1] & 0x20) {
+	if (np2cfg.dipsw[1] & 0x20) {
 		pccore.hddif |= PCHDD_IDE;
-//	}
+	}
+#if defined(SUPPORT_SCSI)
 	pccore.hddif |= PCHDD_SCSI;
+#endif
 
 	// サウンドボードの接続
 	pccore.sound = np2cfg.SOUND_SW;
@@ -281,8 +289,6 @@ void pccore_term(void) {
 	fdd_eject(2);
 	fdd_eject(3);
 
-	extmemmng_clear();
-
 	iocore_destroy();
 
 	pc9861k_destruct();
@@ -290,6 +296,8 @@ void pccore_term(void) {
 	mpu98ii_destruct();
 
 	sxsi_trash();
+
+	CPU_DEINITIALIZE();
 }
 
 
@@ -314,50 +322,50 @@ void pccore_reset(void) {
 
 	int		i;
 
-	ZeroMemory(mem, 0x10fff0);									// ver0.28
+	soundmng_stop();
+	if (soundrenewal) {
+		soundrenewal = 0;
+		sound_term();
+		sound_init();
+	}
+
+	ZeroMemory(mem, 0x110000);									// ver0.28
 	ZeroMemory(mem + VRAM1_B, 0x18000);
 	ZeroMemory(mem + VRAM1_E, 0x08000);
 	ZeroMemory(mem + FONT_ADRS, 0x08000);
 
-	CPU_RESET();
-	CPU_TYPE = 0;
-	if (np2cfg.dipsw[2] & 0x80) {
-		CPU_TYPE = CPUTYPE_V30;
-	}
-
 	//メモリスイッチ
 	for (i=0; i<8; i++) {
 		mem[0xa3fe2 + i*4] = np2cfg.memsw[i];
 	}
 
-	fddfile_reset2dmode();
-	bios0x18_16(0x20, 0xe1);
+	pccore_set();
+	nevent_init();
 
-	soundmng_stop();
-	if (soundrenewal) {
-		soundrenewal = 0;
-		sound_term();
-		sound_init();
-	}
+	CPU_RESET();
+	CPU_SETEXTSIZE((UINT32)pccore.extmem);
 
-	pccore_set();
+	CPU_TYPE = 0;
+	if (np2cfg.dipsw[2] & 0x80) {
+		CPU_TYPE = CPUTYPE_V30;
+	}
+	if (pccore.model & PCMODEL_EPSON) {			// RAM ctrl
+		CPU_RAM_D000 = 0xffff;
+	}
 
 	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;
-	}
+	fddfile_reset2dmode();
+	bios0x18_16(0x20, 0xe1);
 
 	iocore_reset();								// サウンドでpicを呼ぶので…
 	cbuscore_reset();
-	fmboard_reset(np2cfg.SOUND_SW);
+	fmboard_reset(pccore.sound);
 
 	i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0);
 	iocore_build();
@@ -365,7 +373,6 @@ void pccore_reset(void) {
 	cbuscore_bind();
 	fmboard_bind();
 
-	timing_reset();
 	fddmtr_init();
 	calendar_init();
 	vram_init();
@@ -391,11 +398,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) {
@@ -568,10 +576,10 @@ void screenvsync(NEVENTITEM item) {
 
 // ---------------------------------------------------------------------------
 
-// #define	IPTRACE			(1 << 16)
+// #define	IPTRACE			(1 << 12)
 
-#if IPTRACE
-static UINT		trpos;
+#if defined(TRACE) && IPTRACE
+static UINT		trpos = 0;
 static UINT32	treip[IPTRACE];
 
 void iptrace_out(void) {
@@ -605,10 +613,9 @@ static int resetcnt = 0;
 static int execcnt = 0;
 int piccnt = 0;
 int tr = 0;
-UINT	gr = 0;
+UINT	cflg;
 #endif
 
-	UINT	cflg;
 
 void pccore_exec(BOOL draw) {
 
@@ -662,11 +669,13 @@ void pccore_exec(BOOL draw) {
 			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));
@@ -685,13 +694,11 @@ void pccore_exec(BOOL draw) {
 				}
 			}
 #endif
-			{
-				UINT r = (gdcs.grphdisp & GDCSCRN_ENABLE);
-				if (gr != r) {
-					TRACEOUT(("gdcs.grphdisp = %.2x [%.4x:%.4x]", r, CPU_CS, CPU_IP));
-					gr = r;
-				}
+#if 0
+			if ((CPU_CS == 0x0620) || (CPU_CS == 0x08a0)) {
+				TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
 			}
+#endif
 			i286x_step();
 //			i286c_step();
 		}
@@ -705,6 +712,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) {