--- np2/i386c/ia32/exception.c	2008/03/22 04:03:07	1.21
+++ np2/i386c/ia32/exception.c	2011/12/17 02:39:06	1.25
@@ -1,5 +1,3 @@
-/*	$Id: exception.c,v 1.21 2008/03/22 04:03:07 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -126,8 +124,8 @@ exception(int num, int error_code)
 	if (CPU_STATSAVE.cpu_stat.backout_sp) {
 		VERBOSE(("exception: restore stack pointer."));
 		CPU_ESP = CPU_PREV_ESP;
+		CPU_STATSAVE.cpu_stat.backout_sp = 0;
 	}
-	CPU_STATSAVE.cpu_stat.backout_sp = 0;
 
 	if (CPU_STAT_EXCEPTION_COUNTER >= 2) {
 		if (dftable[exctype[CPU_STAT_PREV_EXCEPTION]][exctype[num]]) {
@@ -258,7 +256,7 @@ interrupt(int num, int intrtype, int err
 #if defined(DEBUG)
 		if (num == 0x80) {
 			/* Linux, FreeBSD, NetBSD, OpenBSD system call */
-			VERBOSE(("interrupt: syscall no = %d\n%s", CPU_EAX, cpu_reg2str()));
+			VERBOSE(("interrupt: syscall# = %d\n%s", CPU_EAX, cpu_reg2str()));
 		}
 #endif
 
@@ -279,10 +277,6 @@ interrupt(int num, int intrtype, int err
 			VERBOSE(("interrupt: gate descripter is invalid."));
 			EXCEPTION(GP_EXCEPTION, exc_errcode);
 		}
-		if (!SEG_IS_PRESENT(&gsd)) {
-			VERBOSE(("interrupt: gate descriptor is not present."));
-			EXCEPTION(GP_EXCEPTION, exc_errcode);
-		}
 		if (!SEG_IS_SYSTEM(&gsd)) {
 			VERBOSE(("interrupt: gate descriptor is not system segment."));
 			EXCEPTION(GP_EXCEPTION, exc_errcode);
@@ -302,18 +296,18 @@ interrupt(int num, int intrtype, int err
 			break;
 		}
 
-		if (gsd.dpl < CPU_STAT_CPL) {
-			VERBOSE(("interrupt: gate DPL(%d) < CPL(%d)", gsd.dpl, CPU_STAT_CPL));
-			EXCEPTION(GP_EXCEPTION, exc_errcode);
-		}
-
 		/* 5.10.1.1. 例外／割り込みハンドラ・プロシージャの保護 */
 		if ((intrtype != INTR_TYPE_EXTINTR) && (gsd.dpl < CPU_STAT_CPL)) {
-			VERBOSE(("interrupt: intrtype && DPL(%d) < CPL(%d)", gsd.dpl, CPU_STAT_CPL));
+			VERBOSE(("interrupt: intrtype(%d) && DPL(%d) < CPL(%d)", intrtype, gsd.dpl, CPU_STAT_CPL));
 			EXCEPTION(GP_EXCEPTION, exc_errcode);
 		}
 
-		if (!intrtype && CPU_STAT_HLT) {
+		if (!SEG_IS_PRESENT(&gsd)) {
+			VERBOSE(("interrupt: gate descriptor is not present."));
+			EXCEPTION(NP_EXCEPTION, exc_errcode);
+		}
+
+		if ((intrtype == INTR_TYPE_EXTINTR) && CPU_STAT_HLT) {
 			CPU_EIP++;
 			CPU_STAT_HLT = 0;
 		}
@@ -347,8 +341,6 @@ interrupt_task_gate(const descriptor_t *
 
 	VERBOSE(("interrupt: TASK-GATE"));
 
-	(void)intrtype;
-
 	rv = parse_selector(&task_sel, gsdp->u.gate.selector);
 	if (rv < 0 || task_sel.ldt || !SEG_IS_SYSTEM(&task_sel.desc)) {
 		VERBOSE(("interrupt: parse_selector (selector = %04x, rv = %d, %cDT, type = %s)", gsdp->u.gate.selector, rv, task_sel.ldt ? 'L' : 'G', task_sel.desc.s ? "code/data" : "system"));