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.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include <archconst.h>
|
||||
#include "archconst.h"
|
||||
#include "apic.h"
|
||||
#include "sconst.h"
|
||||
#include "apic_asm.h"
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
|
||||
#ifndef _I386_TYPES_H
|
||||
#define _I386_TYPES_H
|
||||
|
||||
#include <minix/sys_config.h>
|
||||
#include "archconst.h"
|
||||
#include <sys/stackframe.h>
|
||||
#include <sys/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 */
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <minix/config.h>
|
||||
#include <minix/const.h>
|
||||
#include <machine/interrupt.h>
|
||||
#include <archconst.h>
|
||||
#include "archconst.h"
|
||||
#include "../../const.h"
|
||||
#include "sconst.h"
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ begbss:
|
||||
#include <minix/const.h>
|
||||
#include <minix/com.h>
|
||||
#include <machine/interrupt.h>
|
||||
#include <archconst.h>
|
||||
#include "archconst.h"
|
||||
#include "../../const.h"
|
||||
#include "../../proc.h"
|
||||
#include "sconst.h"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "../../kernel.h"
|
||||
#include "../../proc.h"
|
||||
#include <archconst.h>
|
||||
#include "archconst.h"
|
||||
|
||||
#include "proto.h"
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
#include <minix/portio.h>
|
||||
#include <minix/cpufeature.h>
|
||||
#include <a.out.h>
|
||||
#include <archconst.h>
|
||||
|
||||
#include "archconst.h"
|
||||
#include "proto.h"
|
||||
#include "../../proc.h"
|
||||
#include "../../debug.h"
|
||||
|
||||
@@ -12,7 +12,8 @@
|
||||
#endif
|
||||
|
||||
#include <minix/config.h>
|
||||
#include <archtypes.h>
|
||||
#include <machine/archtypes.h>
|
||||
#include "archconst.h"
|
||||
#include "config.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
#include "kernel.h"
|
||||
#include "proc.h"
|
||||
#include <archconst.h>
|
||||
#include "archconst.h"
|
||||
|
||||
#include "arch/i386/hw_intr.h"
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
* Jul 01, 2005 Created. (Jorrit N. Herder)
|
||||
*/
|
||||
#include <minix/com.h>
|
||||
#include <minix/const.h>
|
||||
#include "const.h"
|
||||
#include "type.h"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#define PROTO_H
|
||||
|
||||
#include <minix/safecopies.h>
|
||||
#include <archtypes.h>
|
||||
#include <machine/archtypes.h>
|
||||
#include <a.out.h>
|
||||
|
||||
/* Struct declarations. */
|
||||
|
||||
Reference in New Issue
Block a user