--- np2/i386c/ia32/interface.c	2004/01/23 14:33:26	1.7
+++ np2/i386c/ia32/interface.c	2004/02/05 16:41:32	1.11
@@ -1,4 +1,4 @@
-/*	$Id: interface.c,v 1.7 2004/01/23 14:33:26 monaka Exp $	*/
+/*	$Id: interface.c,v 1.11 2004/02/05 16:41:32 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -33,14 +33,16 @@
 
 #include "dmap.h"
 #include "bios.h"
+#if defined(IA32_REBOOT_ON_PANIC)
+#include "pccore.h"
+#endif
 
 
 void
-ia32reset(void)
+ia32_initreg(void)
 {
 	int i;
 
-	memset(&i386core.s, 0, sizeof(i386core.s));
 	CPU_STATSAVE.cpu_inst_default.seg_base = (DWORD)-1;
 
 	CPU_EDX = (CPU_FAMILY << 8) | (CPU_MODEL << 4) | CPU_STEPPING;
@@ -73,21 +75,19 @@ ia32reset(void)
 }
 
 void
+ia32reset(void)
+{
+
+	memset(&i386core.s, 0, sizeof(i386core.s));
+	ia32_initreg();
+}
+
+void
 ia32shut(void)
 {
-	SINT32	remainclock;			/* 結局ハマるのか漏れ… */
-	SINT32	baseclock;
-	UINT32	clock;
-
-	remainclock = CPU_REMCLOCK;
-	baseclock = CPU_BASECLOCK;
-	clock = CPU_CLOCK;
-
-	ia32reset();
-
-	CPU_REMCLOCK = remainclock;
-	CPU_BASECLOCK = baseclock;
-	CPU_CLOCK = clock;
+
+	memset(&i386core.s, 0, offsetof(I386STAT, cpu_type));
+	ia32_initreg();
 }
 
 void
@@ -104,6 +104,10 @@ ia32(void)
 		VERBOSE(("ia32: return from exception"));
 		break;
 
+	case 2:
+		VERBOSE(("ia32: return from panic"));
+		return;
+
 	default:
 		VERBOSE(("ia32: return from unknown cause"));
 		break;
@@ -128,6 +132,10 @@ ia32withtrap(void)
 		VERBOSE(("ia32withtrap: return from exception"));
 		break;
 
+	case 2:
+		VERBOSE(("ia32withtrap: return from panic"));
+		return;
+
 	default:
 		VERBOSE(("ia32withtrap: return from unknown cause"));
 		break;
@@ -155,6 +163,10 @@ ia32withdma(void)
 		VERBOSE(("ia32withdma: return from exception"));
 		break;
 
+	case 2:
+		VERBOSE(("ia32withdma: return from panic"));
+		return;
+
 	default:
 		VERBOSE(("ia32withdma: return from unknown cause"));
 		break;
@@ -180,6 +192,10 @@ ia32_step(void)
 		VERBOSE(("ia32_step: return from exception"));
 		break;
 
+	case 2:
+		VERBOSE(("ia32_step: return from panic"));
+		return;
+
 	default:
 		VERBOSE(("ia32_step: return from unknown cause"));
 		break;
@@ -220,8 +236,15 @@ ia32_panic(const char *str, ...)
 
 	msgbox("ia32_panic", buf);
 
+#if defined(IA32_REBOOT_ON_PANIC)
+	VERBOSE(("ia32_panic: reboot"));
+	pccore_cfgupdate();
+	pccore_reset();
+	siglongjmp(exec_1step_jmpbuf, 2);
+#else
 	__ASSERT(0);
 	exit(1);
+#endif
 }
 
 void
@@ -259,14 +282,16 @@ ia32_bioscall(void)
 {
 	DWORD adrs;
 
-	if (!CPU_STAT_PM && !CPU_INST_OP32 && !CPU_INST_AS32) {
-		adrs = ((CPU_IP-1) & 0xffff) + CPU_STAT_SREGBASE(CPU_CS_INDEX);
+	if (!CPU_STAT_PM || CPU_STAT_VM86) {
+		adrs = (CPU_EIP - 1) + CPU_STAT_SREGBASE(CPU_CS_INDEX);
 		if ((adrs >= 0xf8000) && (adrs < 0x100000)) {
 			biosfunc(adrs);
-			CPU_SET_SEGREG(CPU_ES_INDEX, CPU_ES);
-			CPU_SET_SEGREG(CPU_CS_INDEX, CPU_CS);
-			CPU_SET_SEGREG(CPU_SS_INDEX, CPU_SS);
-			CPU_SET_SEGREG(CPU_DS_INDEX, CPU_DS);
+			if (!CPU_STAT_PM || CPU_STAT_VM86) {
+				CPU_SET_SEGREG(CPU_ES_INDEX, CPU_ES);
+				CPU_SET_SEGREG(CPU_CS_INDEX, CPU_CS);
+				CPU_SET_SEGREG(CPU_SS_INDEX, CPU_SS);
+				CPU_SET_SEGREG(CPU_DS_INDEX, CPU_DS);
+			}
 		}
 	}
 }