Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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:
Arun Thomas
2010-03-09 09:41:14 +00:00
parent 27d53256e4
commit 1f9ce647cf
40 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sys/Makefile
View File

@@ -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

50
include/sys/fpu.h
View File

@@ -1,50 +0,0 @@
#ifndef FPU_H
#define FPU_H
/* x87 FPU state, MMX Technolodgy.
* 108 bytes.*/
struct fpu_regs_s {
u16_t fp_control; /* control */
u16_t fp_unused_1;
u16_t fp_status; /* status */
u16_t fp_unused_2;
u16_t fp_tag; /* register tags */
u16_t fp_unused_3;
u32_t fp_eip; /* eip at failed instruction */
u16_t fp_cs; /* cs at failed instruction */
u16_t fp_opcode; /* opcode of failed instruction */
u32_t fp_dp; /* data address */
u16_t fp_ds; /* data segment */
u16_t fp_unused_4;
u16_t fp_st_regs[8][5]; /* 8 80-bit FP registers */
};
/* x87 FPU, MMX Technolodgy and SSE state.
* 512 bytes (if you need size use FPU_XFP_SIZE). */
struct xfp_save {
u16_t fp_control; /* control */
u16_t fp_status; /* status */
u16_t fp_tag; /* register tags */
u16_t fp_opcode; /* opcode of failed instruction */
u32_t fp_eip; /* eip at failed instruction */
u16_t fp_cs; /* cs at failed instruction */
u16_t fp_unused_1;
u32_t fp_dp; /* data address */
u16_t fp_ds; /* data segment */
u16_t fp_unused_2;
u32_t fp_mxcsr; /* MXCSR */
u32_t fp_mxcsr_mask; /* MXCSR_MASK */
u16_t fp_st_regs[8][8]; /* 128 bytes for ST/MM regs */
u32_t fp_xreg_word[32]; /* space for 8 128-bit XMM registers */
u32_t fp_padding[56];
};
/* Size of xfp_save structure. */
#define FPU_XFP_SIZE 512
union fpu_state_u {
struct fpu_regs_s fpu_regs;
struct xfp_save xfp_regs;
};
#endif /* #ifndef FPU_H */

4
include/sys/sigcontext.h
View File

@@ -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 */

36
include/sys/stackframe.h
View File

@@ -1,36 +0,0 @@
#ifndef STACK_FRAME_H
#define STACK_FRAME_H
typedef unsigned reg_t; /* machine register */
typedef reg_t segdesc_t;
/* The stack frame layout is determined by the software, but for efficiency
* it is laid out so the assembly code to use it is as simple as possible.
* 80286 protected mode and all real modes use the same frame, built with
* 16-bit registers. Real mode lacks an automatic stack switch, so little
* is lost by using the 286 frame for it. The 386 frame differs only in
* having 32-bit registers and more segment registers. The same names are
* used for the larger registers to avoid differences in the code.
*/
struct stackframe_s {
u16_t gs; /* last item pushed by save */
u16_t fs; /* ^ */
u16_t es; /* | */
u16_t ds; /* | */
reg_t di; /* di through cx are not accessed in C */
reg_t si; /* order is to match pusha/popa */
reg_t fp; /* bp */
reg_t st; /* hole for another copy of sp */
reg_t bx; /* | */
reg_t dx; /* | */
reg_t cx; /* | */
reg_t retreg; /* ax and above are all pushed by save */
reg_t retadr; /* return address for assembly code save() */
reg_t pc; /* ^ last item pushed by interrupt */
reg_t cs; /* | */
reg_t psw; /* | */
reg_t sp; /* | */
reg_t ss; /* these are pushed by CPU during interrupt */
};
#endif /* #ifndef STACK_FRAME_H */