--- np2/bios/bios.c	2003/12/08 00:55:30	1.12
+++ np2/bios/bios.c	2004/01/08 16:29:56	1.24
@@ -1,7 +1,6 @@
 #include	"compiler.h"
 #include	"dosio.h"
 #include	"cpucore.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
@@ -14,8 +13,13 @@
 #include	"fdfmt.h"
 #include	"keytable.res"
 #include	"itfrom.res"
+#include	"startup.res"
+#include	"biosboot.res"
+#include	"sxsibios.res"
 
 
+#define	BIOS_SIMULATE
+
 	BOOL	biosrom = FALSE;
 
 static const char file_biosrom[] = "bios.rom";
@@ -25,22 +29,6 @@ static const char neccheck[] = "Copyrigh
 						// 00/05/18 MS-DOS6.2 on PC-9801VX calling proc
 static const BYTE printmain[] = {0x90, 0x5a, 0x1f, 0xcf};
 
-static const BYTE nosyscode[] = {
-			0xeb,0x05,0xbe,0x6f,0x00,0xeb,0x03,0xbe,0x47,0x00,0xb8,0x00,
-			0x10,0xbb,0x00,0x80,0x8e,0xd0,0x8b,0xe3,0x8c,0xc8,0x8e,0xd8,
-			0xb8,0x00,0xa0,0x8e,0xc0,0xb9,0x00,0x10,0xb8,0x20,0x00,0x33,
-			0xff,0xfc,0xf3,0xab,0xb0,0xe1,0xb9,0xe0,0x1f,0xaa,0x47,0xe2,
-			0xfc,0x2e,0xad,0x8b,0xf8,0x2e,0xad,0x85,0xc0,0x74,0x0a,0xab,
-			0x0a,0xe4,0x74,0xf5,0x83,0xc7,0x02,0xeb,0xf0,0xeb,0xfe,0xac,
-			0x07,0x05,0x37,0x05,0x39,0x05,0x46,0x05,0x60,0x05,0x47,0x05,
-			0x23,0x05,0x39,0x05,0x2f,0x04,0x72,0x05,0x3b,0x05,0x43,0x05,
-			0x48,0x04,0x37,0x04,0x46,0x04,0x2f,0x04,0x40,0x04,0x35,0x04,
-			0x24,0x00,0x00,0xae,0x07,0x42,0x00,0x41,0x00,0x53,0x00,0x49,
-			0x00,0x43,0x00,0x04,0x4e,0x15,0x2f,0x26,0x30,0x04,0x4b,0x04,
-			0x4f,0x20,0x00,0x42,0x00,0x49,0x00,0x4f,0x00,0x53,0x00,0x2e,
-			0x00,0x52,0x00,0x4f,0x00,0x4d,0x00,0x04,0x2c,0x29,0x2c,0x2d,
-			0x57,0x04,0x47,0x04,0x39,0x00,0x00};
-
 
 static void bios_reinitbyswitch(void) {
 
@@ -97,7 +85,7 @@ static void bios_reinitbyswitch(void) {
 	}
 	gdcs.textdisp |= GDCSCRN_EXT;
 
-	if ((pc.model >= PCMODEL_VX) && (usesound & 0x7e)) {
+	if (((pc.model & PCMODELMASK) >= PCMODEL_VX) && (usesound & 0x7e)) {
 		iocore_out8(0x188, 0x27);
 		iocore_out8(0x18a, 0x3f);
 	}
@@ -148,6 +136,7 @@ void bios_init(void) {
 	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		if (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000) {
+			TRACEOUT(("load bios.rom"));
 			biosrom = TRUE;
 		}
 		file_close(fh);
@@ -156,6 +145,7 @@ void bios_init(void) {
 		CopyMemory(mem + 0x0e8000, nosyscode, sizeof(nosyscode));
 	}
 
+#if defined(BIOS_SIMULATE)
 	// BIOS hookのアドレス変更
 	for (i=0; i<0x20; i++) {
 		STOREINTELWORD(mem + 0xfd868 + i*2, biosoffset[i]);
@@ -182,31 +172,14 @@ void bios_init(void) {
 	CopyMemory(mem + 0xfd800 + 0x1ab7, fdfmt2hd, sizeof(fdfmt2hd));
 	CopyMemory(mem + 0xfd800 + 0x1adf, fdfmt2dd, sizeof(fdfmt2dd));
 	CopyMemory(mem + 0xfd800 + 0x1980, fdfmt144, sizeof(fdfmt144));	// ver0.31
+	CopyMemory(mem + 0xfd800 + 0x2400, biosboot, sizeof(biosboot));	// ver0.73
 
 	SETBIOSMEM16(0xfffe8, 0xcb90);
 	SETBIOSMEM16(0xfffec, 0xcb90);
 	mem[0xffff0] = 0xea;
 	STOREINTELDWORD(mem + 0xffff1, 0xfd800000);
 
-#if 1
-	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
-	mem[ITF_ADRS + 0x7ff0] = 0xea;
-	STOREINTELDWORD(mem + ITF_ADRS + 0x7ff1, 0xf8000000);
-#if 0
-fh = file_create("itf.rom");
-if (fh != FILEH_INVALID) {
-	file_write(fh, itfrom, sizeof(itfrom));
-	file_close(fh);
-}
-#endif
-#else
-	fh = file_open_c("itf.rom");
-	if (fh != FILEH_INVALID) {
-		file_read(fh, &mem[ITF_ADRS], 0x8000);
-		file_close(fh);
-	}
-#endif
-	if (!biosrom) {
+	if ((!biosrom) && (!(pc.model & PCMODEL_EPSON))) {
 		CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
 		pos = LOADINTELWORD(itfrom + 2);
 		CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
@@ -214,7 +187,7 @@ if (fh != FILEH_INVALID) {
 
 	bios_reinitbyswitch();
 	mem[MEMB_CRT_STS_FLAG] = 0x84;
-	mem[MEMB_BIOS_FLAG0] = 0x03;						// 00/05/17 beep tone
+	mem[MEMB_BIOS_FLAG0] = 0x03;
 	mem[MEMB_F2DD_MODE] = 0xff;										// ver0.29
  	SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003);							// ver0.29
 	SETBIOSMEM32(MEMD_F2DD_POINTER, 0xfd801ad7);
@@ -223,6 +196,31 @@ if (fh != FILEH_INVALID) {
 
 	CopyMemory(mem + 0x0fde00, keytable[0], 0x300);
 	bios0x09_init();
+
+	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
+	mem[ITF_ADRS + 0x7ff0] = 0xea;
+	STOREINTELDWORD(mem + ITF_ADRS + 0x7ff1, 0xf8000000);
+	if (pc.model & PCMODEL_EPSON) {
+		mem[ITF_ADRS + 0x7ff1] = 0x04;
+	}
+	else if ((pc.model & PCMODELMASK) == PCMODEL_VM) {
+		mem[ITF_ADRS + 0x7ff1] = 0x08;
+	}
+#else
+	fh = file_open_c("itf.rom");
+	if (fh != FILEH_INVALID) {
+		file_read(fh, mem + ITF_ADRS, 0x8000);
+		file_close(fh);
+		TRACEOUT(("load itf.rom"));
+	}
+	extmem_init(np2cfg.EXTMEM);
+#endif
+
+	CopyMemory(mem + 0xd0000, sxsibios, sizeof(sxsibios));
+	CPU_RAM_D000 &= ~(1 << 0);
+
+	CopyMemory(mem + 0x1c0000, mem + ITF_ADRS, 0x08000);
+	CopyMemory(mem + 0x1e8000, mem + 0x0e8000, 0x10000);
 }
 
 static void bios_boot(void) {
@@ -244,6 +242,7 @@ static void bios_boot(void) {
 	else {
 		CPU_SP = GETBIOSMEM16(0x00404);
 		CPU_SS = GETBIOSMEM16(0x00406);
+		TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
 	}
 }
 
@@ -253,9 +252,13 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 	UINT16	bootseg;
 
 	if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) {
+#if 1					// for epson ITF
+		return(0);
+#else
 		CPU_IP--;
 		CPU_REMCLOCK = -1;
 		return(1);
+#endif
 	}
 
 	switch(adrs) {													// ver0.30
@@ -359,8 +362,12 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(1);
 
 		case 0xfd802:					// ブート
-			bios_reinitbyswitch();									// ver0.27
-			bios_vectorset();										// ver0.29
+			bios_reinitbyswitch();
+			bios_vectorset();
+#if 1																// ver0.73
+			CPU_CS = 0xfd80;
+			CPU_IP = 0x2400;
+#else
 			bootseg = bootstrapload();
 			CPU_STI;
 			CPU_CS = (bootseg != 0)?bootseg:0xe800;
@@ -368,6 +375,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			CPU_SS = 0x0030;
 			CPU_SP = 0x00e6;
 			CPU_IP = 0x0000;
+#endif
 			return(1);
 
 		case 0xfffe8:					// ブートストラップロード
@@ -377,8 +385,6 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 				CPU_STI;
 				CPU_CS = bootseg;
 				CPU_IP = 0x0000;
-				CPU_SS = 0x0030;
-				CPU_SP = 0x00e6;
 				return(1);
 			}
 			return(0);