diff options
| author |   art <art@openbsd.org> | 1999-02-26 04:20:40 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 1999-02-26 04:20:40 +0000 |
| commit | f0bbed07f96a426398c9cff9e7b7f7c27c5d0c8f (patch) | |
| tree | 67bd47fef29ed0a24098062fa3fca56c0d18f0fc | |
| parent | typedefs for {v,p}addr_t and {v,p}size_t needed by uvm. (diff) | |
| download | wireguard-openbsd-f0bbed07f96a426398c9cff9e7b7f7c27c5d0c8f.tar.xz wireguard-openbsd-f0bbed07f96a426398c9cff9e7b7f7c27c5d0c8f.zip | |
cnt.foo -> uvmexp.bar in uvm
| -rw-r--r-- | sys/arch/i386/isa/npx.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/isa/vector.s | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c index a3b1966553c..abde355e2a3 100644 --- a/sys/arch/i386/isa/npx.c +++ b/sys/arch/i386/isa/npx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: npx.c,v 1.15 1998/02/22 22:06:11 niklas Exp $ */ +/* $OpenBSD: npx.c,v 1.16 1999/02/26 04:20:40 art Exp $ */ /* $NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $ */ #if 0 @@ -53,6 +53,11 @@ #include <sys/ioctl.h> #include <sys/device.h> +#if defined(UVM) +#include <vm/vm.h> +#include <uvm/uvm_extern.h> +#endif + #include <machine/cpu.h> #include <machine/intr.h> #include <machine/pio.h> @@ -378,7 +383,11 @@ npxintr(arg) int code; union sigval sv; +#if defined(UVM) + uvmexp.traps++; +#else cnt.v_trap++; +#endif iprintf(("Intr")); if (p == 0 || npx_type == NPX_NONE) { diff --git a/sys/arch/i386/isa/vector.s b/sys/arch/i386/isa/vector.s index 225f0a62a32..0305ea09e32 100644 --- a/sys/arch/i386/isa/vector.s +++ b/sys/arch/i386/isa/vector.s @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.s,v 1.9 1999/01/13 07:26:01 niklas Exp $ */ +/* $OpenBSD: vector.s,v 1.10 1999/02/26 04:22:03 art Exp $ */ /* $NetBSD: vector.s,v 1.32 1996/01/07 21:29:47 mycroft Exp $ */ /* @@ -35,6 +35,12 @@ #define ICU_HARDWARE_MASK +#if defined(UVM) +#define MY_COUNT _C_LABEL(uvmexp) +#else +#define MY_COUNT _cnt +#endif + /* * These macros are fairly self explanatory. If ICU_SPECIAL_MASK_MODE is * defined, we try to take advantage of the ICU's `special mask mode' by only @@ -161,7 +167,7 @@ IDTVEC(fast/**/irq_num) ;\ call IH_FUN(%eax) ;\ ack(irq_num) ;\ addl $4,%esp ;\ - incl _cnt+V_INTR /* statistical info */ ;\ + incl MY_COUNT+V_INTR /* statistical info */ ;\ popl %es ;\ popl %ds ;\ popl %edx ;\ @@ -215,7 +221,7 @@ _Xintr/**/irq_num/**/: ;\ MAKE_FRAME ;\ MASK(irq_num, icu) /* mask it in hardware */ ;\ ack(irq_num) /* and allow other intrs */ ;\ - incl _cnt+V_INTR /* statistical info */ ;\ + incl MY_COUNT+V_INTR /* statistical info */ ;\ testb $IRQ_BIT(irq_num),_cpl + IRQ_BYTE(irq_num) ;\ jnz _Xhold/**/irq_num /* currently masked; hold it */ ;\ _Xresume/**/irq_num/**/: ;\ |