1993-06-12 14:58:17 +00:00
|
|
|
/*-
|
|
|
|
|
* Copyright (c) 1990 William Jolitz.
|
|
|
|
|
* Copyright (c) 1991 The Regents of the University of California.
|
|
|
|
|
* All rights reserved.
|
|
|
|
|
*
|
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
|
* are met:
|
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
|
* This product includes software developed by the University of
|
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
|
* without specific prior written permission.
|
|
|
|
|
*
|
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
|
*
|
ALL:
Removed patch kit headers and rcsid strings, add $Id$.
isa.c:
Removed old #ifdef notyet isa_configure code, since it will never be
used, and I have done 90% of what it attempted to.
Add conflict checking code that searchs back through the devtab's looking
for any device that has already been found that may conflict with what
we are about to probe. Checks are mode for I/O address, memory address,
IRQ, and DRQ. This should stop the screwing up of any device that has
alread been found by other device probes.
Print out messages when we are not going to probe a device due to
a conflict so the user knows WHY something was not found. For example:
aha0 not probed due to irq conflict with ahb0 at 11
Now print out a message when a device is not found so the user knows
that it was probed for, but could not be found. For example:
ed1 not found at 0x320
For devices that have I/O address < 0x100 say that they are on the
motherboard, not on isa! The 0x100 magic number is per ISA spec. It
may seem funny that pc0 and sc0 report as being on the motherboard, but
this is due to the fact that the I/O address used is that of the keyboard
controller which IS on the motherboard. We really need to split the
keyboard probe from the display probe. It is completly legal to build
a pc with out one or the other, or even with out both!
npx.c:
Return -1 from the probe routine if we are using the Emulator so
that the i/o addresses are not printed, this is the same trick used
for 486's.
Do not print the ``Errors reported via Exception 16'', and
``Errors reported via IRQ 13'' messages any more, since these just lead
to more user confusion that anything. It still prints the message
``Error reporting broken, using 387 emulator'' so that the person is
aware that there mother board is ill.
1993-10-13 15:59:30 +00:00
|
|
|
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
|
1997-03-24 11:25:10 +00:00
|
|
|
* $Id: npx.c,v 1.39 1997/02/22 09:36:57 peter Exp $
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "npx.h"
|
|
|
|
|
#if NNPX > 0
|
|
|
|
|
|
1996-11-11 20:39:03 +00:00
|
|
|
#include "opt_cpu.h"
|
1996-01-06 23:10:57 +00:00
|
|
|
#include "opt_math_emulate.h"
|
1996-01-04 19:51:50 +00:00
|
|
|
|
1994-08-13 03:50:34 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
|
#include <sys/systm.h>
|
1995-10-28 13:07:28 +00:00
|
|
|
#include <sys/kernel.h>
|
|
|
|
|
#include <sys/sysctl.h>
|
1994-08-13 03:50:34 +00:00
|
|
|
#include <sys/conf.h>
|
|
|
|
|
#include <sys/file.h>
|
|
|
|
|
#include <sys/proc.h>
|
1997-01-29 13:46:28 +00:00
|
|
|
#ifdef NPX_DEBUG
|
1994-11-14 14:59:06 +00:00
|
|
|
#include <sys/syslog.h>
|
1997-01-29 13:46:28 +00:00
|
|
|
#endif
|
1994-11-14 14:59:06 +00:00
|
|
|
#include <sys/signalvar.h>
|
1994-10-23 21:28:03 +00:00
|
|
|
|
1994-08-13 03:50:34 +00:00
|
|
|
#include <machine/cpu.h>
|
|
|
|
|
#include <machine/pcb.h>
|
1996-06-25 20:31:01 +00:00
|
|
|
#include <machine/md_var.h>
|
1994-08-13 03:50:34 +00:00
|
|
|
#include <machine/trap.h>
|
1994-11-14 14:59:06 +00:00
|
|
|
#include <machine/clock.h>
|
1994-08-13 03:50:34 +00:00
|
|
|
#include <machine/specialreg.h>
|
1994-10-23 21:28:03 +00:00
|
|
|
|
1994-08-13 03:50:34 +00:00
|
|
|
#include <i386/isa/icu.h>
|
|
|
|
|
#include <i386/isa/isa_device.h>
|
|
|
|
|
#include <i386/isa/isa.h>
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
|
|
|
|
|
*/
|
|
|
|
|
|
1996-11-11 20:39:03 +00:00
|
|
|
/* Configuration flags. */
|
|
|
|
|
#define NPX_DISABLE_I586_OPTIMIZED_BCOPY (1 << 0)
|
|
|
|
|
#define NPX_DISABLE_I586_OPTIMIZED_BZERO (1 << 1)
|
|
|
|
|
#define NPX_DISABLE_I586_OPTIMIZED_COPYIO (1 << 2)
|
|
|
|
|
|
|
|
|
|
/* XXX - should be in header file. */
|
|
|
|
|
extern void (*bcopy_vector) __P((const void *from, void *to, size_t len));
|
|
|
|
|
extern void (*ovbcopy_vector) __P((const void *from, void *to, size_t len));
|
|
|
|
|
extern int (*copyin_vector) __P((const void *udaddr, void *kaddr, size_t len));
|
|
|
|
|
extern int (*copyout_vector) __P((const void *kaddr, void *udaddr, size_t len));
|
|
|
|
|
|
|
|
|
|
void i586_bcopy __P((const void *from, void *to, size_t len));
|
|
|
|
|
void i586_bzero __P((void *buf, size_t len));
|
|
|
|
|
int i586_copyin __P((const void *udaddr, void *kaddr, size_t len));
|
|
|
|
|
int i586_copyout __P((const void *kaddr, void *udaddr, size_t len));
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
#ifdef __GNUC__
|
|
|
|
|
|
1995-01-03 04:00:06 +00:00
|
|
|
#define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr)))
|
1993-06-12 14:58:17 +00:00
|
|
|
#define fnclex() __asm("fnclex")
|
|
|
|
|
#define fninit() __asm("fninit")
|
1995-01-03 04:00:06 +00:00
|
|
|
#define fnop() __asm("fnop")
|
|
|
|
|
#define fnsave(addr) __asm("fnsave %0" : "=m" (*(addr)))
|
|
|
|
|
#define fnstcw(addr) __asm("fnstcw %0" : "=m" (*(addr)))
|
|
|
|
|
#define fnstsw(addr) __asm("fnstsw %0" : "=m" (*(addr)))
|
|
|
|
|
#define fp_divide_by_0() __asm("fldz; fld1; fdiv %st,%st(1); fnop")
|
|
|
|
|
#define frstor(addr) __asm("frstor %0" : : "m" (*(addr)))
|
1993-06-12 14:58:17 +00:00
|
|
|
#define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \
|
|
|
|
|
: : "n" (CR0_TS) : "ax")
|
|
|
|
|
#define stop_emulating() __asm("clts")
|
|
|
|
|
|
|
|
|
|
#else /* not __GNUC__ */
|
|
|
|
|
|
|
|
|
|
void fldcw __P((caddr_t addr));
|
|
|
|
|
void fnclex __P((void));
|
|
|
|
|
void fninit __P((void));
|
1995-01-03 04:00:06 +00:00
|
|
|
void fnop __P((void));
|
1993-06-12 14:58:17 +00:00
|
|
|
void fnsave __P((caddr_t addr));
|
|
|
|
|
void fnstcw __P((caddr_t addr));
|
|
|
|
|
void fnstsw __P((caddr_t addr));
|
|
|
|
|
void fp_divide_by_0 __P((void));
|
|
|
|
|
void frstor __P((caddr_t addr));
|
|
|
|
|
void start_emulating __P((void));
|
|
|
|
|
void stop_emulating __P((void));
|
|
|
|
|
|
|
|
|
|
#endif /* __GNUC__ */
|
|
|
|
|
|
|
|
|
|
typedef u_char bool_t;
|
|
|
|
|
|
|
|
|
|
static int npxattach __P((struct isa_device *dvp));
|
|
|
|
|
static int npxprobe __P((struct isa_device *dvp));
|
|
|
|
|
static int npxprobe1 __P((struct isa_device *dvp));
|
|
|
|
|
|
|
|
|
|
struct isa_driver npxdriver = {
|
|
|
|
|
npxprobe, npxattach, "npx",
|
|
|
|
|
};
|
|
|
|
|
|
1995-01-03 04:00:06 +00:00
|
|
|
int hw_float; /* XXX currently just alias for npx_exists */
|
1995-10-28 13:07:28 +00:00
|
|
|
|
|
|
|
|
SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
|
|
|
|
|
CTLFLAG_RD, &hw_float, 0,
|
|
|
|
|
"Floatingpoint instructions executed in hardware");
|
|
|
|
|
|
1995-12-10 13:40:44 +00:00
|
|
|
static u_int npx0_imask = SWI_CLOCK_MASK;
|
1993-06-12 14:58:17 +00:00
|
|
|
struct proc *npxproc;
|
|
|
|
|
|
|
|
|
|
static bool_t npx_ex16;
|
|
|
|
|
static bool_t npx_exists;
|
|
|
|
|
static struct gate_descriptor npx_idt_probeintr;
|
|
|
|
|
static int npx_intrno;
|
|
|
|
|
static volatile u_int npx_intrs_while_probing;
|
|
|
|
|
static bool_t npx_irq13;
|
|
|
|
|
static volatile u_int npx_traps_while_probing;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Special interrupt handlers. Someday intr0-intr15 will be used to count
|
|
|
|
|
* interrupts. We'll still need a special exception 16 handler. The busy
|
1995-01-03 04:00:06 +00:00
|
|
|
* latch stuff in probeintr() can be moved to npxprobe().
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
1994-11-14 14:59:06 +00:00
|
|
|
inthand_t probeintr;
|
1993-06-12 14:58:17 +00:00
|
|
|
asm
|
|
|
|
|
("
|
|
|
|
|
.text
|
|
|
|
|
_probeintr:
|
|
|
|
|
ss
|
|
|
|
|
incl _npx_intrs_while_probing
|
|
|
|
|
pushl %eax
|
1993-11-03 23:32:35 +00:00
|
|
|
movb $0x20,%al # EOI (asm in strings loses cpp features)
|
|
|
|
|
outb %al,$0xa0 # IO_ICU2
|
1995-01-03 04:00:06 +00:00
|
|
|
outb %al,$0x20 # IO_ICU1
|
1993-06-12 14:58:17 +00:00
|
|
|
movb $0,%al
|
1993-11-03 23:32:35 +00:00
|
|
|
outb %al,$0xf0 # clear BUSY# latch
|
1993-06-12 14:58:17 +00:00
|
|
|
popl %eax
|
|
|
|
|
iret
|
|
|
|
|
");
|
|
|
|
|
|
1994-11-14 14:59:06 +00:00
|
|
|
inthand_t probetrap;
|
1993-06-12 14:58:17 +00:00
|
|
|
asm
|
|
|
|
|
("
|
|
|
|
|
.text
|
|
|
|
|
_probetrap:
|
|
|
|
|
ss
|
|
|
|
|
incl _npx_traps_while_probing
|
|
|
|
|
fnclex
|
|
|
|
|
iret
|
|
|
|
|
");
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Probe routine. Initialize cr0 to give correct behaviour for [f]wait
|
|
|
|
|
* whether the device exists or not (XXX should be elsewhere). Set flags
|
|
|
|
|
* to tell npxattach() what to do. Modify device struct if npx doesn't
|
|
|
|
|
* need to use interrupts. Return 1 if device exists.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
npxprobe(dvp)
|
|
|
|
|
struct isa_device *dvp;
|
|
|
|
|
{
|
|
|
|
|
int result;
|
|
|
|
|
u_long save_eflags;
|
|
|
|
|
u_char save_icu1_mask;
|
|
|
|
|
u_char save_icu2_mask;
|
|
|
|
|
struct gate_descriptor save_idt_npxintr;
|
|
|
|
|
struct gate_descriptor save_idt_npxtrap;
|
|
|
|
|
/*
|
|
|
|
|
* This routine is now just a wrapper for npxprobe1(), to install
|
|
|
|
|
* special npx interrupt and trap handlers, to enable npx interrupts
|
|
|
|
|
* and to disable other interrupts. Someday isa_configure() will
|
|
|
|
|
* install suitable handlers and run with interrupts enabled so we
|
|
|
|
|
* won't need to do so much here.
|
|
|
|
|
*/
|
|
|
|
|
npx_intrno = NRSVIDT + ffs(dvp->id_irq) - 1;
|
|
|
|
|
save_eflags = read_eflags();
|
|
|
|
|
disable_intr();
|
|
|
|
|
save_icu1_mask = inb(IO_ICU1 + 1);
|
|
|
|
|
save_icu2_mask = inb(IO_ICU2 + 1);
|
|
|
|
|
save_idt_npxintr = idt[npx_intrno];
|
|
|
|
|
save_idt_npxtrap = idt[16];
|
|
|
|
|
outb(IO_ICU1 + 1, ~(IRQ_SLAVE | dvp->id_irq));
|
|
|
|
|
outb(IO_ICU2 + 1, ~(dvp->id_irq >> 8));
|
1995-12-19 14:30:50 +00:00
|
|
|
setidt(16, probetrap, SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
|
|
|
|
|
setidt(npx_intrno, probeintr, SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
|
1993-06-12 14:58:17 +00:00
|
|
|
npx_idt_probeintr = idt[npx_intrno];
|
|
|
|
|
enable_intr();
|
|
|
|
|
result = npxprobe1(dvp);
|
|
|
|
|
disable_intr();
|
|
|
|
|
outb(IO_ICU1 + 1, save_icu1_mask);
|
|
|
|
|
outb(IO_ICU2 + 1, save_icu2_mask);
|
|
|
|
|
idt[npx_intrno] = save_idt_npxintr;
|
|
|
|
|
idt[16] = save_idt_npxtrap;
|
|
|
|
|
write_eflags(save_eflags);
|
|
|
|
|
return (result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
npxprobe1(dvp)
|
|
|
|
|
struct isa_device *dvp;
|
|
|
|
|
{
|
1995-01-03 04:00:06 +00:00
|
|
|
u_short control;
|
|
|
|
|
u_short status;
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
|
|
|
|
* Partially reset the coprocessor, if any. Some BIOS's don't reset
|
|
|
|
|
* it after a warm boot.
|
|
|
|
|
*/
|
|
|
|
|
outb(0xf1, 0); /* full reset on some systems, NOP on others */
|
|
|
|
|
outb(0xf0, 0); /* clear BUSY# latch */
|
|
|
|
|
/*
|
|
|
|
|
* Prepare to trap all ESC (i.e., NPX) instructions and all WAIT
|
|
|
|
|
* instructions. We must set the CR0_MP bit and use the CR0_TS
|
|
|
|
|
* bit to control the trap, because setting the CR0_EM bit does
|
|
|
|
|
* not cause WAIT instructions to trap. It's important to trap
|
|
|
|
|
* WAIT instructions - otherwise the "wait" variants of no-wait
|
|
|
|
|
* control instructions would degenerate to the "no-wait" variants
|
|
|
|
|
* after FP context switches but work correctly otherwise. It's
|
|
|
|
|
* particularly important to trap WAITs when there is no NPX -
|
|
|
|
|
* otherwise the "wait" variants would always degenerate.
|
|
|
|
|
*
|
|
|
|
|
* Try setting CR0_NE to get correct error reporting on 486DX's.
|
|
|
|
|
* Setting it should fail or do nothing on lesser processors.
|
|
|
|
|
*/
|
|
|
|
|
load_cr0(rcr0() | CR0_MP | CR0_NE);
|
|
|
|
|
/*
|
|
|
|
|
* But don't trap while we're probing.
|
|
|
|
|
*/
|
|
|
|
|
stop_emulating();
|
|
|
|
|
/*
|
|
|
|
|
* Finish resetting the coprocessor, if any. If there is an error
|
|
|
|
|
* pending, then we may get a bogus IRQ13, but probeintr() will handle
|
|
|
|
|
* it OK. Bogus halts have never been observed, but we enabled
|
|
|
|
|
* IRQ13 and cleared the BUSY# latch early to handle them anyway.
|
|
|
|
|
*/
|
|
|
|
|
fninit();
|
1995-02-23 17:32:38 +00:00
|
|
|
/*
|
|
|
|
|
* Don't use fwait here because it might hang.
|
|
|
|
|
* Don't use fnop here because it usually hangs if there is no FPU.
|
|
|
|
|
*/
|
1995-01-03 04:00:06 +00:00
|
|
|
DELAY(1000); /* wait for any IRQ13 */
|
1993-06-12 14:58:17 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
|
if (npx_intrs_while_probing != 0)
|
|
|
|
|
printf("fninit caused %u bogus npx interrupt(s)\n",
|
|
|
|
|
npx_intrs_while_probing);
|
|
|
|
|
if (npx_traps_while_probing != 0)
|
|
|
|
|
printf("fninit caused %u bogus npx trap(s)\n",
|
|
|
|
|
npx_traps_while_probing);
|
|
|
|
|
#endif
|
|
|
|
|
/*
|
|
|
|
|
* Check for a status of mostly zero.
|
|
|
|
|
*/
|
|
|
|
|
status = 0x5a5a;
|
|
|
|
|
fnstsw(&status);
|
|
|
|
|
if ((status & 0xb8ff) == 0) {
|
|
|
|
|
/*
|
|
|
|
|
* Good, now check for a proper control word.
|
|
|
|
|
*/
|
1995-05-30 08:16:23 +00:00
|
|
|
control = 0x5a5a;
|
1993-06-12 14:58:17 +00:00
|
|
|
fnstcw(&control);
|
|
|
|
|
if ((control & 0x1f3f) == 0x033f) {
|
1994-09-09 23:13:03 +00:00
|
|
|
hw_float = npx_exists = 1;
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
|
|
|
|
* We have an npx, now divide by 0 to see if exception
|
|
|
|
|
* 16 works.
|
|
|
|
|
*/
|
|
|
|
|
control &= ~(1 << 2); /* enable divide by 0 trap */
|
|
|
|
|
fldcw(&control);
|
|
|
|
|
npx_traps_while_probing = npx_intrs_while_probing = 0;
|
|
|
|
|
fp_divide_by_0();
|
|
|
|
|
if (npx_traps_while_probing != 0) {
|
|
|
|
|
/*
|
|
|
|
|
* Good, exception 16 works.
|
|
|
|
|
*/
|
|
|
|
|
npx_ex16 = 1;
|
|
|
|
|
dvp->id_irq = 0; /* zap the interrupt */
|
|
|
|
|
/*
|
|
|
|
|
* special return value to flag that we do not
|
|
|
|
|
* actually use any I/O registers
|
|
|
|
|
*/
|
|
|
|
|
return (-1);
|
|
|
|
|
}
|
|
|
|
|
if (npx_intrs_while_probing != 0) {
|
|
|
|
|
/*
|
|
|
|
|
* Bad, we are stuck with IRQ13.
|
|
|
|
|
*/
|
|
|
|
|
npx_irq13 = 1;
|
1995-01-03 04:00:06 +00:00
|
|
|
/*
|
|
|
|
|
* npxattach would be too late to set npx0_imask.
|
|
|
|
|
*/
|
|
|
|
|
npx0_imask |= dvp->id_irq;
|
1993-06-12 14:58:17 +00:00
|
|
|
return (IO_NPXSIZE);
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
* Worse, even IRQ13 is broken. Use emulator.
|
|
|
|
|
*/
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/*
|
|
|
|
|
* Probe failed, but we want to get to npxattach to initialize the
|
|
|
|
|
* emulator and say that it has been installed. XXX handle devices
|
|
|
|
|
* that aren't really devices better.
|
|
|
|
|
*/
|
|
|
|
|
dvp->id_irq = 0;
|
ALL:
Removed patch kit headers and rcsid strings, add $Id$.
isa.c:
Removed old #ifdef notyet isa_configure code, since it will never be
used, and I have done 90% of what it attempted to.
Add conflict checking code that searchs back through the devtab's looking
for any device that has already been found that may conflict with what
we are about to probe. Checks are mode for I/O address, memory address,
IRQ, and DRQ. This should stop the screwing up of any device that has
alread been found by other device probes.
Print out messages when we are not going to probe a device due to
a conflict so the user knows WHY something was not found. For example:
aha0 not probed due to irq conflict with ahb0 at 11
Now print out a message when a device is not found so the user knows
that it was probed for, but could not be found. For example:
ed1 not found at 0x320
For devices that have I/O address < 0x100 say that they are on the
motherboard, not on isa! The 0x100 magic number is per ISA spec. It
may seem funny that pc0 and sc0 report as being on the motherboard, but
this is due to the fact that the I/O address used is that of the keyboard
controller which IS on the motherboard. We really need to split the
keyboard probe from the display probe. It is completly legal to build
a pc with out one or the other, or even with out both!
npx.c:
Return -1 from the probe routine if we are using the Emulator so
that the i/o addresses are not printed, this is the same trick used
for 486's.
Do not print the ``Errors reported via Exception 16'', and
``Errors reported via IRQ 13'' messages any more, since these just lead
to more user confusion that anything. It still prints the message
``Error reporting broken, using 387 emulator'' so that the person is
aware that there mother board is ill.
1993-10-13 15:59:30 +00:00
|
|
|
/*
|
|
|
|
|
* special return value to flag that we do not
|
|
|
|
|
* actually use any I/O registers
|
|
|
|
|
*/
|
|
|
|
|
return (-1);
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Attach routine - announce which it is, and wire into system
|
|
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
npxattach(dvp)
|
|
|
|
|
struct isa_device *dvp;
|
|
|
|
|
{
|
1996-11-11 20:39:03 +00:00
|
|
|
/* The caller has printed "irq 13" for the npx_irq13 case. */
|
|
|
|
|
if (!npx_irq13) {
|
|
|
|
|
printf("npx%d: ", dvp->id_unit);
|
|
|
|
|
if (npx_ex16)
|
|
|
|
|
printf("INT 16 interface\n");
|
1995-05-30 08:16:23 +00:00
|
|
|
#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE)
|
1996-11-11 20:39:03 +00:00
|
|
|
else if (npx_exists) {
|
|
|
|
|
printf("error reporting broken; using 387 emulator\n");
|
|
|
|
|
hw_float = npx_exists = 0;
|
|
|
|
|
} else
|
|
|
|
|
printf("387 emulator\n");
|
1995-01-03 04:00:06 +00:00
|
|
|
#else
|
1996-11-11 20:39:03 +00:00
|
|
|
else
|
|
|
|
|
printf("no 387 emulator in kernel!\n");
|
1995-01-03 04:00:06 +00:00
|
|
|
#endif
|
1996-11-11 20:39:03 +00:00
|
|
|
}
|
1993-06-12 14:58:17 +00:00
|
|
|
npxinit(__INITIAL_NPXCW__);
|
1996-11-11 20:39:03 +00:00
|
|
|
|
|
|
|
|
#ifdef I586_CPU
|
|
|
|
|
if (cpu_class == CPUCLASS_586 && npx_ex16) {
|
|
|
|
|
if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_BCOPY)) {
|
|
|
|
|
bcopy_vector = i586_bcopy;
|
|
|
|
|
ovbcopy_vector = i586_bcopy;
|
|
|
|
|
}
|
|
|
|
|
if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_BZERO))
|
|
|
|
|
bzero = i586_bzero;
|
|
|
|
|
if (!(dvp->id_flags & NPX_DISABLE_I586_OPTIMIZED_COPYIO)) {
|
|
|
|
|
copyin_vector = i586_copyin;
|
|
|
|
|
copyout_vector = i586_copyout;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1993-06-12 14:58:17 +00:00
|
|
|
return (1); /* XXX unused */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Initialize floating point unit.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
npxinit(control)
|
1995-01-03 04:00:06 +00:00
|
|
|
u_short control;
|
1993-06-12 14:58:17 +00:00
|
|
|
{
|
|
|
|
|
struct save87 dummy;
|
|
|
|
|
|
|
|
|
|
if (!npx_exists)
|
|
|
|
|
return;
|
|
|
|
|
/*
|
|
|
|
|
* fninit has the same h/w bugs as fnsave. Use the detoxified
|
1995-01-03 04:00:06 +00:00
|
|
|
* fnsave to throw away any junk in the fpu. npxsave() initializes
|
1993-06-12 14:58:17 +00:00
|
|
|
* the fpu and sets npxproc = NULL as important side effects.
|
|
|
|
|
*/
|
|
|
|
|
npxsave(&dummy);
|
|
|
|
|
stop_emulating();
|
|
|
|
|
fldcw(&control);
|
|
|
|
|
if (curpcb != NULL)
|
|
|
|
|
fnsave(&curpcb->pcb_savefpu);
|
|
|
|
|
start_emulating();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Free coprocessor (if we have it).
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
npxexit(p)
|
|
|
|
|
struct proc *p;
|
|
|
|
|
{
|
|
|
|
|
|
1994-11-14 14:59:06 +00:00
|
|
|
if (p == npxproc)
|
|
|
|
|
npxsave(&curpcb->pcb_savefpu);
|
1997-01-29 13:46:28 +00:00
|
|
|
#ifdef NPX_DEBUG
|
1994-11-14 14:59:06 +00:00
|
|
|
if (npx_exists) {
|
|
|
|
|
u_int masked_exceptions;
|
|
|
|
|
|
|
|
|
|
masked_exceptions = curpcb->pcb_savefpu.sv_env.en_cw
|
|
|
|
|
& curpcb->pcb_savefpu.sv_env.en_sw & 0x7f;
|
|
|
|
|
/*
|
1997-01-29 13:46:28 +00:00
|
|
|
* Log exceptions that would have trapped with the old
|
|
|
|
|
* control word (overflow, divide by 0, and invalid operand).
|
1994-11-14 14:59:06 +00:00
|
|
|
*/
|
|
|
|
|
if (masked_exceptions & 0x0d)
|
|
|
|
|
log(LOG_ERR,
|
|
|
|
|
"pid %d (%s) exited with masked floating point exceptions 0x%02x\n",
|
|
|
|
|
p->p_pid, p->p_comm, masked_exceptions);
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
1997-01-29 13:46:28 +00:00
|
|
|
#endif
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
1995-01-03 04:00:06 +00:00
|
|
|
* Preserve the FP status word, clear FP exceptions, then generate a SIGFPE.
|
|
|
|
|
*
|
|
|
|
|
* Clearing exceptions is necessary mainly to avoid IRQ13 bugs. We now
|
|
|
|
|
* depend on longjmp() restoring a usable state. Restoring the state
|
|
|
|
|
* or examining it might fail if we didn't clear exceptions.
|
|
|
|
|
*
|
|
|
|
|
* XXX there is no standard way to tell SIGFPE handlers about the error
|
|
|
|
|
* state. The old interface:
|
1993-06-12 14:58:17 +00:00
|
|
|
*
|
1995-01-03 04:00:06 +00:00
|
|
|
* void handler(int sig, int code, struct sigcontext *scp);
|
1993-06-12 14:58:17 +00:00
|
|
|
*
|
1995-01-03 04:00:06 +00:00
|
|
|
* is broken because it is non-ANSI and because the FP state is not in
|
|
|
|
|
* struct sigcontext.
|
|
|
|
|
*
|
|
|
|
|
* XXX the FP state is not preserved across signal handlers. So signal
|
|
|
|
|
* handlers cannot afford to do FP unless they preserve the state or
|
|
|
|
|
* longjmp() out. Both preserving the state and longjmp()ing may be
|
|
|
|
|
* destroyed by IRQ13 bugs. Clearing FP exceptions is not an acceptable
|
|
|
|
|
* solution for signals other than SIGFPE.
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
|
|
|
|
void
|
1995-09-19 18:55:37 +00:00
|
|
|
npxintr(unit)
|
|
|
|
|
int unit;
|
1993-06-12 14:58:17 +00:00
|
|
|
{
|
|
|
|
|
int code;
|
1995-09-19 18:55:37 +00:00
|
|
|
struct intrframe *frame;
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
if (npxproc == NULL || !npx_exists) {
|
1995-01-03 04:00:06 +00:00
|
|
|
printf("npxintr: npxproc = %p, curproc = %p, npx_exists = %d\n",
|
|
|
|
|
npxproc, curproc, npx_exists);
|
1993-06-12 14:58:17 +00:00
|
|
|
panic("npxintr from nowhere");
|
|
|
|
|
}
|
|
|
|
|
if (npxproc != curproc) {
|
1995-01-03 04:00:06 +00:00
|
|
|
printf("npxintr: npxproc = %p, curproc = %p, npx_exists = %d\n",
|
|
|
|
|
npxproc, curproc, npx_exists);
|
1993-06-12 14:58:17 +00:00
|
|
|
panic("npxintr from non-current process");
|
|
|
|
|
}
|
1995-01-03 04:00:06 +00:00
|
|
|
|
1995-02-17 19:38:13 +00:00
|
|
|
outb(0xf0, 0);
|
1995-01-03 04:00:06 +00:00
|
|
|
fnstsw(&curpcb->pcb_savefpu.sv_ex_sw);
|
|
|
|
|
fnclex();
|
1995-02-17 19:38:13 +00:00
|
|
|
fnop();
|
1993-06-12 14:58:17 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Pass exception to process.
|
|
|
|
|
*/
|
1995-09-19 18:55:37 +00:00
|
|
|
frame = (struct intrframe *)&unit; /* XXX */
|
|
|
|
|
if (ISPL(frame->if_cs) == SEL_UPL) {
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
|
|
|
|
* Interrupt is essentially a trap, so we can afford to call
|
|
|
|
|
* the SIGFPE handler (if any) as soon as the interrupt
|
|
|
|
|
* returns.
|
|
|
|
|
*
|
|
|
|
|
* XXX little or nothing is gained from this, and plenty is
|
|
|
|
|
* lost - the interrupt frame has to contain the trap frame
|
|
|
|
|
* (this is otherwise only necessary for the rescheduling trap
|
|
|
|
|
* in doreti, and the frame for that could easily be set up
|
|
|
|
|
* just before it is used).
|
|
|
|
|
*/
|
1995-09-19 18:55:37 +00:00
|
|
|
curproc->p_md.md_regs = &frame->if_es;
|
1993-06-12 14:58:17 +00:00
|
|
|
#ifdef notyet
|
|
|
|
|
/*
|
|
|
|
|
* Encode the appropriate code for detailed information on
|
|
|
|
|
* this exception.
|
|
|
|
|
*/
|
|
|
|
|
code = XXX_ENCODE(curpcb->pcb_savefpu.sv_ex_sw);
|
|
|
|
|
#else
|
|
|
|
|
code = 0; /* XXX */
|
|
|
|
|
#endif
|
|
|
|
|
trapsignal(curproc, SIGFPE, code);
|
|
|
|
|
} else {
|
|
|
|
|
/*
|
|
|
|
|
* Nested interrupt. These losers occur when:
|
|
|
|
|
* o an IRQ13 is bogusly generated at a bogus time, e.g.:
|
|
|
|
|
* o immediately after an fnsave or frstor of an
|
|
|
|
|
* error state.
|
|
|
|
|
* o a couple of 386 instructions after
|
|
|
|
|
* "fstpl _memvar" causes a stack overflow.
|
|
|
|
|
* These are especially nasty when combined with a
|
|
|
|
|
* trace trap.
|
|
|
|
|
* o an IRQ13 occurs at the same time as another higher-
|
|
|
|
|
* priority interrupt.
|
|
|
|
|
*
|
|
|
|
|
* Treat them like a true async interrupt.
|
|
|
|
|
*/
|
1995-01-03 04:00:06 +00:00
|
|
|
psignal(curproc, SIGFPE);
|
1993-06-12 14:58:17 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Implement device not available (DNA) exception
|
|
|
|
|
*
|
1995-01-03 04:00:06 +00:00
|
|
|
* It would be better to switch FP context here (if curproc != npxproc)
|
|
|
|
|
* and not necessarily for every context switch, but it is too hard to
|
|
|
|
|
* access foreign pcb's.
|
1993-06-12 14:58:17 +00:00
|
|
|
*/
|
|
|
|
|
int
|
|
|
|
|
npxdna()
|
|
|
|
|
{
|
|
|
|
|
if (!npx_exists)
|
|
|
|
|
return (0);
|
|
|
|
|
if (npxproc != NULL) {
|
1995-01-03 04:00:06 +00:00
|
|
|
printf("npxdna: npxproc = %p, curproc = %p\n",
|
|
|
|
|
npxproc, curproc);
|
1993-06-12 14:58:17 +00:00
|
|
|
panic("npxdna");
|
|
|
|
|
}
|
|
|
|
|
stop_emulating();
|
|
|
|
|
/*
|
|
|
|
|
* Record new context early in case frstor causes an IRQ13.
|
|
|
|
|
*/
|
|
|
|
|
npxproc = curproc;
|
1995-01-03 04:00:06 +00:00
|
|
|
curpcb->pcb_savefpu.sv_ex_sw = 0;
|
1993-06-12 14:58:17 +00:00
|
|
|
/*
|
|
|
|
|
* The following frstor may cause an IRQ13 when the state being
|
|
|
|
|
* restored has a pending error. The error will appear to have been
|
|
|
|
|
* triggered by the current (npx) user instruction even when that
|
|
|
|
|
* instruction is a no-wait instruction that should not trigger an
|
|
|
|
|
* error (e.g., fnclex). On at least one 486 system all of the
|
|
|
|
|
* no-wait instructions are broken the same as frstor, so our
|
|
|
|
|
* treatment does not amplify the breakage. On at least one
|
|
|
|
|
* 386/Cyrix 387 system, fnclex works correctly while frstor and
|
|
|
|
|
* fnsave are broken, so our treatment breaks fnclex if it is the
|
|
|
|
|
* first FPU instruction after a context switch.
|
|
|
|
|
*/
|
|
|
|
|
frstor(&curpcb->pcb_savefpu);
|
|
|
|
|
|
|
|
|
|
return (1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Wrapper for fnsave instruction to handle h/w bugs. If there is an error
|
|
|
|
|
* pending, then fnsave generates a bogus IRQ13 on some systems. Force
|
|
|
|
|
* any IRQ13 to be handled immediately, and then ignore it. This routine is
|
|
|
|
|
* often called at splhigh so it must not use many system services. In
|
|
|
|
|
* particular, it's much easier to install a special handler than to
|
|
|
|
|
* guarantee that it's safe to use npxintr() and its supporting code.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
npxsave(addr)
|
|
|
|
|
struct save87 *addr;
|
|
|
|
|
{
|
|
|
|
|
u_char icu1_mask;
|
|
|
|
|
u_char icu2_mask;
|
|
|
|
|
u_char old_icu1_mask;
|
|
|
|
|
u_char old_icu2_mask;
|
|
|
|
|
struct gate_descriptor save_idt_npxintr;
|
|
|
|
|
|
|
|
|
|
disable_intr();
|
|
|
|
|
old_icu1_mask = inb(IO_ICU1 + 1);
|
|
|
|
|
old_icu2_mask = inb(IO_ICU2 + 1);
|
|
|
|
|
save_idt_npxintr = idt[npx_intrno];
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
outb(IO_ICU1 + 1, old_icu1_mask & ~(IRQ_SLAVE | npx0_imask));
|
|
|
|
|
outb(IO_ICU2 + 1, old_icu2_mask & ~(npx0_imask >> 8));
|
1993-06-12 14:58:17 +00:00
|
|
|
idt[npx_intrno] = npx_idt_probeintr;
|
|
|
|
|
enable_intr();
|
|
|
|
|
stop_emulating();
|
|
|
|
|
fnsave(addr);
|
1995-01-03 04:00:06 +00:00
|
|
|
fnop();
|
1993-06-12 14:58:17 +00:00
|
|
|
start_emulating();
|
|
|
|
|
npxproc = NULL;
|
|
|
|
|
disable_intr();
|
|
|
|
|
icu1_mask = inb(IO_ICU1 + 1); /* masks may have changed */
|
|
|
|
|
icu2_mask = inb(IO_ICU2 + 1);
|
|
|
|
|
outb(IO_ICU1 + 1,
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
(icu1_mask & ~npx0_imask) | (old_icu1_mask & npx0_imask));
|
1993-06-12 14:58:17 +00:00
|
|
|
outb(IO_ICU2 + 1,
|
New interrupt code from Bruce Evans. In additional to Bruce's attached
list of changes, I've made the following additional changes:
1) i386/include/ipl.h renamed to spl.h as the name conflicts with the
file of the same name in i386/isa/ipl.h.
2) changed all use of *mask (i.e. netmask, biomask, ttymask, etc) to
*_imask (net_imask, etc).
3) changed vestige of splnet use in if_is to splimp.
4) got rid of "impmask" completely (Bruce had gotten rid of netmask),
and are now using net_imask instead.
5) dozens of minor cruft to glue in Bruce's changes.
These require changes I made to config(8) as well, and thus it must
be rebuilt.
-DG
from Bruce Evans:
sio:
o No diff is supplied. Remove the define of setsofttty(). I hope
that is enough.
*.s:
o i386/isa/debug.h no longer exists. The event counters became too
much trouble to maintain. All function call entry and exception
entry counters can be recovered by using profiling kernel (the new
profiling supports all entry points; however, it is too slow to
leave enabled all the time; it also). Only BDBTRAP() from debug.h
is now used. That is moved to exception.s. It might be worth
preserving SHOW_BITS() and calling it from _mcount() (if enabled).
o T_ASTFLT is now only set just before calling trap().
o All exception handlers set SWI_AST_MASK in cpl as soon as possible
after entry and arrange for _doreti to restore it atomically with
exiting. It is not possible to set it atomically with entering
the kernel, so it must be checked against the user mode bits in
the trap frame before committing to using it. There is no place
to store the old value of cpl for syscalls or traps, so there are
some complications restoring it.
Profiling stuff (mostly in *.s):
o Changes to kern/subr_mcount.c, gcc and gprof are not supplied yet.
o All interesting labels `foo' are renamed `_foo' and all
uninteresting labels `_bar' are renamed `bar'. A small change
to gprof allows ignoring labels not starting with underscores.
o MCOUNT_LABEL() is to provide names for counters for times spent
in exception handlers.
o FAKE_MCOUNT() is a version of MCOUNT() suitable for exception
handlers. Its arg is the pc where the exception occurred. The
new mcount() pretends that this was a call from that pc to a
suitable MCOUNT_LABEL().
o MEXITCOUNT is to turn off any timer started by MCOUNT().
/usr/src/sys/i386/i386/exception.s:
o The non-BDB BPTTRAP() macros were doing a sti even when interrupts
were disabled when the trap occurred. The sti (fixed) sti is
actually a no-op unless you have my changes to machdep.c that make
the debugger trap gates interrupt gates, but fixing that would
make the ifdefs messier. ddb seems to be unharmed by both
interrupts always disabled and always enabled (I had the branch in
the fix back to front for some time :-().
o There is no known pushal bug.
o tf_err can be left as garbage for syscalls.
/usr/src/sys/i386/i386/locore.s:
o Fix and update BDE_DEBUGGER support.
o ENTRY(btext) before initialization was dangerous.
o Warm boot shot was longer than intended.
/usr/src/sys/i386/i386/machdep.c:
o DON'T APPLY ALL OF THIS DIFF. It's what I'm using, but may require
other changes.
Use the following:
o Remove aston() and setsoftclock().
Maybe use the following:
o No netisr.h.
o Spelling fix.
o Delay to read the Rebooting message.
o Fix for vm system unmapping a reduced area of memory
after bounds_check_with_label() reduces the size of
a physical i/o for a partition boundary. A similar
fix is required in kern_physio.c.
o Correct use of __CONCAT. It never worked here for non-
ANSI cpp's. Is it time to drop support for non-ANSI?
o gdt_segs init. 0xffffffffUL is bogus because ssd_limit
is not 32 bits. The replacement may have the same
value :-), but is more natural.
o physmem was one page too low. Confusing variable names.
Don't use the following:
o Better numbers of buffers. Each 8K page requires up to
16 buffer headers. On my system, this results in 5576
buffers containing [up to] 2854912 bytes of memory.
The usual allocation of about 384 buffers only holds
192K of disk if you use it on an fs with a block size
of 512.
o gdt changes for bdb.
o *TGT -> *IDT changes for bdb.
o #ifdefed changes for bdb.
/usr/src/sys/i386/i386/microtime.s:
o Use the correct asm macros. I think asm.h was copied from Mach
just for microtime and isn't used now. It certainly doesn't
belong in <sys>. Various macros are also duplicated in
sys/i386/boot.h and libc/i386/*.h.
o Don't switch to and from the IRR; it is guaranteed to be selected
(default after ICU init and explicitly selected in isa.c too, and
never changed until the old microtime clobbered it).
/usr/src/sys/i386/i386/support.s:
o Non-essential changes (none related to spls or profiling).
o Removed slow loads of %gs again. The LDT support may require
not relying on %gs, but loading it is not the way to fix it!
Some places (copyin ...) forgot to load it. Loading it clobbers
the user %gs. trap() still loads it after certain types of
faults so that fuword() etc can rely on it without loading it
explicitly. Exception handlers don't restore it. If we want
to preserve the user %gs, then the fastest method is to not
touch it except for context switches. Comparing with
VM_MAXUSER_ADDRESS and branching takes only 2 or 4 cycles on
a 486, while loading %gs takes 9 cycles and using it takes
another.
o Fixed a signed branch to unsigned.
/usr/src/sys/i386/i386/swtch.s:
o Move spl0() outside of idle loop.
o Remove cli/sti from idle loop. sw1 does a cli, and in the
unlikely event of an interrupt occurring and whichqs becoming
zero, sw1 will just jump back to _idle.
o There's no spl0() function in asm any more, so use splz().
o swtch() doesn't need to be superaligned, at least with the
new mcounting.
o Fixed a signed branch to unsigned.
o Removed astoff().
/usr/src/sys/i386/i386/trap.c:
o The decentralized extern decls were inconsistent, of course.
o Fixed typo MATH_EMULTATE in comments. */
o Removed unused variables.
o Old netmask is now impmask; print it instead. Perhaps we
should print some of the new masks.
o BTW, trap() should not print anything for normal debugger
traps.
/usr/src/sys/i386/include/asmacros.h:
o DON'T APPLY ALL OF THIS DIFF. Just use some of the null macros
as necessary.
/usr/src/sys/i386/include/cpu.h:
o CLKF_BASEPRI() changes since cpl == SWI_AST_MASK is now normal
while the kernel is running.
o Don't use var++ to set boolean variables. It fails after a mere
4G times :-) and is slower than storing a constant on [3-4]86s.
/usr/src/sys/i386/include/cpufunc.h:
o DON'T APPLY ALL OF THIS DIFF. You need mainly the include of
<machine/ipl.h>. Unfortunately, <machine/ipl.h> is needed by
almost everything for the inlines.
/usr/src/sys/i386/include/ipl.h:
o New file. Defines spl inlines and SWI macros and declares most
variables related to hard and soft interrupt masks.
/usr/src/sys/i386/isa/icu.h:
o Moved definitions to <machine/ipl.h>
/usr/src/sys/i386/isa/icu.s:
o Software interrupts (SWIs) and delayed hardware interrupts (HWIs)
are now handled uniformally, and dispatching them from splx() is
more like dispatching them from _doreti. The dispatcher is
essentially *(handler[ffs(ipending & ~cpl)]().
o More care (not quite enough) is taken to avoid unbounded nesting
of interrupts.
o The interface to softclock() is changed so that a trap frame is
not required.
o Fast interrupt handlers are now handled more uniformally.
Configuration is still too early (new handlers would require
bits in <machine/ipl.h> and functions to vector.s).
o splnnn() and splx() are no longer here; they are inline functions
(could be macros for other compilers). splz() is the nontrivial
part of the old splx().
/usr/src/sys/i386/isa/ipl.h
o New file. Supposed to have only bus-dependent stuff. Perhaps
the h/w masks should be declared here.
/usr/src/sys/i386/isa/isa.c:
o DON'T APPLY ALL OF THIS DIFF. You need only things involving
*mask and *MASK and comments about them. netmask is now a pure
software mask. It works like the softclock mask.
/usr/src/sys/i386/isa/vector.s:
o Reorganize AUTO_EOI* macros.
o Option FAST_INTR_HANDLER_USERS_ES for people who don't trust
fastintr handlers.
o fastintr handlers need to metamorphose into ordinary interrupt
handlers if their SWI bit has become set. Previously, sio had
unintended latency for handling output completions and input
of SLIP framing characters because this was not done.
/usr/src/sys/net/netisr.h:
o The machine-dependent stuff is now imported from <machine/ipl.h>.
/usr/src/sys/sys/systm.h
o DON'T APPLY ALL OF THIS DIFF. You need mainly the different
splx() prototype. The spl*() prototypes are duplicated as
inlines in <machine/ipl.h> but they need to be duplicated here
in case there are no inlines. I sent systm.h and cpufunc.h
to Garrett. We agree that spl0 should be replaced by splnone
and not the other way around like I've done.
/usr/src/sys/kern/kern_clock.c
o splsoftclock() now lowers cpl so the direct call to softclock()
works as intended.
o softclock() interface changed to avoid passing the whole frame
(some machines may need another change for profile_tick()).
o profiling renamed _profiling to avoid ANSI namespace pollution.
(I had to improve the mcount() interface and may as well fix it.)
The GUPROF variant doesn't actually reference profiling here,
but the 'U' in GUPROF should mean to select the microtimer
mcount() and not change the interface.
1994-04-02 07:00:53 +00:00
|
|
|
(icu2_mask & ~(npx0_imask >> 8))
|
|
|
|
|
| (old_icu2_mask & (npx0_imask >> 8)));
|
1993-06-12 14:58:17 +00:00
|
|
|
idt[npx_intrno] = save_idt_npxintr;
|
|
|
|
|
enable_intr(); /* back to usual state */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* NNPX > 0 */
|
