--- np2/pccore.c	2004/01/23 15:05:04	1.50
+++ np2/pccore.c	2004/01/29 23:42:02	1.58
@@ -58,6 +58,7 @@
 
 	PCCORE	pccore = {	PCBASECLOCK25, 4,
 						0, PCMODEL_VX, 0, 0,
+						0, {0, 0, 0},
 						0, 0,
 						4 * PCBASECLOCK25,
 						4 * PCBASECLOCK25 * 50 / 3104,
@@ -140,6 +141,7 @@ static void pccore_set(void) {
 
 	UINT8	model;
 	UINT32	multiple;
+	UINT8	extsize;
 
 	ZeroMemory(&pccore, sizeof(pccore));
 	model = PCMODEL_VX;
@@ -176,15 +178,16 @@ static void pccore_set(void) {
 	pccore.midiclock = pccore.realclock / 3125;
 
 	// 拡張メモリ
+	extsize = 0;
 	if (!(np2cfg.dipsw[2] & 0x80)) {
-		pccore.extmem = np2cfg.EXTMEM;
+		extsize = min(np2cfg.EXTMEM, 13);
 	}
+	pccore.extmem = extsize;
 
 	// HDDの接続 (I/Oの使用状態が変わるので..
 	if (np2cfg.dipsw[1] & 0x20) {
 		pccore.hddif |= PCHDD_IDE;
 	}
-	pccore.hddif |= PCHDD_SCSI;
 
 	// サウンドボードの接続
 	pccore.sound = np2cfg.SOUND_SW;
@@ -284,8 +287,6 @@ void pccore_term(void) {
 	fdd_eject(2);
 	fdd_eject(3);
 
-	extmemmng_clear();
-
 	iocore_destroy();
 
 	pc9861k_destruct();
@@ -326,32 +327,45 @@ void pccore_reset(void) {
 		sound_init();
 	}
 
-	ZeroMemory(mem, 0x10fff0);									// ver0.28
+	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();
-	CPU_SETEXTMEM(pccore.extmem);
+
+	CPU_RESET();
+	CPU_SETEXTSIZE((UINT32)pccore.extmem);
+
+	CPU_TYPE = 0;
+	if (np2cfg.dipsw[2] & 0x80) {
+		CPU_TYPE = CPUTYPE_V30;
+	}
 	if (pccore.model & PCMODEL_EPSON) {			// RAM ctrl
 		CPU_RAM_D000 = 0xffff;
 	}
 
+	// HDDセット
+	sxsi_open();
+#if defined(SUPPORT_SASI)
+	if (sxsi_issasi()) {
+		pccore.hddif &= ~PCHDD_IDE;
+		pccore.hddif |= PCHDD_SASI;
+		TRACEOUT(("supported SASI"));
+	}
+#endif
+#if defined(SUPPORT_SCSI)
+	if (sxsi_isscsi()) {
+		pccore.hddif |= PCHDD_SCSI;
+		TRACEOUT(("supported SCSI"));
+	}
+#endif
 
 	sound_changeclock();
 	beep_changeclock();
@@ -360,6 +374,8 @@ void pccore_reset(void) {
 	wavemix_bind();
 #endif
 
+	fddfile_reset2dmode();
+	bios0x18_16(0x20, 0xe1);
 
 	iocore_reset();								// サウンドでpicを呼ぶので…
 	cbuscore_reset();
@@ -378,7 +394,6 @@ void pccore_reset(void) {
 	pal_change(1);
 
 	bios_init();
-	sxsi_open();
 
 	if (np2cfg.ITF_WORK) {
 		CS_BASE = 0xf0000;
@@ -574,10 +589,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) {
@@ -667,11 +682,20 @@ void pccore_exec(BOOL draw) {
 			treip[trpos & (IPTRACE - 1)] = (CPU_CS << 16) + CPU_IP;
 			trpos++;
 #endif
-			if (tr) {
-				if ((CPU_CS == 0xf760) || (CPU_CS == 0xf990)) {
-					TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
-				}
+#if 1
+			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 ((tr & 2) && (mem[0x0471e] == '\\')) {
 				TRACEOUT(("DTA BREAK %.4x:%.4x", CPU_CS, CPU_IP));