--- np2/i386c/ia32/exception.h	2005/03/12 12:32:54	1.2
+++ np2/i386c/ia32/exception.h	2011/12/29 13:32:12	1.5
@@ -1,5 +1,3 @@
-/*	$Id: exception.h,v 1.2 2005/03/12 12:32:54 monaka Exp $	*/
-
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
  * All rights reserved.
@@ -56,13 +54,19 @@ enum {
 	EXCEPTION_NUM
 };
 
+enum {
+	INTR_TYPE_SOFTINTR = -1,	/* software interrupt (INTn) */
+	INTR_TYPE_EXTINTR = 0,		/* external interrupt */
+	INTR_TYPE_EXCEPTION = 1,	/* exception */
+};
+
 #define	EXCEPTION(num, vec) \
 	exception(num, vec);
-#define	INTERRUPT(num, softintp, errorp, error_code) \
-	interrupt(num, softintp, errorp, error_code)
+#define	INTERRUPT(num, softintp) \
+	interrupt(num, softintp, 0, 0)
 
-void exception(int num, int vec);
-void interrupt(int num, int softintp, int errorp, int error_code);
+void CPUCALL exception(int num, int vec);
+void CPUCALL interrupt(int num, int intrtype, int errorp, int error_code);
 
 #ifdef __cplusplus
 }