Move archtypes.h, fpu.h, and stackframe.h

Move archtypes.h to include/ dir, since several servers require it. Move
fpu.h and stackframe.h to arch-specific header directory. Make source
files and makefiles aware of the new header locations.

include/arch/i386/Makefile

@@ -1,6 +1,7 @@
 INCSDIR= /usr/include/i386
 
-INCS=	bios.h cmos.h cpu.h diskparm.h int86.h interrupt.h memory.h \
-	partition.h pci.h ports.h vm.h
+INCS=	archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
+	interrupt.h memory.h partition.h pci.h ports.h stackframe.h \
+	vm.h
 
 .include <minix.kinc.mk>

include/arch/i386/archtypes.h

@@ -0,0 +1,54 @@
+
+#ifndef _I386_TYPES_H
+#define _I386_TYPES_H
+
+#include <minix/sys_config.h>
+#include <machine/stackframe.h>
+#include <machine/fpu.h>
+
+struct segdesc_s {		/* segment descriptor for protected mode */
+  u16_t limit_low;
+  u16_t base_low;
+  u8_t base_middle;
+  u8_t access;		/* |P|DL|1|X|E|R|A| */
+  u8_t granularity;	/* |G|X|0|A|LIMT| */
+  u8_t base_high;
+};
+
+#define LDT_SIZE (2 + NR_REMOTE_SEGS)   /* CS, DS and remote segments */
+
+/* Fixed local descriptors. */
+#define CS_LDT_INDEX         0  /* process CS */
+#define DS_LDT_INDEX         1  /* process DS=ES=FS=GS=SS */
+#define EXTRA_LDT_INDEX      2  /* first of the extra LDT entries */
+
+typedef struct segframe {
+	reg_t p_ldt_sel;    /* selector in gdt with ldt base and limit */
+	reg_t	p_cr3;		/* page table root */
+	struct segdesc_s p_ldt[LDT_SIZE]; /* CS, DS and remote */
+} segframe_t;
+
+/* Page fault event. Stored in process table. Only valid if PAGEFAULT
+ * set in p_rts_flags.
+ */
+struct pagefault
+{
+	u32_t   pf_virtual;     /* Address causing fault (CR2). */
+	u32_t   pf_flags;       /* Pagefault flags on stack. */
+};
+
+
+/* fpu_state_s is used in kernel proc table.
+ * Any changes in this structure requires changes in sconst.h,
+ * since this structure is used in proc structure. */
+struct fpu_state_s {
+	union fpu_state_u *fpu_save_area_p; /* 16-aligned fpu_save_area */
+	/* fpu_image includes 512 bytes of image itself and
+	 * additional 15 bytes required for manual 16-byte alignment. */
+	char fpu_image[527];
+};
+
+#define INMEMORY(p) (!p->p_seg.p_cr3 || ptproc == p)
+
+#endif /* #ifndef _I386_TYPES_H */
+

include/minix/const.h

@@ -1,3 +1,5 @@
+#ifndef _MINIX_CONST_H
+#define _MINIX_CONST_H
 
 #ifndef CHIP
 #error CHIP is not defined
@@ -151,3 +153,5 @@
 #define VERBOSEBOOT_BASIC 1
 #define VERBOSEBOOT_MAX   2
 #define VERBOSEBOOTVARNAME "verbose"
+
+#endif /* _MINIX_CONST_H */

include/sys/Makefile

@@ -2,12 +2,12 @@
 
 INCSDIR=        /usr/include/sys
 
-INCS=	asynchio.h dir.h file.h fpu.h ioc_cmos.h ioc_disk.h \
+INCS=	asynchio.h dir.h file.h ioc_cmos.h ioc_disk.h \
 	ioc_file.h ioc_memory.h ioc_scsi.h ioc_sound.h ioc_tape.h \
 	ioctl.h ioc_tty.h ipc.h jmp_buf.h kbdio.h mman.h \
 	mount.h mtio.h param.h ptrace.h queue.h resource.h \
 	select.h sem.h shm.h sigcontext.h signal.h socket.h \
-	soundcard.h stackframe.h statfs.h stat.h svrctl.h timeb.h \
+	soundcard.h statfs.h stat.h svrctl.h timeb.h \
 	time.h times.h types.h uio.h un.h utsname.h video.h vm.h \
 	wait.h
 

include/sys/sigcontext.h

@@ -23,8 +23,8 @@
  * be added in a different struct.
  */
 #if (_MINIX_CHIP == _CHIP_INTEL)
-#include <sys/stackframe.h>
-#include <sys/fpu.h>
+#include <machine/stackframe.h>
+#include <machine/fpu.h>
 
 typedef struct stackframe_s sigregs;
 struct sigframe {		/* stack frame created for signalled process */