--- np2/bios/bios.c	2004/01/08 16:29:56	1.24
+++ np2/bios/bios.c	2004/01/15 17:42:57	1.27
@@ -37,6 +37,19 @@ static void bios_reinitbyswitch(void) {
 	BYTE	biosflag;
 	BYTE	ext_mem;
 
+
+#if defined(CPUCORE_IA32)
+	UINT16	org_cs;
+	UINT16	org_ip;
+
+	org_cs = CPU_CS;
+	org_ip = CPU_IP;
+	CPU_SHUT();
+	CPU_CS = org_cs;
+	CPU_IP = org_ip;
+	SETBIOSMEM16(0x00486, CPU_DX);
+#endif
+
 	CPU_TYPE = 0;
 	prxcrt = 0xc8;
 	if (gdc.display & 2) {
@@ -60,7 +73,7 @@ static void bios_reinitbyswitch(void) {
 	mem[MEMB_PRXDUPD] = prxdupd;
 
 	biosflag = 0x20;
-	if (pc.cpumode & CPUMODE_8MHz) {
+	if (pccore.cpumode & CPUMODE_8MHz) {
 		biosflag |= 0x80;
 	}
 	biosflag |= mem[0xa3fea] & 7;
@@ -85,7 +98,7 @@ static void bios_reinitbyswitch(void) {
 	}
 	gdcs.textdisp |= GDCSCRN_EXT;
 
-	if (((pc.model & PCMODELMASK) >= PCMODEL_VX) && (usesound & 0x7e)) {
+	if (((pccore.model & PCMODELMASK) >= PCMODEL_VX) && (usesound & 0x7e)) {
 		iocore_out8(0x188, 0x27);
 		iocore_out8(0x18a, 0x3f);
 	}
@@ -167,19 +180,18 @@ void bios_init(void) {
 	for (i=0; i<8; i+=2) {
 		STOREINTELWORD(mem + 0xfd800 + 0x1aaf + i, 0x1ab7);
 		STOREINTELWORD(mem + 0xfd800 + 0x1ad7 + i, 0x1adf);
-		STOREINTELWORD(mem + 0xfd800 + 0x2361 + i, 0x1980);			// ver0.31
+		STOREINTELWORD(mem + 0xfd800 + 0x2361 + i, 0x1980);
 	}
 	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
+	CopyMemory(mem + 0xfd800 + 0x1980, fdfmt144, sizeof(fdfmt144));
 
 	SETBIOSMEM16(0xfffe8, 0xcb90);
 	SETBIOSMEM16(0xfffec, 0xcb90);
 	mem[0xffff0] = 0xea;
 	STOREINTELDWORD(mem + 0xffff1, 0xfd800000);
 
-	if ((!biosrom) && (!(pc.model & PCMODEL_EPSON))) {
+	if ((!biosrom) && (!(pccore.model & PCMODEL_EPSON))) {
 		CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
 		pos = LOADINTELWORD(itfrom + 2);
 		CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
@@ -200,12 +212,14 @@ void bios_init(void) {
 	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
 	mem[ITF_ADRS + 0x7ff0] = 0xea;
 	STOREINTELDWORD(mem + ITF_ADRS + 0x7ff1, 0xf8000000);
-	if (pc.model & PCMODEL_EPSON) {
+	if (pccore.model & PCMODEL_EPSON) {
 		mem[ITF_ADRS + 0x7ff1] = 0x04;
 	}
-	else if ((pc.model & PCMODELMASK) == PCMODEL_VM) {
+	else if ((pccore.model & PCMODELMASK) == PCMODEL_VM) {
 		mem[ITF_ADRS + 0x7ff1] = 0x08;
 	}
+
+	CopyMemory(mem + 0xfd800 + 0x2400, biosboot, sizeof(biosboot));
 #else
 	fh = file_open_c("itf.rom");
 	if (fh != FILEH_INVALID) {
@@ -242,7 +256,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));
+//		TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
 	}
 }
 
@@ -320,6 +334,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_1b:
+			CPU_STI;
 			CPU_REMCLOCK -= 200;
 			bios0x1b();
 			return(1);