summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2010-12-20 00:25:23 +0000
committermatt <matt@NetBSD.org>2010-12-20 00:25:23 +0000
commitccde4787f75aaa1cfd08164e471c6a54740e88f3 (patch)
tree05ddb38a6627c014af25f39296ad10f973e97789 /sys/arch/atari/dev
parent11a6824ebfdfb8ae0e6d826b797e4305a4f25d2f (diff)
Move counting of faults, traps, intrs, soft[intr]s, syscalls, and nswtch
from uvmexp to per-cpu cpu_data and move them to 64bits. Remove unneeded includes of <uvm/uvm_extern.h> and/or <uvm/uvm.h>.
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/hdfd_intr.s16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/atari/dev/hdfd_intr.s b/sys/arch/atari/dev/hdfd_intr.s
index de8419358b2..fe4953bad9a 100644
--- a/sys/arch/atari/dev/hdfd_intr.s
+++ b/sys/arch/atari/dev/hdfd_intr.s
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd_intr.s,v 1.9 2009/10/20 19:10:10 snj Exp $
+/* $NetBSD: hdfd_intr.s,v 1.10 2010/12/20 00:25:30 matt Exp $
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -48,7 +48,7 @@
ENTRY_NOPROFILE(mfp_hdfd_nf)
addql #1,nintr | add another interrupt
- moveml %d0-%d1/%a0-%a1,%sp@- | Save scratch registers
+ INTERRUPT_SAVEREG | Save scratch registers
movl _C_LABEL(fdio_addr),%a0 | Get base of fdc registers
movb %a0@(fdsts),%d0 | Get fdsts
btst #5,%d0 | DMA active?
@@ -65,7 +65,7 @@ hdfd_rd_nf:
subql #1, _C_LABEL(fddmalen) | decrement bytecount
movl %a1,_C_LABEL(fddmaaddr) | update DMA pointer
| addql #1,_cnt+V_INTR | chalk up another interrupt
- moveml %sp@+,%d0-%d1/%a0-%a1
+ INTERRUPT_RESTOREREG
rte
hdfd_wrt_nf:
movb %a1@+,%a0@(fddata) | Push a byte
@@ -77,7 +77,7 @@ hdfd_wrt_nf:
ENTRY_NOPROFILE(mfp_hdfd_fifo)
addql #1,_C_LABEL(intrcnt_user)+88 | add another interrupt
- moveml %d0-%d1/%a0-%a1,%sp@- | Save scratch registers
+ INTERRUPT_SAVEREG | Save scratch registers
movl _C_LABEL(fdio_addr),%a0 | Get base of fdc registers
movb %a0@(fdsts),%d0 | Get fdsts
btst #5,%d0 | DMA active?
@@ -119,8 +119,8 @@ hdfdc1:
* seems wrong....
*/
hdfdc_xit:
- addql #1,_C_LABEL(uvmexp)+UVMEXP_INTRS
- moveml %sp@+,%d0-%d1/%a0-%a1
+ CPUINFO_INCREMENT(CI_NINTR)
+ INTERRUPT_RESTOREREG
rte
/*
@@ -133,9 +133,9 @@ hdfdc_norm:
movl nintr,%d0
clrl nintr
addl %d0, _C_LABEL(intrcnt_user)+88 | add another interrupt
- addl %d0,_C_LABEL(uvmexp)+UVMEXP_INTRS
+ CPUINFO_ADD(CI_NINTR, %d0)
0: jbsr _C_LABEL(fdc_ctrl_intr) | handle interrupt
- moveml %sp@+,%d0-%d1/%a0-%a1 | and saved registers
+ INTERRUPT_RESTOREREG | and saved registers
jra _ASM_LABEL(rei)
.data