Implement new system call entry method. Clean up all of the IDT frobnication
code.
This commit is contained in:
mycroft
parent
734a6bf4d5
commit
7be5732f87
|
|
@ -37,7 +37,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
|
||||
* $Id: locore.s,v 1.88 1994/10/25 15:13:44 mycroft Exp $
|
||||
* $Id: locore.s,v 1.89 1994/10/26 01:32:18 mycroft Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -617,8 +617,6 @@ reloc_gdt:
|
|||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define LCALL(x,y) .byte 0x9a ; .long y ; .word x
|
||||
|
||||
/*
|
||||
* Signal trampoline; copied to top of user stack.
|
||||
*/
|
||||
|
|
@ -629,9 +627,9 @@ ENTRY(sigcode)
|
|||
pushl %eax
|
||||
pushl %eax # junk to fake return address
|
||||
movl $SYS_sigreturn,%eax
|
||||
LCALL(7,0) # enter kernel with args on stack
|
||||
int $0x80 # enter kernel with args on stack
|
||||
movl $SYS_exit,%eax
|
||||
LCALL(7,0) # exit if sigreturn fails
|
||||
int $0x80 # exit if sigreturn fails
|
||||
.globl _esigcode
|
||||
_esigcode:
|
||||
|
||||
|
|
@ -1962,34 +1960,6 @@ IDTVEC(fpu)
|
|||
IDTVEC(align)
|
||||
ZTRAP(T_ALIGNFLT)
|
||||
/* 18 - 31 reserved for future exp */
|
||||
IDTVEC(rsvd1)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd2)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd3)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd4)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd5)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd6)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd7)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd8)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd9)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd10)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd11)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd12)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd13)
|
||||
ZTRAP(T_RESERVED)
|
||||
IDTVEC(rsvd14)
|
||||
ZTRAP(T_RESERVED)
|
||||
|
||||
ENTRY(alltraps)
|
||||
INTRENTRY
|
||||
|
|
@ -2041,17 +2011,25 @@ ENTRY(bpttraps)
|
|||
#endif /* KGDB */
|
||||
|
||||
/*
|
||||
* Call gate entry for syscall
|
||||
* Old call gate entry for syscall
|
||||
*/
|
||||
IDTVEC(syscall)
|
||||
pushl $0 # Room for tf_err
|
||||
pushfl # Room for tf_trapno
|
||||
pushfl # turn off trace bit
|
||||
IDTVEC(osyscall)
|
||||
/* Set eflags in trap frame. */
|
||||
pushfl
|
||||
popl 8(%esp)
|
||||
/* Turn off trace bit. */
|
||||
pushfl
|
||||
andb $~(PSL_T>>8),1(%esp)
|
||||
popfl
|
||||
/* FALLTHROUGH */
|
||||
|
||||
/*
|
||||
* Trap gate entry for syscall
|
||||
*/
|
||||
IDTVEC(syscall)
|
||||
pushl $0 # dummy error code
|
||||
pushl $T_ASTFLT # trap # for doing ASTs
|
||||
INTRENTRY
|
||||
movl TF_TRAPNO(%esp),%eax # copy eflags from tf_trapno to tf_eflags
|
||||
movl %eax,TF_EFLAGS(%esp)
|
||||
#ifdef DIAGNOSTIC
|
||||
movl _cpl,%ebx
|
||||
#endif /* DIAGNOSTIC */
|
||||
|
|
@ -2064,7 +2042,6 @@ IDTVEC(syscall)
|
|||
btrl $0,_astpending
|
||||
jnc 1f
|
||||
sti
|
||||
movl $T_ASTFLT,TF_TRAPNO(%esp)
|
||||
call _trap
|
||||
#ifndef DIAGNOSTIC
|
||||
1: INTRFASTEXIT
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
|
||||
* $Id: machdep.c,v 1.123 1994/10/20 04:43:21 cgd Exp $
|
||||
* $Id: machdep.c,v 1.124 1994/10/26 01:32:23 mycroft Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -1030,32 +1030,29 @@ struct soft_segment_descriptor ldt_segs[] = {
|
|||
1 /* limit granularity (byte/page units)*/ } };
|
||||
|
||||
void
|
||||
setidt(idx, func, typ, dpl)
|
||||
int idx;
|
||||
char *func;
|
||||
int typ, dpl;
|
||||
setgate(gdp, func, args, typ, dpl)
|
||||
struct gate_descriptor *gdp;
|
||||
void *func;
|
||||
int args, typ, dpl;
|
||||
{
|
||||
struct gate_descriptor *ip = idt + idx;
|
||||
|
||||
ip->gd_looffset = (int)func;
|
||||
ip->gd_selector = 8;
|
||||
ip->gd_stkcpy = 0;
|
||||
ip->gd_xx = 0;
|
||||
ip->gd_type = typ;
|
||||
ip->gd_dpl = dpl;
|
||||
ip->gd_p = 1;
|
||||
ip->gd_hioffset = ((int)func)>>16;
|
||||
gdp->gd_looffset = (int)func;
|
||||
gdp->gd_selector = GSEL(GCODE_SEL, SEL_KPL);
|
||||
gdp->gd_stkcpy = args;
|
||||
gdp->gd_xx = 0;
|
||||
gdp->gd_type = typ;
|
||||
gdp->gd_dpl = dpl;
|
||||
gdp->gd_p = 1;
|
||||
gdp->gd_hioffset = (int)func >> 16;
|
||||
}
|
||||
|
||||
#define IDTVEC(name) __CONCAT(X, name)
|
||||
extern IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt), IDTVEC(ofl),
|
||||
IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna), IDTVEC(dble), IDTVEC(fpusegm),
|
||||
IDTVEC(tss), IDTVEC(missing), IDTVEC(stk), IDTVEC(prot),
|
||||
IDTVEC(page), IDTVEC(rsvd), IDTVEC(fpu), IDTVEC(align),
|
||||
IDTVEC(rsvd1), IDTVEC(rsvd2), IDTVEC(rsvd3), IDTVEC(rsvd4),
|
||||
IDTVEC(rsvd5), IDTVEC(rsvd6), IDTVEC(rsvd7), IDTVEC(rsvd8),
|
||||
IDTVEC(rsvd9), IDTVEC(rsvd10), IDTVEC(rsvd11), IDTVEC(rsvd12),
|
||||
IDTVEC(rsvd13), IDTVEC(rsvd14), IDTVEC(rsvd14), IDTVEC(syscall);
|
||||
extern IDTVEC(div), IDTVEC(dbg), IDTVEC(nmi), IDTVEC(bpt),
|
||||
IDTVEC(ofl), IDTVEC(bnd), IDTVEC(ill), IDTVEC(dna),
|
||||
IDTVEC(dble), IDTVEC(fpusegm), IDTVEC(tss), IDTVEC(missing),
|
||||
IDTVEC(stk), IDTVEC(prot), IDTVEC(page), IDTVEC(rsvd),
|
||||
IDTVEC(fpu), IDTVEC(align),
|
||||
IDTVEC(syscall), IDTVEC(osyscall);
|
||||
|
||||
void
|
||||
init386(first_avail)
|
||||
|
|
@ -1089,42 +1086,31 @@ init386(first_avail)
|
|||
ssdtosd(ldt_segs + x, ldt + x);
|
||||
|
||||
/* exceptions */
|
||||
setidt(0, &IDTVEC(div), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(1, &IDTVEC(dbg), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(2, &IDTVEC(nmi), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(3, &IDTVEC(bpt), SDT_SYS386TGT, SEL_UPL); /* XXXX */
|
||||
setidt(4, &IDTVEC(ofl), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(5, &IDTVEC(bnd), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(6, &IDTVEC(ill), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(7, &IDTVEC(dna), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(8, &IDTVEC(dble), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(9, &IDTVEC(fpusegm), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(10, &IDTVEC(tss), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(11, &IDTVEC(missing), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(12, &IDTVEC(stk), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(14, &IDTVEC(page), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(16, &IDTVEC(fpu), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(17, &IDTVEC(align), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(18, &IDTVEC(rsvd1), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(19, &IDTVEC(rsvd2), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(20, &IDTVEC(rsvd3), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(21, &IDTVEC(rsvd4), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(22, &IDTVEC(rsvd5), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(23, &IDTVEC(rsvd6), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(24, &IDTVEC(rsvd7), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(25, &IDTVEC(rsvd8), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(26, &IDTVEC(rsvd9), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(27, &IDTVEC(rsvd10), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(28, &IDTVEC(rsvd11), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(29, &IDTVEC(rsvd12), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(30, &IDTVEC(rsvd13), SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(31, &IDTVEC(rsvd14), SDT_SYS386TGT, SEL_KPL);
|
||||
for (x = 0; x < NIDT; x++)
|
||||
setgate(&idt[x], &IDTVEC(rsvd), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 0], &IDTVEC(div), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 1], &IDTVEC(dbg), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 2], &IDTVEC(nmi), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 3], &IDTVEC(bpt), 0, SDT_SYS386TGT, SEL_UPL);
|
||||
setgate(&idt[ 4], &IDTVEC(ofl), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 5], &IDTVEC(bnd), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 6], &IDTVEC(ill), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 7], &IDTVEC(dna), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 8], &IDTVEC(dble), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 9], &IDTVEC(fpusegm), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 10], &IDTVEC(tss), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 11], &IDTVEC(missing), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 12], &IDTVEC(stk), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 13], &IDTVEC(prot), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 14], &IDTVEC(page), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 16], &IDTVEC(fpu), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[ 17], &IDTVEC(align), 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[128], &IDTVEC(syscall), 0, SDT_SYS386TGT, SEL_UPL);
|
||||
|
||||
#if NISA > 0
|
||||
isa_defaultirq();
|
||||
#endif
|
||||
|
||||
r_gdt.rd_limit = sizeof(gdt)-1;
|
||||
r_gdt.rd_base = (int) gdt;
|
||||
lgdt(&r_gdt);
|
||||
|
|
@ -1135,6 +1121,9 @@ init386(first_avail)
|
|||
lldt(_default_ldt);
|
||||
currentldt = _default_ldt;
|
||||
|
||||
splhigh();
|
||||
enable_intr();
|
||||
|
||||
#ifdef DDB
|
||||
ddb_init();
|
||||
if (boothowto & RB_KDB)
|
||||
|
|
@ -1208,17 +1197,9 @@ init386(first_avail)
|
|||
|
||||
ltr(_gsel_tss);
|
||||
|
||||
/* make a call gate to reenter kernel with */
|
||||
gdp = &ldt[LSYS5CALLS_SEL].gd;
|
||||
|
||||
x = (int) &IDTVEC(syscall);
|
||||
gdp->gd_looffset = x++;
|
||||
gdp->gd_selector = GSEL(GCODE_SEL, SEL_KPL);
|
||||
gdp->gd_stkcpy = 1; /* leaves room for eflags like a trap */
|
||||
gdp->gd_type = SDT_SYS386CGT;
|
||||
gdp->gd_dpl = SEL_UPL;
|
||||
gdp->gd_p = 1;
|
||||
gdp->gd_hioffset = ((int) &IDTVEC(syscall)) >>16;
|
||||
/* Set up the old-style call gate descriptor for system calls. */
|
||||
setgate(&ldt[LSYS5CALLS_SEL].gd, &IDTVEC(osyscall), 1, SDT_SYS386CGT,
|
||||
SEL_UPL);
|
||||
|
||||
/* transfer to user mode */
|
||||
_ucodesel = LSEL(LUCODE_SEL, SEL_UPL);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
|
||||
* $Id: intr.c,v 1.21 1994/05/05 16:05:57 mycroft Exp $
|
||||
* $Id: intr.c,v 1.22 1994/10/26 01:30:59 mycroft Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
#define IDTVEC(name) __CONCAT(X,name)
|
||||
/* default interrupt vector table entries */
|
||||
extern IDTVEC(wild), IDTVEC(intr)[], IDTVEC(fast)[];
|
||||
extern struct gate_descriptor idt[];
|
||||
|
||||
/*
|
||||
* Fill in default interrupt table (in case of spuruious interrupt
|
||||
|
|
@ -67,13 +68,10 @@ isa_defaultirq()
|
|||
imask[IPL_TTY] |= SIR_TTYMASK;
|
||||
imask[IPL_CLOCK] |= SIR_CLOCKMASK;
|
||||
|
||||
/* out of range vectors */
|
||||
for (i = NRSVIDT; i < NIDT; i++)
|
||||
setidt(i, &IDTVEC(wild), SDT_SYS386IGT, SEL_KPL);
|
||||
|
||||
/* icu vectors */
|
||||
for (i = 0; i < ICU_LEN; i++)
|
||||
setidt(ICU_OFFSET + i, IDTVEC(intr)[i], SDT_SYS386IGT, SEL_KPL);
|
||||
setgate(&idt[ICU_OFFSET + i], IDTVEC(intr)[i], 0, SDT_SYS386IGT,
|
||||
SEL_KPL);
|
||||
|
||||
/* initialize 8259's */
|
||||
outb(IO_ICU1, 0x11); /* reset; program device, four bytes */
|
||||
|
|
@ -102,9 +100,6 @@ isa_defaultirq()
|
|||
outb(IO_ICU2+1, 0xff); /* leave interrupts masked */
|
||||
outb(IO_ICU2, 0x68); /* special mask mode (if available) */
|
||||
outb(IO_ICU2, 0x0a); /* Read IRR by default. */
|
||||
|
||||
splhigh();
|
||||
enable_intr();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
|
||||
* $Id: npx.c,v 1.21 1994/06/28 07:55:25 deraadt Exp $
|
||||
* $Id: npx.c,v 1.22 1994/10/26 01:31:01 mycroft Exp $
|
||||
*/
|
||||
#include "npx.h"
|
||||
#if NNPX > 0
|
||||
|
|
@ -196,8 +196,8 @@ npxprobe(parent, self, aux)
|
|||
save_idt_npxtrap = idt[16];
|
||||
outb(IO_ICU1 + 1, ~(IRQ_SLAVE | ia->ia_irq));
|
||||
outb(IO_ICU2 + 1, ~(ia->ia_irq >> 8));
|
||||
setidt(16, probetrap, SDT_SYS386TGT, SEL_KPL);
|
||||
setidt(npx_intrno, probeintr, SDT_SYS386IGT, SEL_KPL);
|
||||
setgate(&idt[16], probetrap, 0, SDT_SYS386TGT, SEL_KPL);
|
||||
setgate(&idt[npx_intrno], probeintr, 0, SDT_SYS386IGT, SEL_KPL);
|
||||
npx_idt_probeintr = idt[npx_intrno];
|
||||
enable_intr();
|
||||
result = npxprobe1(ia);
|
||||
|
|
|
|||
Loading…
Reference in New Issue