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:
parent
27d53256e4
commit
1f9ce647cf
40 changed files with 45 additions and 45 deletions
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
#undef EXTERN /* <minix/const.h> defined this */
|
#undef EXTERN /* <minix/const.h> defined this */
|
||||||
#define EXTERN /* so we get proc & mproc */
|
#define EXTERN /* so we get proc & mproc */
|
||||||
#include "../../kernel/arch/i386/include/archtypes.h"
|
#include <machine/archtypes.h>
|
||||||
#include "../../kernel/const.h"
|
#include "../../kernel/const.h"
|
||||||
#include "../../kernel/type.h"
|
#include "../../kernel/type.h"
|
||||||
#include "../../kernel/proc.h"
|
#include "../../kernel/proc.h"
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#undef EXTERN
|
#undef EXTERN
|
||||||
#define EXTERN
|
#define EXTERN
|
||||||
#include "../../kernel/arch/i386/include/archtypes.h"
|
#include <machine/archtypes.h>
|
||||||
#include "../../servers/pm/const.h"
|
#include "../../servers/pm/const.h"
|
||||||
#include "../../servers/pm/type.h"
|
#include "../../servers/pm/type.h"
|
||||||
#include "../../servers/pm/mproc.h"
|
#include "../../servers/pm/mproc.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/ptrace.h>
|
#include <sys/ptrace.h>
|
||||||
|
|
||||||
#include <kernel/arch/i386/include/archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include <kernel/const.h>
|
#include <kernel/const.h>
|
||||||
#include <kernel/type.h>
|
#include <kernel/type.h>
|
||||||
#include <kernel/proc.h>
|
#include <kernel/proc.h>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
#include <sys/ptrace.h>
|
#include <sys/ptrace.h>
|
||||||
#include "proto.h"
|
#include "proto.h"
|
||||||
|
|
||||||
#include <kernel/arch/i386/include/archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include <kernel/const.h>
|
#include <kernel/const.h>
|
||||||
#include <kernel/type.h>
|
#include <kernel/type.h>
|
||||||
#include <kernel/proc.h>
|
#include <kernel/proc.h>
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#include "proto.h"
|
#include "proto.h"
|
||||||
|
|
||||||
#include "../../kernel/arch/i386/include/archtypes.h"
|
#include <machine/archtypes.h>
|
||||||
#include <kernel/const.h>
|
#include <kernel/const.h>
|
||||||
#include <kernel/type.h>
|
#include <kernel/type.h>
|
||||||
#include <kernel/proc.h>
|
#include <kernel/proc.h>
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ttyent.h>
|
#include <ttyent.h>
|
||||||
|
|
||||||
#include "../../kernel/arch/i386/include/archtypes.h"
|
#include <machine/archtypes.h>
|
||||||
#include "../../kernel/const.h"
|
#include "../../kernel/const.h"
|
||||||
#include "../../kernel/type.h"
|
#include "../../kernel/type.h"
|
||||||
#include "../../kernel/proc.h"
|
#include "../../kernel/proc.h"
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "../../kernel/arch/i386/include/archtypes.h"
|
#include <machine/archtypes.h>
|
||||||
#include "../../kernel/proc.h"
|
#include "../../kernel/proc.h"
|
||||||
|
|
||||||
#define CLICK_WORDS (CLICK_SIZE / sizeof(unsigned long))
|
#define CLICK_WORDS (CLICK_SIZE / sizeof(unsigned long))
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
#include <minix/u64.h>
|
#include <minix/u64.h>
|
||||||
|
|
||||||
#include "../../kernel/arch/i386/include/archtypes.h"
|
#include <machine/archtypes.h>
|
||||||
#include "../../servers/pm/mproc.h"
|
#include "../../servers/pm/mproc.h"
|
||||||
#include "../../kernel/const.h"
|
#include "../../kernel/const.h"
|
||||||
#include "../../kernel/proc.h"
|
#include "../../kernel/proc.h"
|
||||||
|
|
|
@ -14,7 +14,7 @@ d = ..
|
||||||
# programs, flags, etc.
|
# programs, flags, etc.
|
||||||
MAKE = exec make
|
MAKE = exec make
|
||||||
CC = exec cc
|
CC = exec cc
|
||||||
CPPFLAGS = -I.. -I../.. -I../../kernel/arch/$(ARCH)/include -I$i
|
CPPFLAGS = -I.. -I../.. -I$i
|
||||||
CFLAGS = $(CPPFLAGS)
|
CFLAGS = $(CPPFLAGS)
|
||||||
LDFLAGS = -i
|
LDFLAGS = -i
|
||||||
LIBS = -lsys -ltimers
|
LIBS = -lsys -ltimers
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#include <termios.h>
|
#include <termios.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include <minix/callnr.h>
|
#include <minix/callnr.h>
|
||||||
#include <minix/com.h>
|
#include <minix/com.h>
|
||||||
#include <minix/keymap.h>
|
#include <minix/keymap.h>
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
INCSDIR= /usr/include/i386
|
INCSDIR= /usr/include/i386
|
||||||
|
|
||||||
INCS= bios.h cmos.h cpu.h diskparm.h int86.h interrupt.h memory.h \
|
INCS= archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
|
||||||
partition.h pci.h ports.h vm.h
|
interrupt.h memory.h partition.h pci.h ports.h stackframe.h \
|
||||||
|
vm.h
|
||||||
|
|
||||||
.include <minix.kinc.mk>
|
.include <minix.kinc.mk>
|
||||||
|
|
|
@ -3,9 +3,8 @@
|
||||||
#define _I386_TYPES_H
|
#define _I386_TYPES_H
|
||||||
|
|
||||||
#include <minix/sys_config.h>
|
#include <minix/sys_config.h>
|
||||||
#include "archconst.h"
|
#include <machine/stackframe.h>
|
||||||
#include <sys/stackframe.h>
|
#include <machine/fpu.h>
|
||||||
#include <sys/fpu.h>
|
|
||||||
|
|
||||||
struct segdesc_s { /* segment descriptor for protected mode */
|
struct segdesc_s { /* segment descriptor for protected mode */
|
||||||
u16_t limit_low;
|
u16_t limit_low;
|
|
@ -1,3 +1,5 @@
|
||||||
|
#ifndef _MINIX_CONST_H
|
||||||
|
#define _MINIX_CONST_H
|
||||||
|
|
||||||
#ifndef CHIP
|
#ifndef CHIP
|
||||||
#error CHIP is not defined
|
#error CHIP is not defined
|
||||||
|
@ -151,3 +153,5 @@
|
||||||
#define VERBOSEBOOT_BASIC 1
|
#define VERBOSEBOOT_BASIC 1
|
||||||
#define VERBOSEBOOT_MAX 2
|
#define VERBOSEBOOT_MAX 2
|
||||||
#define VERBOSEBOOTVARNAME "verbose"
|
#define VERBOSEBOOTVARNAME "verbose"
|
||||||
|
|
||||||
|
#endif /* _MINIX_CONST_H */
|
||||||
|
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
INCSDIR= /usr/include/sys
|
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 \
|
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 \
|
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 \
|
mount.h mtio.h param.h ptrace.h queue.h resource.h \
|
||||||
select.h sem.h shm.h sigcontext.h signal.h socket.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 \
|
time.h times.h types.h uio.h un.h utsname.h video.h vm.h \
|
||||||
wait.h
|
wait.h
|
||||||
|
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
* be added in a different struct.
|
* be added in a different struct.
|
||||||
*/
|
*/
|
||||||
#if (_MINIX_CHIP == _CHIP_INTEL)
|
#if (_MINIX_CHIP == _CHIP_INTEL)
|
||||||
#include <sys/stackframe.h>
|
#include <machine/stackframe.h>
|
||||||
#include <sys/fpu.h>
|
#include <machine/fpu.h>
|
||||||
|
|
||||||
typedef struct stackframe_s sigregs;
|
typedef struct stackframe_s sigregs;
|
||||||
struct sigframe { /* stack frame created for signalled process */
|
struct sigframe { /* stack frame created for signalled process */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include <archconst.h>
|
#include "archconst.h"
|
||||||
#include "apic.h"
|
#include "apic.h"
|
||||||
#include "sconst.h"
|
#include "sconst.h"
|
||||||
#include "apic_asm.h"
|
#include "apic_asm.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <minix/config.h>
|
#include <minix/config.h>
|
||||||
#include <minix/const.h>
|
#include <minix/const.h>
|
||||||
#include <machine/interrupt.h>
|
#include <machine/interrupt.h>
|
||||||
#include <archconst.h>
|
#include "archconst.h"
|
||||||
#include "../../const.h"
|
#include "../../const.h"
|
||||||
#include "sconst.h"
|
#include "sconst.h"
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ begbss:
|
||||||
#include <minix/const.h>
|
#include <minix/const.h>
|
||||||
#include <minix/com.h>
|
#include <minix/com.h>
|
||||||
#include <machine/interrupt.h>
|
#include <machine/interrupt.h>
|
||||||
#include <archconst.h>
|
#include "archconst.h"
|
||||||
#include "../../const.h"
|
#include "../../const.h"
|
||||||
#include "../../proc.h"
|
#include "../../proc.h"
|
||||||
#include "sconst.h"
|
#include "sconst.h"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include "../../kernel.h"
|
#include "../../kernel.h"
|
||||||
#include "../../proc.h"
|
#include "../../proc.h"
|
||||||
#include <archconst.h>
|
#include "archconst.h"
|
||||||
|
|
||||||
#include "proto.h"
|
#include "proto.h"
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
#include <minix/portio.h>
|
#include <minix/portio.h>
|
||||||
#include <minix/cpufeature.h>
|
#include <minix/cpufeature.h>
|
||||||
#include <a.out.h>
|
#include <a.out.h>
|
||||||
#include <archconst.h>
|
|
||||||
|
|
||||||
|
#include "archconst.h"
|
||||||
#include "proto.h"
|
#include "proto.h"
|
||||||
#include "../../proc.h"
|
#include "../../proc.h"
|
||||||
#include "../../debug.h"
|
#include "../../debug.h"
|
||||||
|
|
|
@ -12,7 +12,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <minix/config.h>
|
#include <minix/config.h>
|
||||||
#include <archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
|
#include "archconst.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
#include "kernel.h"
|
#include "kernel.h"
|
||||||
#include "proc.h"
|
#include "proc.h"
|
||||||
#include <archconst.h>
|
#include "archconst.h"
|
||||||
|
|
||||||
#include "arch/i386/hw_intr.h"
|
#include "arch/i386/hw_intr.h"
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
* Jul 01, 2005 Created. (Jorrit N. Herder)
|
* Jul 01, 2005 Created. (Jorrit N. Herder)
|
||||||
*/
|
*/
|
||||||
#include <minix/com.h>
|
#include <minix/com.h>
|
||||||
|
#include <minix/const.h>
|
||||||
#include "const.h"
|
#include "const.h"
|
||||||
#include "type.h"
|
#include "type.h"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#define PROTO_H
|
#define PROTO_H
|
||||||
|
|
||||||
#include <minix/safecopies.h>
|
#include <minix/safecopies.h>
|
||||||
#include <archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include <a.out.h>
|
#include <a.out.h>
|
||||||
|
|
||||||
/* Struct declarations. */
|
/* Struct declarations. */
|
||||||
|
|
|
@ -15,7 +15,7 @@ f = $u/src/servers/fs
|
||||||
|
|
||||||
# programs, flags, etc.
|
# programs, flags, etc.
|
||||||
CC = exec cc
|
CC = exec cc
|
||||||
CPPFLAGS=-I../../kernel/arch/$(ARCH)/include -I$i
|
CPPFLAGS=-I$i
|
||||||
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
||||||
LDFLAGS = -i
|
LDFLAGS = -i
|
||||||
LIBS = -lsys
|
LIBS = -lsys
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
|
||||||
#include <archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include "proto.h"
|
#include "proto.h"
|
||||||
#include "glo.h"
|
#include "glo.h"
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ k = $u/src/kernel
|
||||||
|
|
||||||
# programs, flags, etc.
|
# programs, flags, etc.
|
||||||
CC = exec cc
|
CC = exec cc
|
||||||
CPPFLAGS=-I../../kernel/arch/$(ARCH)/include -I$i
|
CPPFLAGS=-I$i
|
||||||
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
||||||
LDFLAGS = -i
|
LDFLAGS = -i
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <archconst.h>
|
|
||||||
|
|
||||||
#include "mproc.h"
|
#include "mproc.h"
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,7 @@
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#include <sys/utsname.h>
|
#include <sys/utsname.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <archconst.h>
|
#include <machine/archtypes.h>
|
||||||
#include <archtypes.h>
|
|
||||||
#include <env.h>
|
#include <env.h>
|
||||||
#include "mproc.h"
|
#include "mproc.h"
|
||||||
#include "param.h"
|
#include "param.h"
|
||||||
|
|
|
@ -24,8 +24,7 @@
|
||||||
#include <minix/type.h>
|
#include <minix/type.h>
|
||||||
#include <minix/vm.h>
|
#include <minix/vm.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <archconst.h>
|
#include <machine/archtypes.h>
|
||||||
#include <archtypes.h>
|
|
||||||
#include <lib.h>
|
#include <lib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include "mproc.h"
|
#include "mproc.h"
|
||||||
|
|
|
@ -22,8 +22,7 @@
|
||||||
#include <minix/config.h>
|
#include <minix/config.h>
|
||||||
#include <timers.h>
|
#include <timers.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <archconst.h>
|
#include <machine/archtypes.h>
|
||||||
#include <archtypes.h>
|
|
||||||
#include "../../kernel/const.h"
|
#include "../../kernel/const.h"
|
||||||
#include "../../kernel/config.h"
|
#include "../../kernel/config.h"
|
||||||
#include "../../kernel/type.h"
|
#include "../../kernel/type.h"
|
||||||
|
|
|
@ -13,7 +13,7 @@ b = $i/ibm
|
||||||
|
|
||||||
# programs, flags, etc.
|
# programs, flags, etc.
|
||||||
CC = exec cc
|
CC = exec cc
|
||||||
CPPFLAGS = -I../../kernel/arch/$(ARCH)/include
|
CPPFLAGS =
|
||||||
CFLAGS = -I$i $(CPROFILE) $(CPPFLAGS)
|
CFLAGS = -I$i $(CPROFILE) $(CPPFLAGS)
|
||||||
LDFLAGS = -i
|
LDFLAGS = -i
|
||||||
LIBS = -lsys
|
LIBS = -lsys
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <minix/dmap.h>
|
#include <minix/dmap.h>
|
||||||
#include <minix/endpoint.h>
|
#include <minix/endpoint.h>
|
||||||
|
|
||||||
#include <archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include <timers.h> /* For priv.h */
|
#include <timers.h> /* For priv.h */
|
||||||
#include "../../kernel/priv.h"
|
#include "../../kernel/priv.h"
|
||||||
#include "../../kernel/ipc.h"
|
#include "../../kernel/ipc.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@ OBJ = main.o alloc.o utility.o exec.o exit.o fork.o break.o \
|
||||||
physravl.o rs.o queryexit.o map_mem.o
|
physravl.o rs.o queryexit.o map_mem.o
|
||||||
ARCHOBJ = $(ARCH)/vm.o $(ARCH)/pagetable.o $(ARCH)/arch_pagefaults.o $(ARCH)/util.o
|
ARCHOBJ = $(ARCH)/vm.o $(ARCH)/pagetable.o $(ARCH)/arch_pagefaults.o $(ARCH)/util.o
|
||||||
|
|
||||||
CPPFLAGS=-I../../kernel/arch/$(ARCH)/include -I$(ARCH)
|
CPPFLAGS=-I$(ARCH)
|
||||||
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
||||||
|
|
||||||
# build local binary
|
# build local binary
|
||||||
|
|
|
@ -3,7 +3,7 @@ include /etc/make.conf
|
||||||
|
|
||||||
OBJ = vm.o pagetable.o arch_pagefaults.o util.o
|
OBJ = vm.o pagetable.o arch_pagefaults.o util.o
|
||||||
|
|
||||||
CPPFLAGS=-I../../../kernel/arch/$(ARCH)/include -I.
|
CPPFLAGS=-I.
|
||||||
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
CFLAGS = $(CPROFILE) $(CPPFLAGS)
|
||||||
|
|
||||||
all: $(OBJ)
|
all: $(OBJ)
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
|
|
||||||
#include <archtypes.h>
|
|
||||||
#include <minix/config.h>
|
#include <minix/config.h>
|
||||||
#include <minix/const.h>
|
#include <minix/const.h>
|
||||||
#include <minix/type.h>
|
#include <minix/type.h>
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
extern int missing_spares;
|
extern int missing_spares;
|
||||||
|
|
||||||
#include <archtypes.h>
|
#include <machine/archtypes.h>
|
||||||
#include "../../kernel/const.h"
|
#include "../../kernel/const.h"
|
||||||
#include "../../kernel/config.h"
|
#include "../../kernel/config.h"
|
||||||
#include "../../kernel/proc.h"
|
#include "../../kernel/proc.h"
|
||||||
|
|
|
@ -29,8 +29,7 @@
|
||||||
#include "glo.h"
|
#include "glo.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
#include <archconst.h>
|
#include <machine/archtypes.h>
|
||||||
#include <archtypes.h>
|
|
||||||
#include "../../kernel/const.h"
|
#include "../../kernel/const.h"
|
||||||
#include "../../kernel/config.h"
|
#include "../../kernel/config.h"
|
||||||
#include "../../kernel/type.h"
|
#include "../../kernel/type.h"
|
||||||
|
|
Loading…
Reference in a new issue