Print this page
restore sparc comments
de-linting of .s files

@@ -24,15 +24,11 @@
  * Use is subject to license terms.
  *
  * Assembly code support for the Cheetah module
  */
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
-#if !defined(lint)
 #include "assym.h"
-#endif  /* lint */
 
 #include <sys/asm_linkage.h>
 #include <sys/mmu.h>
 #include <vm/hat_sfmmu.h>
 #include <sys/machparam.h>

@@ -52,12 +48,10 @@
 
 #ifdef TRAPTRACE
 #include <sys/traptrace.h>
 #endif /* TRAPTRACE */
 
-#if !defined(lint)
-
 /* BEGIN CSTYLED */
 
 /*
  * Cheetah version to flush an Ecache line by index (aliased address)
  */

@@ -73,29 +67,20 @@
         add     scr1, scr2, scr1;                                       \
         ECACHE_REFLUSH_LINE(ecache_size, scr1, scr2)
 
 /* END CSTYLED */
 
-#endif  /* !lint */
 
-
 /*
  * Fast ECC error at TL>0 handler
  * We get here via trap 70 at TL>0->Software trap 0 at TL>0.  We enter
  * this routine with %g1 and %g2 already saved in %tpc, %tnpc and %tstate.
  * For a complete description of the Fast ECC at TL>0 handling see the
  * comment block "Cheetah/Cheetah+ Fast ECC at TL>0 trap strategy" in
  * us3_common_asm.s
  */
-#if defined(lint)
 
-void
-fast_ecc_tl1_err(void)
-{}
-
-#else   /* lint */
-
         .section ".text"
         .align  64
         ENTRY_NP(fast_ecc_tl1_err)
 
         /*

@@ -310,14 +295,11 @@
          */
         CH_ERR_TL1_PANIC_EXIT(fecc_tl1_err);
 
         SET_SIZE(fast_ecc_tl1_err)
 
-#endif  /* lint */
 
-
-#if defined(lint)
 /*
  * scrubphys - Pass in the aligned physical memory address
  * that you want to scrub, along with the ecache set size.
  *
  *      1) Displacement flush the E$ line corresponding to %addr.

@@ -336,16 +318,10 @@
  * as modified, but then we found out that for spitfire, if it misses in the
  * E$ it will probably install as an M, but if it hits in the E$, then it
  * will stay E, if the store doesn't happen. So the first displacement flush
  * should ensure that the CAS will miss in the E$.  Arrgh.
  */
-/* ARGSUSED */
-void
-scrubphys(uint64_t paddr, int ecache_set_size)
-{}
-
-#else   /* lint */
         ENTRY(scrubphys)
         rdpr    %pstate, %o4
         andn    %o4, PSTATE_IE | PSTATE_AM, %o5
         wrpr    %o5, %g0, %pstate       ! clear IE, AM bits
 

@@ -357,31 +333,21 @@
 
         retl
         membar  #Sync                   ! move the data out of the load buffer
         SET_SIZE(scrubphys)
 
-#endif  /* lint */
 
-
-#if defined(lint)
- /*
+/*
  * clearphys - Pass in the physical memory address of the checkblock
  * that you want to push out, cleared with a recognizable pattern,
  * from the ecache.
  *
  * To ensure that the ecc gets recalculated after the bad data is cleared,
  * we must write out enough data to fill the w$ line (64 bytes). So we read
  * in an entire ecache subblock's worth of data, and write it back out.
  * Then we overwrite the 16 bytes of bad data with the pattern.
  */
-/* ARGSUSED */
-void
-clearphys(uint64_t paddr, int ecache_set_size, int ecache_linesize)
-{
-}
-
-#else   /* lint */
         ENTRY(clearphys)
         /* turn off IE, AM bits */
         rdpr    %pstate, %o4
         andn    %o4, PSTATE_IE | PSTATE_AM, %o5
         wrpr    %o5, %g0, %pstate

@@ -425,48 +391,29 @@
         /* return and re-enable IE and AM */
         retl
           wrpr  %g0, %o4, %pstate
         SET_SIZE(clearphys)
 
-#endif  /* lint */
 
-
-#if defined(lint)
 /*
  * Cheetah Ecache displacement flush the specified line from the E$
  *
  * Register usage:
  *      %o0 - 64 bit physical address for flushing
  *      %o1 - Ecache set size
  */
-/*ARGSUSED*/
-void
-ecache_flush_line(uint64_t flushaddr, int ec_set_size)
-{
-}
-#else   /* lint */
         ENTRY(ecache_flush_line)
 
         ECACHE_FLUSH_LINE(%o0, %o1, %o2, %o3)
 
         retl
           nop
         SET_SIZE(ecache_flush_line)
-#endif  /* lint */
 
-
-#if defined(lint)
 /*
  * This routine will not be called in Cheetah systems.
  */
-void
-flush_ipb(void)
-{ return; }
-
-#else   /* lint */
-
         ENTRY(flush_ipb)
         retl
         nop
         SET_SIZE(flush_ipb)
 
-#endif  /* lint */