[src/netbsd-1-6]: src/sys/arch/sparc/sparc Pull up revision 1.20 (requested b...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aac41b08b4a2
branches:  netbsd-1-6
changeset: 528071:aac41b08b4a2
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jun 24 11:53:41 2002 +0000

description:
Pull up revision 1.20 (requested by pk in ticket #357),
and revision 1.19 (requested by me, to make the former cleaner):

    revision 1.21
        `fdcio_intrcnt.ev_count' is a 64-bit variable.
    revision 1.20
        Use C-style comments in a few places where ' appears in the comment,
        so that this works with GCC 2.95.3's ISO C preprocessor.

diffstat:

 sys/arch/sparc/sparc/bsd_fdintr.s |  23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r f1a93ce64696 -r aac41b08b4a2 sys/arch/sparc/sparc/bsd_fdintr.s
--- a/sys/arch/sparc/sparc/bsd_fdintr.s Mon Jun 24 11:15:22 2002 +0000
+++ b/sys/arch/sparc/sparc/bsd_fdintr.s Mon Jun 24 11:53:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsd_fdintr.s,v 1.19 2001/03/15 03:01:40 mrg Exp $ */
+/*     $NetBSD: bsd_fdintr.s,v 1.19.18.1 2002/06/24 11:53:41 lukem Exp $ */
 
 /*
  * Copyright (c) 1995 Paul Kranenburg
@@ -143,7 +143,7 @@
 #define R_stat %l3
 #define R_nstat        %l4
 #define R_stcnt        %l5
-/* use %l6 and %l7 as short term temporaries */
+/* use %l6 and %l7 as short-term temporaries */
 
 
        .seg    "data"
@@ -167,7 +167,7 @@
        std     %l0, [%l7]
        st      %l2, [%l7 + 8]
 
-       ! tally interrupt
+       ! tally interrupt (uvmexp.intrs++)
        sethi   %hi(_C_LABEL(uvmexp)+V_INTR), %l7
        ld      [%l7 + %lo(_C_LABEL(uvmexp)+V_INTR)], %l6
        inc     %l6
@@ -177,14 +177,17 @@
        sethi   %hi(_C_LABEL(fdciop)), %l7
        ld      [%l7 + %lo(_C_LABEL(fdciop))], R_fdc
 
-       ! tally interrupt
-       ld      [R_fdc + FDC_EVCNT], %l6
-       inc     %l6
-       st      %l6, [R_fdc + FDC_EVCNT]
+       ! tally interrupt (fdcio_intrcnt.ev_count++)
+       ldd     [R_fdc + FDC_EVCNT], %l6
+       addcc   %l7, 1, %l7
+       addx    %l6, 0, %l6
+       std     %l6, [R_fdc + FDC_EVCNT]
 
-       ! load chips register addresses
-       ! NOTE: we ignore the bus tag here and assume the bus handle
-       !       is the virtual address of the chip's registers.
+       /*
+        * load chips register addresses
+        * NOTE: we ignore the bus tag here and assume the bus handle
+        *       is the virtual address of the chip's registers.
+        */
        ld      [R_fdc + FDC_REG_HANDLE], %l7   ! get chip registers bus handle
        ld      [R_fdc + FDC_REG_MSR], R_msr    ! get chip MSR reg addr
        add     R_msr, %l7, R_msr