--- np2/i386c/ia32/ia32.c	2003/12/11 15:06:50	1.2
+++ np2/i386c/ia32/ia32.c	2003/12/25 19:21:17	1.4
@@ -1,4 +1,4 @@
-/*	$Id: ia32.c,v 1.2 2003/12/11 15:06:50 monaka Exp $	*/
+/*	$Id: ia32.c,v 1.4 2003/12/25 19:21:17 yui Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 NONAKA Kimihiro
@@ -32,11 +32,6 @@
 #include "ia32.mcr"
 
 
-CPU_REGS	cpu_regs;
-CPU_SYSREGS	cpu_sysregs;
-CPU_STAT	cpu_stat;
-CPU_INST	cpu_inst;
-CPU_INST	cpu_inst_default;
 I386CORE	i386core;
 
 BYTE iflags[] = {
@@ -87,11 +82,8 @@ ia32_init(void)
 {
 	int i;
 
-	memset(&cpu_regs, 0, sizeof(cpu_regs));
-	memset(&cpu_sysregs, 0, sizeof(cpu_sysregs));
-	memset(&cpu_stat, 0, sizeof(cpu_stat));
-	memset(&cpu_inst_default, 0, sizeof(cpu_inst_default));
-	cpu_inst_default.seg_base = (DWORD)-1;
+	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;
 	CPU_EFLAG = 2;