--- np2/bios/bios.c	2003/12/25 03:02:40	1.16
+++ np2/bios/bios.c	2004/01/05 06:05:11	1.20
@@ -16,6 +16,8 @@
 #include	"startup.res"
 
 
+#define	BIOS_SIMULATE
+
 	BOOL	biosrom = FALSE;
 
 static const char file_biosrom[] = "bios.rom";
@@ -132,6 +134,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);
@@ -140,6 +143,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]);
@@ -172,24 +176,6 @@ void bios_init(void) {
 	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) && (!(pc.model & PCMODEL_EPSON))) {
 		CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
 		pos = LOADINTELWORD(itfrom + 2);
@@ -207,6 +193,27 @@ 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);
+	}
+	extmem_init(np2cfg.EXTMEM);
+#endif
+
+	CopyMemory(mem + 0x1c0000, mem + 0x1f8000, 0x08000);
+	CopyMemory(mem + 0x1e8000, mem + 0x0e8000, 0x10000);
 }
 
 static void bios_boot(void) {
@@ -228,6 +235,7 @@ static void bios_boot(void) {
 	else {
 		CPU_SP = GETBIOSMEM16(0x00404);
 		CPU_SS = GETBIOSMEM16(0x00406);
+		TRACEOUT(("Protect Disable... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
 	}
 }