Change:

#define	I387	(*(union i387_union *)&(((struct pcb *)curproc->p_addr)->pcb_savefpu.gplemu))
To:
#define	I387	(curproc->p_addr->u_pcb.pcb_savefpu.gplemu)
(and add a few includes of sys/user.h to make it work).

12 files changed, 25 insertions, 13 deletions

diff --git a/sys/gnu/arch/i386/fpemul/errors.c b/sys/gnu/arch/i386/fpemul/errors.c
index 36c4847a4a1..69cb43ad455 100644
--- a/sys/gnu/arch/i386/fpemul/errors.c
+++ b/sys/gnu/arch/i386/fpemul/errors.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: errors.c,v 1.2 2003/01/09 22:27:11 miod Exp $	*/
+/*	$OpenBSD: errors.c,v 1.3 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  errors.c
  *
@@ -75,6 +75,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/fpu_arith.c b/sys/gnu/arch/i386/fpemul/fpu_arith.c
index 2c73fa7c1f2..90f64c61236 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_arith.c
+++ b/sys/gnu/arch/i386/fpemul/fpu_arith.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_arith.c,v 1.1 1996/08/27 10:32:44 downsj Exp $	*/
+/*	$OpenBSD: fpu_arith.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  fpu_arith.c
  *
@@ -66,6 +66,7 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/fpu_aux.c b/sys/gnu/arch/i386/fpemul/fpu_aux.c
index ae7df9a593a..7f216eff194 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_aux.c
+++ b/sys/gnu/arch/i386/fpemul/fpu_aux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_aux.c,v 1.1 1996/08/27 10:32:45 downsj Exp $	*/
+/*	$OpenBSD: fpu_aux.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  fpu_aux.c
  *
@@ -64,6 +64,7 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/fpu_entry.c b/sys/gnu/arch/i386/fpemul/fpu_entry.c
index 8427ccadf1c..ebb4be844a0 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/arch/i386/fpemul/fpu_entry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_entry.c,v 1.3 2003/07/30 20:24:03 jason Exp $	*/
+/*	$OpenBSD: fpu_entry.c,v 1.4 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  fpu_entry.c
  *
@@ -76,6 +76,7 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
+#include <sys/user.h>
 
 #include <machine/cpu.h>
 #include <machine/pcb.h>
diff --git a/sys/gnu/arch/i386/fpemul/fpu_etc.c b/sys/gnu/arch/i386/fpemul/fpu_etc.c
index 8f7dce0b469..442553411af 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_etc.c
+++ b/sys/gnu/arch/i386/fpemul/fpu_etc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_etc.c,v 1.1 1996/08/27 10:32:48 downsj Exp $	*/
+/*	$OpenBSD: fpu_etc.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  fpu_etc.c
  *
@@ -63,6 +63,7 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/fpu_system.h b/sys/gnu/arch/i386/fpemul/fpu_system.h
index 2f4e9a1cc8c..eee4a299ee5 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_system.h
+++ b/sys/gnu/arch/i386/fpemul/fpu_system.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_system.h,v 1.2 2003/07/30 20:24:03 jason Exp $	*/
+/*	$OpenBSD: fpu_system.h,v 1.3 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  fpu_system.h
  *
@@ -70,7 +70,8 @@
 #include <linux/kernel.h>
 */
 
-#define I387 (*(union i387_union *)&(((struct pcb *)curproc->p_addr)->pcb_savefpu.gplemu))
+#define	I387			(curproc->p_addr->u_pcb.pcb_savefpu.gplemu)
+
 #define FPU_info		(I387.soft.frame)
 
 #define FPU_CS			(*(unsigned short *) &(FPU_info->tf_cs))
diff --git a/sys/gnu/arch/i386/fpemul/fpu_trig.c b/sys/gnu/arch/i386/fpemul/fpu_trig.c
index 8867cb61849..78460707693 100644
--- a/sys/gnu/arch/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/arch/i386/fpemul/fpu_trig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_trig.c,v 1.1 1996/08/27 10:32:50 downsj Exp $	*/
+/*	$OpenBSD: fpu_trig.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  fpu_trig.c
  *
@@ -64,6 +64,7 @@
 
 #include <sys/param.h>
 #include <sys/proc.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/get_address.c b/sys/gnu/arch/i386/fpemul/get_address.c
index 84dd8517b0b..edf13af7854 100644
--- a/sys/gnu/arch/i386/fpemul/get_address.c
+++ b/sys/gnu/arch/i386/fpemul/get_address.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get_address.c,v 1.3 2003/01/09 22:27:11 miod Exp $	*/
+/*	$OpenBSD: get_address.c,v 1.4 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  get_address.c
  *
@@ -71,6 +71,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <machine/reg.h>
diff --git a/sys/gnu/arch/i386/fpemul/load_store.c b/sys/gnu/arch/i386/fpemul/load_store.c
index a01a4b87e3a..cb77b1e5d68 100644
--- a/sys/gnu/arch/i386/fpemul/load_store.c
+++ b/sys/gnu/arch/i386/fpemul/load_store.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: load_store.c,v 1.3 2003/07/30 20:24:03 jason Exp $	*/
+/*	$OpenBSD: load_store.c,v 1.4 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  load_store.c
  *
@@ -72,6 +72,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/reg_compare.c b/sys/gnu/arch/i386/fpemul/reg_compare.c
index 3da56eb9007..1130326ca2c 100644
--- a/sys/gnu/arch/i386/fpemul/reg_compare.c
+++ b/sys/gnu/arch/i386/fpemul/reg_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg_compare.c,v 1.1 1996/08/27 10:32:57 downsj Exp $	*/
+/*	$OpenBSD: reg_compare.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  reg_compare.c
  *
@@ -67,6 +67,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/reg_constant.c b/sys/gnu/arch/i386/fpemul/reg_constant.c
index a7c76d45298..0e18481e5e5 100644
--- a/sys/gnu/arch/i386/fpemul/reg_constant.c
+++ b/sys/gnu/arch/i386/fpemul/reg_constant.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg_constant.c,v 1.1 1996/08/27 10:32:57 downsj Exp $	*/
+/*	$OpenBSD: reg_constant.c,v 1.2 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  reg_constant.c
  *
@@ -66,6 +66,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
diff --git a/sys/gnu/arch/i386/fpemul/reg_ld_str.c b/sys/gnu/arch/i386/fpemul/reg_ld_str.c
index 6c4bef61011..989f5feba13 100644
--- a/sys/gnu/arch/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/arch/i386/fpemul/reg_ld_str.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg_ld_str.c,v 1.3 2003/07/30 20:24:03 jason Exp $	*/
+/*	$OpenBSD: reg_ld_str.c,v 1.4 2003/07/30 21:30:31 jason Exp $	*/
 /*
  *  reg_ld_str.c
  *
@@ -71,6 +71,7 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
+#include <sys/user.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>