--- np2/i386c/ia32/cpu.h	2004/01/23 16:32:36	1.10
+++ np2/i386c/ia32/cpu.h	2004/02/03 14:49:39	1.12
@@ -1,4 +1,4 @@
-/*	$Id: cpu.h,v 1.10 2004/01/23 16:32:36 monaka Exp $	*/
+/*	$Id: cpu.h,v 1.12 2004/02/03 14:49:39 monaka Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -75,13 +75,7 @@ typedef union {
 }
 #endif
 
-#include "cpu_io.h"
-#include "cpu_mem.h"
-#include "exception.h"
-#include "paging.h"
-#include "resolve.h"
 #include "segments.h"
-#include "task.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -170,6 +164,8 @@ typedef struct {
 	BYTE		paging;
 	BYTE		vm86;
 
+	DWORD		pde_base;
+
 	DWORD		ioaddr;		/* I/O bitmap linear address */
 	WORD		iolimit;	/* I/O bitmap count */
 
@@ -246,7 +242,7 @@ extern sigjmp_buf	exec_1step_jmpbuf;
 
 /* version */
 #define	CPU_FAMILY	4
-#define	CPU_MODEL	1
+#define	CPU_MODEL	2
 #define	CPU_STEPPING	3
 
 /* feature */
@@ -416,6 +412,7 @@ void set_eflags(DWORD new_flags, DWORD m
 #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_PDE_BASE	CPU_STATSAVE.cpu_stat.pde_base
 
 #define	CPU_STAT_IOPL		((CPU_EFLAG & IOPL_FLAG) >> 12)
 #define	CPU_IOPL0		0
@@ -545,4 +542,11 @@ void tr_dump(WORD selector, DWORD base, 
 }
 #endif
 
+#include "cpu_io.h"
+#include "cpu_mem.h"
+#include "exception.h"
+#include "paging.h"
+#include "resolve.h"
+#include "task.h"
+
 #endif	/* !IA32_CPU_CPU_H__ */