Print this page
de-linting of .s files

@@ -33,13 +33,11 @@
 #include <sys/clock.h>
 #include <sys/asi.h>
 #include <sys/fsr.h>
 #include <sys/privregs.h>
 
-#if !defined(lint)
 #include "assym.h"
-#endif  /* lint */
 
 
 /*
  * Less then or equal this number of bytes we will always copy byte-for-byte
  */

@@ -58,19 +56,10 @@
  * Returns errno value on pagefault error, 0 if all ok
  */
 
 
 
-#if defined(lint)
-
-/* ARGSUSED */
-int
-kcopy(const void *from, void *to, size_t count)
-{ return(0); }
-
-#else   /* lint */
-
         .seg    ".text"
         .align  4
 
         ENTRY(kcopy)
 

@@ -95,25 +84,16 @@
         stn     %o5, [THREAD_REG + T_LOFAULT]   ! restore old t_lofault
         ret
         restore %g1, 0, %o0
 
         SET_SIZE(kcopy)
-#endif  /* lint */
 
 
 /*
  * Copy a block of storage - must not overlap (from + len <= to).
  */
-#if defined(lint)
 
-/* ARGSUSED */
-void
-bcopy(const void *from, void *to, size_t count)
-{}
-
-#else   /* lint */
-
         ENTRY(bcopy)
 
         save    %sp, -SA(MINFRAME), %sp
         clr     %o5                     ! flag LOFAULT_SET is not set for bcopy
 

@@ -373,25 +353,14 @@
 
         retl
         andn    %i2, %o0, %i3           ! return size of aligned bytes
         SET_SIZE(bcopy)
 
-#endif  /* lint */
-
 /*
  * Block copy with possibly overlapped operands.
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-void
-ovbcopy(const void *from, void *to, size_t count)
-{}
-
-#else   /* lint */
-
         ENTRY(ovbcopy)
         tst     %o2                     ! check count
         bgu,a   %ncc, 1f                ! nothing to do or bad arguments
         subcc   %o0, %o1, %o3           ! difference of from and to address
 

@@ -430,25 +399,17 @@
 
         retl                            ! return
         nop
         SET_SIZE(ovbcopy)
 
-#endif  /* lint */
-
 /*
  * hwblkpagecopy()
  *
  * Copies exactly one page.  This routine assumes the caller (ppcopy)
  * has already disabled kernel preemption and has checked
  * use_hw_bcopy.
  */
-#ifdef lint
-/*ARGSUSED*/
-void
-hwblkpagecopy(const void *src, void *dst)
-{ }
-#else /* lint */
         ENTRY(hwblkpagecopy)
         save    %sp, -SA(MINFRAME), %sp
 
         ! %i0 - source address (arg)
         ! %i1 - destination address (arg)

@@ -507,11 +468,10 @@
 
         membar #Sync
         ret
         restore %g0, 0, %o0
         SET_SIZE(hwblkpagecopy)
-#endif  /* lint */
 
 
 /*
  * Transfer data to and from user space -
  * Note that these routines can cause faults

@@ -577,19 +537,10 @@
 
 /*
  * Copy kernel data to user space (copyout/xcopyout/xcopyout_little).
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-copyout(const void *kaddr, void *uaddr, size_t count)
-{ return (0); }
-
-#else   /* lint */
-
 /*
  * We save the arguments in the following registers in case of a fault:
  *      kaddr - %g2
  *      uaddr - %g3
  *      count - %g4

@@ -819,22 +770,11 @@
 2:
         retl
         mov     -1, %o0
         SET_SIZE(copyout)
 
-#endif  /* lint */
 
-
-#ifdef  lint
-
-/*ARGSUSED*/
-int
-xcopyout(const void *kaddr, void *uaddr, size_t count)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(xcopyout)
         sethi   %hi(.xcopyout_err), REAL_LOFAULT
         b       .do_copyout
           or    REAL_LOFAULT, %lo(.xcopyout_err), REAL_LOFAULT
 .xcopyout_err:

@@ -847,21 +787,10 @@
 2:
         retl
         mov     %g1, %o0
         SET_SIZE(xcopyout)
 
-#endif  /* lint */
-        
-#ifdef  lint
-
-/*ARGSUSED*/
-int
-xcopyout_little(const void *kaddr, void *uaddr, size_t count)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(xcopyout_little)
         sethi   %hi(.little_err), %o4
         ldn     [THREAD_REG + T_LOFAULT], %o5
         or      %o4, %lo(.little_err), %o4
         membar  #Sync                   ! sync error barrier

@@ -885,25 +814,14 @@
         stn     %o5, [THREAD_REG + T_LOFAULT]   ! restore old t_lofault
         retl
         mov     %g0, %o0                ! return (0)
         SET_SIZE(xcopyout_little)
 
-#endif  /* lint */
-
 /*
  * Copy user data to kernel space (copyin/xcopyin/xcopyin_little)
  */
 
-#if defined(lint)
-
-/*ARGSUSED*/
-int
-copyin(const void *uaddr, void *kaddr, size_t count)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(copyin)
         sethi   %hi(.copyin_err), REAL_LOFAULT
         or      REAL_LOFAULT, %lo(.copyin_err), REAL_LOFAULT
 
 .do_copyin:

@@ -1089,21 +1007,10 @@
 2:
         retl
         mov     -1, %o0
         SET_SIZE(copyin)
 
-#endif  /* lint */
-
-#ifdef  lint
-
-/*ARGSUSED*/
-int
-xcopyin(const void *uaddr, void *kaddr, size_t count)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(xcopyin)
         sethi   %hi(.xcopyin_err), REAL_LOFAULT
         b       .do_copyin
           or    REAL_LOFAULT, %lo(.xcopyin_err), REAL_LOFAULT
 .xcopyin_err:

@@ -1116,21 +1023,10 @@
 2:
         retl
         mov     %g1, %o0
         SET_SIZE(xcopyin)
 
-#endif  /* lint */
-
-#ifdef  lint
-
-/*ARGSUSED*/
-int
-xcopyin_little(const void *uaddr, void *kaddr, size_t count)
-{ return (0); }
-
-#else   /* lint */
-
         ENTRY(xcopyin_little)
         sethi   %hi(.little_err), %o4
         ldn     [THREAD_REG + T_LOFAULT], %o5
         or      %o4, %lo(.little_err), %o4
         membar  #Sync                           ! sync error barrier

@@ -1160,75 +1056,44 @@
         stn     %o5, [THREAD_REG + T_LOFAULT]   ! restore old t_lofault
         retl
         mov     %g1, %o0
         SET_SIZE(xcopyin_little)
 
-#endif  /* lint */
 
-
 /*
  * Copy a block of storage - must not overlap (from + len <= to).
  * No fault handler installed (to be called under on_fault())
  */
-#if defined(lint)
 
-/* ARGSUSED */
-void
-copyin_noerr(const void *ufrom, void *kto, size_t count)
-{}
-
-#else   /* lint */
-
         ENTRY(copyin_noerr)
         sethi   %hi(.copyio_noerr), REAL_LOFAULT
         b       .do_copyin
           or    REAL_LOFAULT, %lo(.copyio_noerr), REAL_LOFAULT
 .copyio_noerr:
         jmp     SAVED_LOFAULT
           nop
         SET_SIZE(copyin_noerr)
 
-#endif /* lint */
-
 /*
  * Copy a block of storage - must not overlap (from + len <= to).
  * No fault handler installed (to be called under on_fault())
  */
 
-#if defined(lint)
-
-/* ARGSUSED */
-void
-copyout_noerr(const void *kfrom, void *uto, size_t count)
-{}
-
-#else   /* lint */
-
         ENTRY(copyout_noerr)
         sethi   %hi(.copyio_noerr), REAL_LOFAULT
         b       .do_copyout
           or    REAL_LOFAULT, %lo(.copyio_noerr), REAL_LOFAULT
         SET_SIZE(copyout_noerr)
 
-#endif /* lint */
-
-#if defined(lint)
-
-int use_hw_bcopy = 1;
-int use_hw_bzero = 1;
-
-#else /* !lint */
-
         .align  4
         DGDEF(use_hw_bcopy)
         .word   1
         DGDEF(use_hw_bzero)
         .word   1
 
         .align  64
         .section ".text"
-#endif /* !lint */
 
 
 /*
  * hwblkclr - clears block-aligned, block-multiple-sized regions that are
  * longer than 256 bytes in length. For the generic module we will simply

@@ -1235,18 +1100,10 @@
  * call bzero and return 1 to ensure that the pages in cache should be
  * flushed to ensure integrity.
  * Caller is responsible for ensuring use_hw_bzero is true and that
  * kpreempt_disable() has been called.
  */
-#ifdef lint
-/*ARGSUSED*/
-int
-hwblkclr(void *addr, size_t len)
-{ 
-        return(0);
-}
-#else /* lint */
         ! %i0 - start address
         ! %i1 - length of region (multiple of 64)
 
         ENTRY(hwblkclr)
         save    %sp, -SA(MINFRAME), %sp

@@ -1257,20 +1114,11 @@
           mov   %i1, %o1
         ret
         restore %g0, 1, %o0     ! return (1) - did not use block operations
 
         SET_SIZE(hwblkclr)
-#endif  /* lint */
 
-#ifdef  lint
-/* Copy 32 bytes of data from src to dst using physical addresses */
-/*ARGSUSED*/
-void
-hw_pa_bcopy32(uint64_t src, uint64_t dst)
-{}
-#else   /*!lint */
-
         /*
          * Copy 32 bytes of data from src (%o0) to dst (%o1)
          * using physical addresses.
          */
         ENTRY_NP(hw_pa_bcopy32)

@@ -1295,33 +1143,18 @@
 
         membar  #Sync
         retl
           wrpr    %g0, %g1, %pstate
         SET_SIZE(hw_pa_bcopy32)
-#endif /* lint */
 
 /*
  * Zero a block of storage.
  *
  * uzero is used by the kernel to zero a block in user address space.
  */
 
 
-#if defined(lint)
-
-/* ARGSUSED */
-int
-kzero(void *addr, size_t count)
-{ return(0); }
-
-/* ARGSUSED */
-void
-uzero(void *addr, size_t count)
-{}
-
-#else   /* lint */
-
         ENTRY(uzero)
         !
         ! Set a new lo_fault handler only if we came in with one
         ! already specified.
         !

@@ -1390,25 +1223,14 @@
         jmp     %o5                     ! goto real handler
           nop
         SET_SIZE(kzero)
         SET_SIZE(uzero)
 
-#endif  /* lint */
-
 /*
  * Zero a block of storage.
  */
 
-#if defined(lint)
-
-/* ARGSUSED */
-void
-bzero(void *addr, size_t count)
-{}
-
-#else   /* lint */
-
         ENTRY(bzero)
         wr      %g0, ASI_P, %asi
 
         ldn     [THREAD_REG + T_LOFAULT], %o5   ! save old vector
         tst     %o5

@@ -1594,6 +1416,5 @@
 1:
         retl
         clr     %o0                     ! return (0)
 
         SET_SIZE(bzero)
-#endif  /* lint */