--- np2/i386c/ia32/cpu.h	2004/02/04 13:24:35	1.13
+++ np2/i386c/ia32/cpu.h	2004/02/09 16:12:07	1.15
@@ -1,4 +1,4 @@
-/*	$Id: cpu.h,v 1.13 2004/02/04 13:24:35 monaka Exp $	*/
+/*	$Id: cpu.h,v 1.15 2004/02/09 16:12:07 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -149,8 +149,8 @@ typedef struct {
 
 typedef struct {
 	descriptor_t	sreg[CPU_SEGREG_NUM];
-	descriptor_t	ldtr_desc;
-	descriptor_t	tr_desc;
+	descriptor_t	ldtr;
+	descriptor_t	tr;
 
 	UINT32		adrsmask;
 	DWORD		ovflag;
@@ -158,12 +158,16 @@ typedef struct {
 	BYTE		ss_32;
 	BYTE		resetreq;
 	BYTE		trap;
-	BYTE		_dummy;
 
-	BYTE		cpl;
+	BYTE		page_wp;
+
 	BYTE		protected_mode;
 	BYTE		paging;
 	BYTE		vm86;
+	BYTE		user_mode;
+
+	BYTE		hlt;
+	BYTE		pad[3];
 
 	DWORD		pde_base;
 
@@ -229,7 +233,6 @@ extern I386CORE		i386core;
 #define	CPU_EXTMEMSIZE	i386core.e.extsize
 #define	CPU_INPADRS	i386core.e.inport
 
-extern BYTE 		iflags[];
 extern sigjmp_buf	exec_1step_jmpbuf;
 
 
@@ -417,11 +420,15 @@ void set_eflags(DWORD new_flags, DWORD m
 #define	CPU_STAT_SS32		CPU_STATSAVE.cpu_stat.ss_32
 #define	CPU_STAT_RESETREQ	CPU_STATSAVE.cpu_stat.resetreq
 #define	CPU_STAT_PM		CPU_STATSAVE.cpu_stat.protected_mode
-#define	CPU_STAT_VM86		CPU_STATSAVE.cpu_stat.vm86
 #define	CPU_STAT_PAGING		CPU_STATSAVE.cpu_stat.paging
-#define	CPU_STAT_CPL		CPU_STATSAVE.cpu_stat.cpl
+#define	CPU_STAT_VM86		CPU_STATSAVE.cpu_stat.vm86
+#define	CPU_STAT_WP		CPU_STATSAVE.cpu_stat.page_wp
+#define	CPU_STAT_CPL		CPU_STAT_SREG(CPU_CS_INDEX).rpl
+#define	CPU_STAT_USER_MODE	CPU_STATSAVE.cpu_stat.user_mode
 #define	CPU_STAT_PDE_BASE	CPU_STATSAVE.cpu_stat.pde_base
 
+#define	CPU_STAT_HLT		CPU_STATSAVE.cpu_stat.hlt
+
 #define	CPU_STAT_IOPL		((CPU_EFLAG & IOPL_FLAG) >> 12)
 #define	CPU_IOPL0		0
 #define	CPU_IOPL1		1
@@ -431,12 +438,19 @@ void set_eflags(DWORD new_flags, DWORD m
 #define	CPU_STAT_IOADDR		CPU_STATSAVE.cpu_stat.ioaddr
 #define	CPU_STAT_IOLIMIT	CPU_STATSAVE.cpu_stat.iolimit
 
-#define	CPU_STAT_NERROR		CPU_STATSAVE.cpu_stat.nerror
-#define	CPU_STAT_PREV_EXCEPTION	CPU_STATSAVE.cpu_stat.prev_exception
+#define	CPU_STAT_PREV_EXCEPTION		CPU_STATSAVE.cpu_stat.prev_exception
+#define	CPU_STAT_EXCEPTION_COUNTER		CPU_STATSAVE.cpu_stat.nerror
+#define	CPU_STAT_EXCEPTION_COUNTER_INC()	CPU_STATSAVE.cpu_stat.nerror++
+#define	CPU_STAT_EXCEPTION_COUNTER_CLEAR()	CPU_STATSAVE.cpu_stat.nerror = 0
 
 #define	CPU_MODE_SUPERVISER	0
 #define	CPU_MODE_USER		1
-#define	CPU_IS_USER_MODE()	((CPU_STAT_CPL == 3) ? CPU_MODE_USER : CPU_MODE_SUPERVISER)
+#define	CPU_SET_CPL(cpl) \
+do { \
+	BYTE __t = (cpl) & 3; \
+	CPU_STAT_CPL = __t; \
+	CPU_STAT_USER_MODE = (__t == 3) ? CPU_MODE_USER : CPU_MODE_SUPERVISER; \
+} while (/*CONSTCOND*/ 0)
 
 #define CPU_CLI		do { CPU_FLAG &= ~I_FLAG;	\
 					CPU_TRAP = 0; } while (/*CONSTCOND*/ 0)
@@ -448,15 +462,15 @@ void set_eflags(DWORD new_flags, DWORD m
 #define CPU_IDTR_LIMIT	CPU_STATSAVE.cpu_sysregs.idtr_limit
 #define CPU_IDTR_BASE	CPU_STATSAVE.cpu_sysregs.idtr_base
 #define CPU_LDTR	CPU_STATSAVE.cpu_sysregs.ldtr
-#define CPU_LDTR_DESC	CPU_STATSAVE.cpu_stat.ldtr_desc
-#define CPU_LDTR_BASE	CPU_STATSAVE.cpu_stat.ldtr_desc.u.seg.segbase
-#define CPU_LDTR_END	CPU_STATSAVE.cpu_stat.ldtr_desc.u.seg.segend
-#define CPU_LDTR_LIMIT	CPU_STATSAVE.cpu_stat.ldtr_desc.u.seg.limit
+#define CPU_LDTR_DESC	CPU_STATSAVE.cpu_stat.ldtr
+#define CPU_LDTR_BASE	CPU_STATSAVE.cpu_stat.ldtr.u.seg.segbase
+#define CPU_LDTR_END	CPU_STATSAVE.cpu_stat.ldtr.u.seg.segend
+#define CPU_LDTR_LIMIT	CPU_STATSAVE.cpu_stat.ldtr.u.seg.limit
 #define CPU_TR		CPU_STATSAVE.cpu_sysregs.tr
-#define CPU_TR_DESC	CPU_STATSAVE.cpu_stat.tr_desc
-#define CPU_TR_BASE	CPU_STATSAVE.cpu_stat.tr_desc.u.seg.segbase
-#define CPU_TR_END	CPU_STATSAVE.cpu_stat.tr_desc.u.seg.segend
-#define CPU_TR_LIMIT	CPU_STATSAVE.cpu_stat.tr_desc.u.seg.limit
+#define CPU_TR_DESC	CPU_STATSAVE.cpu_stat.tr
+#define CPU_TR_BASE	CPU_STATSAVE.cpu_stat.tr.u.seg.segbase
+#define CPU_TR_END	CPU_STATSAVE.cpu_stat.tr.u.seg.segend
+#define CPU_TR_LIMIT	CPU_STATSAVE.cpu_stat.tr.u.seg.limit
 
 /*
  * control register
@@ -501,6 +515,8 @@ void set_eflags(DWORD new_flags, DWORD m
 
 
 void ia32_init(void);
+void ia32_initreg(void);
+void ia32_setextsize(UINT32 size);
 
 void ia32reset(void);
 void ia32shut(void);
@@ -527,7 +543,8 @@ void FASTCALL change_pm(BOOL onoff);
 void FASTCALL change_vm(BOOL onoff);
 void FASTCALL change_pg(BOOL onoff);
 
-extern BYTE szpcflag[0x200];
+extern const UINT8 iflags[];
+#define	szpcflag	iflags
 extern BYTE szpflag_w[0x10000];
 
 extern BYTE  *reg8_b20[0x100];