--- np2/pccore.c	2003/11/28 08:01:32	1.21
+++ np2/pccore.c	2004/01/08 16:29:56	1.41
@@ -1,9 +1,10 @@
 #include	"compiler.h"
+#include	"strres.h"
+#include	"dosio.h"
 #include	"soundmng.h"
 #include	"sysmng.h"
 #include	"timemng.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"np2ver.h"
 #include	"pccore.h"
 #include	"iocore.h"
@@ -22,6 +23,7 @@
 #include	"sound.h"
 #include	"fmboard.h"
 #include	"beep.h"
+#include	"s98.h"
 #include	"font.h"
 #include	"diskdrv.h"
 #include	"fddfile.h"
@@ -29,9 +31,10 @@
 #include	"sxsi.h"
 #include	"calendar.h"
 #include	"timing.h"
-//#include	"hostdrv.h"
 #include	"debugsub.h"
-#include	"dosio.h"
+#if defined(SUPPORT_HOSTDRV)
+// #include	"hostdrv.h"
+#endif
 
 
 	const char	np2version[] = NP2VER_CORE;
@@ -51,7 +54,7 @@
 				1, 0x82,
 				0, {0x17, 0x04, 0x1f}, {0x0c, 0x0c, 0x02, 0x10, 0x3f, 0x3f},
 				1, 80, 0,
-				{"", ""}, ""};
+				{"", ""}, "", ""};
 
 	PCCORE	pc = {	PCBASECLOCK25,
 					4,
@@ -75,11 +78,27 @@ static const BYTE msw_default[8] =
 	BOOL	drawframe;
 	UINT	drawcount = 0;
 
-	BYTE	mem[0x200000];
-
 
 // ---------------------------------------------------------------------------
 
+void getbiospath(char *path, const char *fname, int maxlen) {
+
+const char	*p;
+
+	p = np2cfg.biospath;
+	if (p[0]) {
+		file_cpyname(path, p, maxlen);
+		file_setseparator(path, maxlen);
+		file_catname(path, fname, maxlen);
+	}
+	else {
+		file_cpyname(path, file_getcd(fname), maxlen);
+	}
+}
+
+
+// ----
+
 static void setvsyncclock(void) {
 
 	UINT	vfp;
@@ -117,9 +136,18 @@ static void setvsyncclock(void) {
 	pc.vsyncclock = cnt - pc.dispclock;
 }
 
-static void setpcclock(UINT base, UINT multiple) {
+static void setpcclock(const char *modelstr, UINT base, UINT multiple) {
+
+	UINT8	model;
 
-	pc.model = PCMODEL_VX;
+	model = PCMODEL_VX;
+	if (!milstr_cmp(modelstr, str_VM)) {
+		model = PCMODEL_VM;
+	}
+	else if (!milstr_cmp(modelstr, str_EPSON)) {
+		model = PCMODEL_EPSON | PCMODEL_VM;
+	}
+	pc.model = model;
 
 	if (base >= ((PCBASECLOCK25 + PCBASECLOCK20) / 2)) {
 		pc.baseclock = PCBASECLOCK25;			// 2.5MHz
@@ -159,6 +187,9 @@ static void sound_init(void) {
 		rate = 0;
 	}
 	sound_create(rate, np2cfg.delayms);
+#if defined(SUPPORT_WAVEMIX)
+	wavemix_initialize(rate);
+#endif
 	beep_initialize(rate);
 	beep_setvol(np2cfg.BEEP_VOL);
 	tms3631_initialize(rate);
@@ -173,17 +204,23 @@ static void sound_init(void) {
 	adpcm_setvol(np2cfg.vol_adpcm);
 	pcm86gen_initialize(rate);
 	pcm86gen_setvol(np2cfg.vol_pcm);
+	cs4231_initialize(rate);
 }
 
 static void sound_term(void) {
 
 	soundmng_stop();
+#if defined(SUPPORT_WAVEMIX)
+	wavemix_deinitialize();
+#endif
 	rhythm_deinitialize();
 	sound_destroy();
 }
 
 void pccore_init(void) {
 
+	CPU_INITIALIZE();
+
 	pal_initlcdtable();
 	pal_makelcdpal();
 	pal_makeskiptable();
@@ -255,10 +292,10 @@ void pccore_reset(void) {
 	ZeroMemory(mem + VRAM1_E, 0x08000);
 	ZeroMemory(mem + FONT_ADRS, 0x08000);
 
-	i286_reset();
-	CPUTYPE = 0;
+	CPU_RESET();
+	CPU_TYPE = 0;
 	if (np2cfg.dipsw[2] & 0x80) {
-		CPUTYPE = CPUTYPE_V30;
+		CPU_TYPE = CPUTYPE_V30;
 	}
 
 	//メモリスイッチ
@@ -276,17 +313,25 @@ void pccore_reset(void) {
 		sound_init();
 	}
 
-	setpcclock(np2cfg.baseclock, np2cfg.multiple);
+	setpcclock(np2cfg.model, np2cfg.baseclock, np2cfg.multiple);
 	sound_changeclock();
 	beep_changeclock();
 	nevent_init();
 
 	sound_reset();
+#if defined(SUPPORT_WAVEMIX)
+	wavemix_bind();
+#endif
+
+	if (pc.model & PCMODEL_EPSON) {				// RAM ctrl
+		CPU_RAM_D000 = 0xffff;
+	}
 
 	iocore_reset();								// サウンドでpicを呼ぶので…
 	cbuscore_reset();
 	fmboard_reset(np2cfg.SOUND_SW);
 
+	i286_memorymap((pc.model & PCMODEL_EPSON)?1:0);
 	iocore_build();
 	iocore_bind();
 	cbuscore_bind();
@@ -304,18 +349,18 @@ void pccore_reset(void) {
 
 	if (np2cfg.ITF_WORK) {
 		CS_BASE = 0xf0000;
-		I286_CS = 0xf000;
-		I286_IP = 0xfff0;
+		CPU_CS = 0xf000;
+		CPU_IP = 0xfff0;
 	}
 	else {
 		for (i=0; i<8; i++) {
 			mem[0xa3fe2 + i*4] = msw_default[i];
 		}
 		CS_BASE = 0xfd800;
-		I286_CS = 0xfd80;
-		I286_IP = 0x0002;
+		CPU_CS = 0xfd80;
+		CPU_IP = 0x0002;
 	}
-	i286_resetprefetch();
+	CPU_CLEARPREFETCH();
 	sysmng_cpureset();
 
 	soundmng_play();
@@ -470,9 +515,9 @@ void screendisp(NEVENTITEM item) {
 
 void screenvsync(NEVENTITEM item) {
 
-	vramop.tramwait = np2cfg.wait[1];
-	vramop.vramwait = np2cfg.wait[3];
-	vramop.grcgwait = np2cfg.wait[5];
+	MEMWAIT_TRAM = np2cfg.wait[1];
+	MEMWAIT_VRAM = np2cfg.wait[3];
+	MEMWAIT_GRCG = np2cfg.wait[5];
 	gdc_work(GDCWORK_MASTER);
 	gdc.vsync = 0x20;
 	if (gdc.vsyncint) {
@@ -488,8 +533,15 @@ void screenvsync(NEVENTITEM item) {
 	(void)item;
 }
 
+
 // ---------------------------------------------------------------------------
 
+#if defined(TRACE)
+static int resetcnt = 0;
+static int execcnt = 0;
+int piccnt = 0;
+#endif
+
 void pccore_exec(BOOL draw) {
 
 	drawframe = draw;
@@ -500,38 +552,46 @@ void pccore_exec(BOOL draw) {
 
 	gdc.vsync = 0;
 	screendispflag = 1;
-	vramop.tramwait = np2cfg.wait[0];
-	vramop.vramwait = np2cfg.wait[2];
-	vramop.grcgwait = np2cfg.wait[4];
+	MEMWAIT_TRAM = np2cfg.wait[0];
+	MEMWAIT_VRAM = np2cfg.wait[2];
+	MEMWAIT_GRCG = np2cfg.wait[4];
 	nevent_set(NEVENT_FLAMES, pc.dispclock, screenvsync, NEVENT_RELATIVE);
 
 //	nevent_get1stevent();
 
 	while(screendispflag) {
+#if defined(TRACE)
+	resetcnt++;
+#endif
 		pic_irq();
-		if (cpuio.reset_req) {
-			cpuio.reset_req = 0;
-			I286_CS = 0xf000;
+		if (CPU_RESETREQ) {
+			CPU_RESETREQ = 0;
+#if 1
+			CPU_SHUT();
+#else
+			CPU_CS = 0xf000;
 			CS_BASE = 0xf0000;
-			I286_IP = 0xfff0;
-#ifdef CPU386											// defineを変えてね
-			I286_DX = 0x0300;
+			CPU_IP = 0xfff0;
+#if defined(CPUCORE_IA32)
+			CPU_DX = 0x0300;
+#endif
+			CPU_CLEARPREFETCH();
 #endif
-			i286_resetprefetch();
 		}
 
-#if 1	// ndef TRACE
-		if (I286_REMCLOCK > 0) {
-			if (!(CPUTYPE & CPUTYPE_V30)) {
-				i286();
+#if 1 // ndef TRACE
+		if (CPU_REMCLOCK > 0) {
+			if (!(CPU_TYPE & CPUTYPE_V30)) {
+				CPU_EXEC();
 			}
 			else {
-				v30();
+				CPU_EXECV30();
 			}
 		}
 #else
-		while(I286_REMCLOCK > 0) {
-			i286_step();
+		while(CPU_REMCLOCK > 0) {
+			TRACEOUT(("%.4x:%.4x", CPU_CS, CPU_IP));
+			i286x_step();
 		}
 #endif
 		nevent_progress();
@@ -540,6 +600,17 @@ void pccore_exec(BOOL draw) {
 	mpu98ii_callback();
 	diskdrv_callback();
 	calendar_inc();
+	S98_sync();
 	sound_sync();													// happy!
+
+#if defined(TRACE)
+	execcnt++;
+	if (execcnt >= 60) {
+//		TRACEOUT(("resetcnt = %d / pic %d", resetcnt, piccnt));
+		execcnt = 0;
+		resetcnt = 0;
+		piccnt = 0;
+	}
+#endif
 }