diff options
Diffstat (limited to 'usr/src/uts/sun4/ml')
| -rw-r--r-- | usr/src/uts/sun4/ml/copy.s | 81 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/cpc_hwreg.s | 26 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/interrupt.s | 196 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/ip_ocsum.s | 16 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/locore.s | 51 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/proc_init.s | 18 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/subr_asm.s | 239 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/swtch.s | 47 | ||||
| -rw-r--r-- | usr/src/uts/sun4/ml/xc.s | 23 |
9 files changed, 3 insertions, 694 deletions
diff --git a/usr/src/uts/sun4/ml/copy.s b/usr/src/uts/sun4/ml/copy.s index 2b82cfbb8d..925d869ed8 100644 --- a/usr/src/uts/sun4/ml/copy.s +++ b/usr/src/uts/sun4/ml/copy.s @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/param.h> #include <sys/errno.h> #include <sys/asm_linkage.h> @@ -35,9 +33,7 @@ #include <sys/fsr.h> #include <sys/privregs.h> -#if !defined(lint) #include "assym.h" -#endif /* lint */ /* * Error barrier: @@ -60,15 +56,6 @@ * u_int maxlength, *lencopied; */ -#if defined(lint) - -/* ARGSUSED */ -int -copystr(const char *from, char *to, size_t maxlength, size_t *lencopied) -{ return(0); } - -#else /* lint */ - ENTRY(copystr) orcc %o2, %g0, %o4 ! save original count bg,a %ncc, 1f @@ -113,22 +100,11 @@ copystr(const char *from, char *to, size_t maxlength, size_t *lencopied) nop SET_SIZE(copystr) -#endif /* lint */ - /* * Copy a null terminated string from the user address space into * the kernel address space. */ -#if defined(lint) - -/* ARGSUSED */ -int -copyinstr(const char *uaddr, char *kaddr, size_t maxlength, - size_t *lencopied) -{ return (0); } - -#else /* lint */ ENTRY(copyinstr) sethi %hi(.copyinstr_err), %o4 @@ -194,17 +170,6 @@ copyinstr(const char *uaddr, char *kaddr, size_t maxlength, retl stn %o5, [THREAD_REG + T_LOFAULT] ! stop catching faults SET_SIZE(copyinstr) -#endif - -#if defined(lint) - -/* ARGSUSED */ -int -copyinstr_noerr(const char *uaddr, char *kaddr, size_t maxlength, - size_t *lencopied) -{ return (0); } - -#else /* lint */ ENTRY(copyinstr_noerr) mov %o2, %o4 ! save original count @@ -247,23 +212,11 @@ copyinstr_noerr(const char *uaddr, char *kaddr, size_t maxlength, nop SET_SIZE(copyinstr_noerr) -#endif /* lint */ - /* * Copy a null terminated string from the kernel * address space to the user address space. */ -#if defined(lint) - -/* ARGSUSED */ -int -copyoutstr(const char *kaddr, char *uaddr, size_t maxlength, - size_t *lencopied) -{ return (0); } - -#else /* lint */ - ENTRY(copyoutstr) sethi %hi(.copyoutstr_err), %o5 ldn [THREAD_REG + T_LOFAULT], %o4 ! catch faults @@ -330,18 +283,6 @@ copyoutstr(const char *kaddr, char *uaddr, size_t maxlength, stn %o5, [THREAD_REG + T_LOFAULT] ! stop catching faults SET_SIZE(copyoutstr) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -int -copyoutstr_noerr(const char *kaddr, char *uaddr, size_t maxlength, - size_t *lencopied) -{ return (0); } - -#else /* lint */ - ENTRY(copyoutstr_noerr) mov %o2, %o4 ! save original count @@ -382,8 +323,6 @@ copyoutstr_noerr(const char *kaddr, char *uaddr, size_t maxlength, nop SET_SIZE(copyoutstr_noerr) -#endif /* lint */ - /* * Copy a block of storage. If the source and target regions overlap, @@ -391,15 +330,6 @@ copyoutstr_noerr(const char *kaddr, char *uaddr, size_t maxlength, * No fault handler installed (to be called under on_fault()) */ -#if defined(lint) - -/* ARGSUSED */ -void -ucopy(const void *ufrom, void *uto, size_t ulength) -{} - -#else /* lint */ - ENTRY(ucopy) save %sp, -SA(MINFRAME), %sp ! get another window @@ -417,7 +347,6 @@ ucopy(const void *ufrom, void *uto, size_t ulength) restore %g0, 0, %o0 ! return (0) SET_SIZE(ucopy) -#endif /* lint */ /* * Copy a user-land string. If the source and target regions overlap, @@ -425,15 +354,6 @@ ucopy(const void *ufrom, void *uto, size_t ulength) * No fault handler installed (to be called under on_fault()) */ -#if defined(lint) - -/* ARGSUSED */ -void -ucopystr(const char *ufrom, char *uto, size_t umaxlength, size_t *ulencopied) -{} - -#else /* lint */ - ENTRY(ucopystr) save %sp, -SA(MINFRAME), %sp ! get another window @@ -455,4 +375,3 @@ ucopystr(const char *ufrom, char *uto, size_t umaxlength, size_t *ulencopied) restore %g0, 0, %o0 ! return (0) SET_SIZE(ucopystr) -#endif /* lint */ diff --git a/usr/src/uts/sun4/ml/cpc_hwreg.s b/usr/src/uts/sun4/ml/cpc_hwreg.s index b357183d72..ad85ebb73a 100644 --- a/usr/src/uts/sun4/ml/cpc_hwreg.s +++ b/usr/src/uts/sun4/ml/cpc_hwreg.s @@ -30,31 +30,6 @@ #include <sys/asm_linkage.h> -#if defined(lint) || defined(__lint) - -#include <sys/cpc_ultra.h> - -/*ARGSUSED*/ -void -ultra_setpcr(uint64_t pcr) -{} - -/*ARGSUSED*/ -uint64_t -ultra_getpcr(void) -{ return (0); } - -/*ARGSUSED*/ -void -ultra_setpic(uint64_t pic) -{} - -uint64_t -ultra_getpic(void) -{ return (0); } - -#else /* lint || __lint */ - ENTRY(ultra_setpcr) retl wr %o0, %pcr @@ -85,4 +60,3 @@ ultra_getpic(void) rd %pic, %o0 SET_SIZE(ultra_getpic) -#endif /* lint || __lint */ diff --git a/usr/src/uts/sun4/ml/interrupt.s b/usr/src/uts/sun4/ml/interrupt.s index 021fcc5747..5438b083ff 100644 --- a/usr/src/uts/sun4/ml/interrupt.s +++ b/usr/src/uts/sun4/ml/interrupt.s @@ -22,12 +22,7 @@ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. */ -#if defined(lint) -#include <sys/types.h> -#include <sys/thread.h> -#else /* lint */ #include "assym.h" -#endif /* lint */ #include <sys/cmn_err.h> #include <sys/ftrace.h> @@ -41,15 +36,6 @@ #include <sys/traptrace.h> #endif /* TRAPTRACE */ -#if defined(lint) - -/* ARGSUSED */ -void -pil_interrupt(int level) -{} - -#else /* lint */ - /* * (TT 0x40..0x4F, TL>0) Interrupt Level N Handler (N == 1..15) @@ -160,10 +146,7 @@ pil_interrupt(int level) SET_SIZE(pil_interrupt_common) SET_SIZE(pil_interrupt) -#endif /* lint */ - -#ifndef lint _spurious: .asciz "!interrupt 0x%x at level %d not serviced" @@ -329,17 +312,6 @@ _spurious: #define SERVE_INTR_TRACE2(inum, os1, os2, os3, os4) #endif /* TRAPTRACE */ -#endif /* lint */ - -#if defined(lint) - -/*ARGSUSED*/ -void -intr_thread(struct regs *regs, uint64_t iv_p, uint_t pil) -{} - -#else /* lint */ - #define INTRCNT_LIMIT 16 /* @@ -892,9 +864,6 @@ intr_thread_exit_actv_bit_set: intr_thread_t_intr_start_zero: .asciz "intr_thread(): t_intr_start zero upon handler return" #endif /* DEBUG */ -#endif /* lint */ - -#if defined(lint) /* * Handle an interrupt in the current thread @@ -905,7 +874,7 @@ intr_thread_t_intr_start_zero: * %sp = on current thread's kernel stack * %o7 = return linkage to trap code * %g7 = current thread - * %pstate = normal globals, interrupts enabled, + * %pstate = normal globals, interrupts enabled, * privileged, fp disabled * %pil = PIL_MAX * @@ -918,13 +887,6 @@ intr_thread_t_intr_start_zero: * %o0 = scratch * %o4 - %o5 = scratch */ -/* ARGSUSED */ -void -current_thread(struct regs *regs, uint64_t iv_p, uint_t pil) -{} - -#else /* lint */ - ENTRY_NP(current_thread) mov %o7, %l0 @@ -1398,7 +1360,6 @@ current_thread_timestamp_zero: current_thread_nested_PIL_not_found: .asciz "current_thread: couldn't find nested high-level PIL" #endif /* DEBUG */ -#endif /* lint */ /* * Return a thread's interrupt level. @@ -1412,64 +1373,22 @@ current_thread_nested_PIL_not_found: * kthread_id_t t; */ -#if defined(lint) - -/* ARGSUSED */ -int -intr_level(kthread_id_t t) -{ return (0); } - -#else /* lint */ - ENTRY_NP(intr_level) retl ldub [%o0 + T_PIL], %o0 ! return saved pil SET_SIZE(intr_level) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -int -disable_pil_intr() -{ return (0); } - -#else /* lint */ - ENTRY_NP(disable_pil_intr) rdpr %pil, %o0 retl wrpr %g0, PIL_MAX, %pil ! disable interrupts (1-15) SET_SIZE(disable_pil_intr) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -void -enable_pil_intr(int pil_save) -{} - -#else /* lint */ - ENTRY_NP(enable_pil_intr) retl wrpr %o0, %pil SET_SIZE(enable_pil_intr) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -uint_t -disable_vec_intr(void) -{ return (0); } - -#else /* lint */ - ENTRY_NP(disable_vec_intr) rdpr %pstate, %o0 andn %o0, PSTATE_IE, %g1 @@ -1477,32 +1396,11 @@ disable_vec_intr(void) wrpr %g0, %g1, %pstate ! disable interrupt SET_SIZE(disable_vec_intr) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -void -enable_vec_intr(uint_t pstate_save) -{} - -#else /* lint */ - ENTRY_NP(enable_vec_intr) retl wrpr %g0, %o0, %pstate SET_SIZE(enable_vec_intr) -#endif /* lint */ - -#if defined(lint) - -void -cbe_level14(void) -{} - -#else /* lint */ - ENTRY_NP(cbe_level14) save %sp, -SA(MINFRAME), %sp ! get a new window ! @@ -1522,17 +1420,6 @@ cbe_level14(void) restore %g0, 1, %o0 SET_SIZE(cbe_level14) -#endif /* lint */ - - -#if defined(lint) - -/* ARGSUSED */ -void -kdi_setsoftint(uint64_t iv_p) -{} - -#else /* lint */ ENTRY_NP(kdi_setsoftint) save %sp, -SA(MINFRAME), %sp ! get a new window @@ -1607,17 +1494,6 @@ kdi_setsoftint(uint64_t iv_p) restore SET_SIZE(kdi_setsoftint) -#endif /* lint */ - -#if defined(lint) - -/*ARGSUSED*/ -void -setsoftint_tl1(uint64_t iv_p, uint64_t dummy) -{} - -#else /* lint */ - ! ! Register usage ! Arguments: @@ -1702,17 +1578,6 @@ setsoftint_tl1(uint64_t iv_p, uint64_t dummy) retry SET_SIZE(setsoftint_tl1) -#endif /* lint */ - -#if defined(lint) - -/*ARGSUSED*/ -void -setvecint_tl1(uint64_t inum, uint64_t dummy) -{} - -#else /* lint */ - ! ! Register usage ! Arguments: @@ -1845,33 +1710,11 @@ setvecint_tl1(uint64_t inum, uint64_t dummy) mov PIL_15, %g4 SET_SIZE(setvecint_tl1) -#endif /* lint */ - -#if defined(lint) - -/*ARGSUSED*/ -void -wr_clr_softint(uint_t value) -{} - -#else - ENTRY_NP(wr_clr_softint) retl wr %o0, CLEAR_SOFTINT SET_SIZE(wr_clr_softint) -#endif /* lint */ - -#if defined(lint) - -/*ARGSUSED*/ -void -intr_enqueue_req(uint_t pil, uint64_t inum) -{} - -#else /* lint */ - /* * intr_enqueue_req * @@ -1921,21 +1764,11 @@ intr_enqueue_req(uint_t pil, uint64_t inum) nop SET_SIZE(intr_enqueue_req) -#endif /* lint */ - /* * Set CPU's base SPL level, based on which interrupt levels are active. * Called at spl7 or above. */ -#if defined(lint) - -void -set_base_spl(void) -{} - -#else /* lint */ - ENTRY_NP(set_base_spl) ldn [THREAD_REG + T_CPU], %o2 ! load CPU pointer ld [%o2 + CPU_INTR_ACTV], %o5 ! load active interrupts mask @@ -1986,8 +1819,6 @@ _intr_flag_table: .byte 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 .align 4 -#endif /* lint */ - /* * int * intr_passivate(from, to) @@ -1995,15 +1826,6 @@ _intr_flag_table: * kthread_id_t to; interrupted thread */ -#if defined(lint) - -/* ARGSUSED */ -int -intr_passivate(kthread_id_t from, kthread_id_t to) -{ return (0); } - -#else /* lint */ - ENTRY_NP(intr_passivate) save %sp, -SA(MINFRAME), %sp ! get a new window @@ -2060,10 +1882,6 @@ intr_passivate(kthread_id_t from, kthread_id_t to) restore SET_SIZE(intr_passivate) -#endif /* lint */ - -#if defined(lint) - /* * intr_get_time() is a resource for interrupt handlers to determine how * much time has been spent handling the current interrupt. Such a function @@ -2079,8 +1897,8 @@ intr_passivate(kthread_id_t from, kthread_id_t to) * The first time intr_get_time() is called while handling an interrupt, * it returns the time since the interrupt handler was invoked. Subsequent * calls will return the time since the prior call to intr_get_time(). Time - * is returned as ticks, adjusted for any clock divisor due to power - * management. Use tick2ns() to convert ticks to nsec. Warning: ticks may + * is returned as ticks, adjusted for any clock divisor due to power + * management. Use tick2ns() to convert ticks to nsec. Warning: ticks may * not be the same across CPUs. * * Theory Of Intrstat[][]: @@ -2124,13 +1942,6 @@ intr_passivate(kthread_id_t from, kthread_id_t to) * the next intr_get_time() call from the original interrupt, because * the higher-pil interrupt's time is accumulated in intrstat[higherpil][]. */ - -/*ARGSUSED*/ -uint64_t -intr_get_time(void) -{ return 0; } -#else /* lint */ - ENTRY_NP(intr_get_time) #ifdef DEBUG ! @@ -2239,4 +2050,3 @@ intr_get_time_not_intr: intr_get_time_no_start_time: .asciz "intr_get_time(): t_intr_start == 0" #endif /* DEBUG */ -#endif /* lint */ diff --git a/usr/src/uts/sun4/ml/ip_ocsum.s b/usr/src/uts/sun4/ml/ip_ocsum.s index 18daafe481..544c367218 100644 --- a/usr/src/uts/sun4/ml/ip_ocsum.s +++ b/usr/src/uts/sun4/ml/ip_ocsum.s @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/param.h> #include <sys/errno.h> #include <sys/asm_linkage.h> @@ -33,11 +31,7 @@ #include <sys/machthread.h> #include <sys/machparam.h> -#if defined(lint) -#include <sys/types.h> -#else /* lint */ #include "assym.h" -#endif /* lint */ /* * Prefetch considerations @@ -75,15 +69,6 @@ * */ -#if defined(lint) - -/* ARGSUSED */ -unsigned int -ip_ocsum(u_short *address, int halfword_count, unsigned int sum) -{ return (0); } - -#else /* lint */ - ENTRY(ip_ocsum) /* @@ -461,4 +446,3 @@ ip_ocsum(u_short *address, int halfword_count, unsigned int sum) SET_SIZE(ip_ocsum_long) ! 64-bit version -#endif /* lint */ diff --git a/usr/src/uts/sun4/ml/locore.s b/usr/src/uts/sun4/ml/locore.s index c0e07826c8..600455da3d 100644 --- a/usr/src/uts/sun4/ml/locore.s +++ b/usr/src/uts/sun4/ml/locore.s @@ -24,32 +24,14 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#if defined(lint) -#include <sys/types.h> -#include <sys/t_lock.h> -#include <sys/promif.h> -#include <sys/prom_isa.h> -#endif /* lint */ - #include <sys/asm_linkage.h> #include <sys/privregs.h> #include <sys/scb.h> #include <sys/machparam.h> #include <sys/machthread.h> -#if defined(lint) - -#include <sys/thread.h> -#include <sys/time.h> - -#else /* lint */ - #include "assym.h" -#endif /* lint */ - /* * void * reestablish_curthread(void) @@ -59,14 +41,6 @@ * The CPU_ADDR macro figures out the cpuid by reading hardware registers. */ -#if defined(lint) - -void -reestablish_curthread(void) -{} - -#else /* lint */ - ENTRY_NP(reestablish_curthread) CPU_ADDR(%o0, %o1) @@ -75,27 +49,16 @@ reestablish_curthread(void) SET_SIZE(reestablish_curthread) -#endif /* lint */ - /* * Return the current THREAD pointer. * This is also available as an inline function. */ -#if defined(lint) - -kthread_id_t -threadp(void) -{ return ((kthread_id_t)0); } - -#else /* lint */ ENTRY_NP(threadp) retl mov THREAD_REG, %o0 SET_SIZE(threadp) -#endif /* lint */ - /* * The IEEE 1275-1994 callback handler for a 64-bit SPARC V9 PROM calling @@ -109,18 +72,6 @@ threadp(void) * the prom's window handlers are mixed mode handlers. */ -#if defined(lint) - -int -callback_handler(cell_t *arg_array) -{ - extern int vx_handler(cell_t *arg_array); - - return (vx_handler(arg_array)); -} - -#else /* lint */ - ENTRY_NP(callback_handler) ! ! We assume we are called with a 64 bit stack with PSTATE_AM clear @@ -154,5 +105,3 @@ callback_handler(cell_t *arg_array) restore ! back to a 64 bit stack SET_SIZE(callback_handler) -#endif /* lint */ - diff --git a/usr/src/uts/sun4/ml/proc_init.s b/usr/src/uts/sun4/ml/proc_init.s index a8ebdd8a2a..a2dcba1cd6 100644 --- a/usr/src/uts/sun4/ml/proc_init.s +++ b/usr/src/uts/sun4/ml/proc_init.s @@ -23,11 +23,7 @@ * Use is subject to license terms. */ -#if defined(lint) -#include <sys/types.h> -#else /* lint */ #include "assym.h" -#endif /* lint */ #include <sys/asm_linkage.h> #include <sys/machthread.h> @@ -39,15 +35,11 @@ #include <sys/clock.h> #include <vm/hat_sfmmu.h> -#if !defined(lint) .weak cpu_feature_init .type cpu_feature_init, #function -#endif /* lint */ -#if !defined(lint) .weak cpu_early_feature_init .type cpu_early_feature_init, #function -#endif /* lint */ /* * Processor initialization @@ -57,15 +49,6 @@ * prom's trap table. It expects the cpuid as its first parameter. */ -#if defined(lint) - -/* ARGSUSED */ -void -cpu_startup(int cpuid) -{} - -#else /* lint */ - ! allocate a temporary stack to run on while we figure who and ! what we are. .seg ".data" @@ -154,4 +137,3 @@ tmpstk: restore ! WILL cause underflow SET_SIZE(cpu_startup) -#endif /* lint */ diff --git a/usr/src/uts/sun4/ml/subr_asm.s b/usr/src/uts/sun4/ml/subr_asm.s index acfa423775..e08e346a0d 100644 --- a/usr/src/uts/sun4/ml/subr_asm.s +++ b/usr/src/uts/sun4/ml/subr_asm.s @@ -23,19 +23,11 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * General machine architecture & implementation specific * assembly language routines. */ -#if defined(lint) -#include <sys/types.h> -#include <sys/machsystm.h> -#include <sys/t_lock.h> -#else /* lint */ #include "assym.h" -#endif /* lint */ #include <sys/asm_linkage.h> #include <sys/async.h> @@ -43,14 +35,6 @@ #include <sys/vis.h> #include <sys/machsig.h> -#if defined(lint) -caddr_t -set_trap_table(void) -{ - return ((caddr_t)0); -} -#else /* lint */ - ENTRY(set_trap_table) set trap_table, %o1 rdpr %tba, %o0 @@ -59,72 +43,6 @@ set_trap_table(void) wrpr %g0, WSTATE_KERN, %wstate SET_SIZE(set_trap_table) -#endif /* lint */ - -#if defined(lint) - -/*ARGSUSED*/ -void -stphys(uint64_t physaddr, int value) -{} - -/*ARGSUSED*/ -int -ldphys(uint64_t physaddr) -{ return (0); } - -/*ARGSUSED*/ -void -stdphys(uint64_t physaddr, uint64_t value) -{} - -/*ARGSUSED*/ -uint64_t -lddphys(uint64_t physaddr) -{ return (0x0ull); } - -/* ARGSUSED */ -void -stphysio(u_longlong_t physaddr, uint_t value) -{} - -/* ARGSUSED */ -uint_t -ldphysio(u_longlong_t physaddr) -{ return(0); } - -/* ARGSUSED */ -void -sthphysio(u_longlong_t physaddr, ushort_t value) -{} - -/* ARGSUSED */ -ushort_t -ldhphysio(u_longlong_t physaddr) -{ return(0); } - -/* ARGSUSED */ -void -stbphysio(u_longlong_t physaddr, uchar_t value) -{} - -/* ARGSUSED */ -uchar_t -ldbphysio(u_longlong_t physaddr) -{ return(0); } - -/*ARGSUSED*/ -void -stdphysio(u_longlong_t physaddr, u_longlong_t value) -{} - -/*ARGSUSED*/ -u_longlong_t -lddphysio(u_longlong_t physaddr) -{ return (0ull); } - -#else - ! Store long word value at physical address ! ! void stdphys(uint64_t physaddr, uint64_t value) @@ -300,39 +218,18 @@ lddphysio(u_longlong_t physaddr) retl wrpr %g0, %o4, %pstate /* restore pstate */ SET_SIZE(ldbphysio) -#endif /* lint */ /* * save_gsr(kfpu_t *fp) * Store the graphics status register */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -save_gsr(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(save_gsr) rd %gsr, %g2 ! save gsr retl stx %g2, [%o0 + FPU_GSR] SET_SIZE(save_gsr) -#endif /* lint */ - -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -restore_gsr(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(restore_gsr) ldx [%o0 + FPU_GSR], %g2 wr %g2, %g0, %gsr @@ -340,30 +237,17 @@ restore_gsr(kfpu_t *fp) nop SET_SIZE(restore_gsr) -#endif /* lint */ - /* * uint64_t * _fp_read_pgsr() * Get the graphics status register info from fp and return it */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -uint64_t -_fp_read_pgsr(kfpu_t *fp) -{ return 0; } - -#else /* lint */ - ENTRY_NP(_fp_read_pgsr) retl rd %gsr, %o0 SET_SIZE(_fp_read_pgsr) -#endif /* lint */ - /* * uint64_t @@ -371,96 +255,43 @@ _fp_read_pgsr(kfpu_t *fp) * Get the graphics status register info from fp and return it */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -uint64_t -get_gsr(kfpu_t *fp) -{ return 0; } - -#else /* lint */ - ENTRY_NP(get_gsr) retl ldx [%o0 + FPU_GSR], %o0 SET_SIZE(get_gsr) -#endif - /* * _fp_write_pgsr(uint64_t *buf, kfpu_t *fp) * Set the graphics status register info to fp from buf */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -_fp_write_pgsr(uint64_t buf, kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(_fp_write_pgsr) retl mov %o0, %gsr SET_SIZE(_fp_write_pgsr) -#endif /* lint */ - /* * set_gsr(uint64_t buf, kfpu_t *fp) * Set the graphics status register info to fp from buf */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -set_gsr(uint64_t buf, kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(set_gsr) retl stx %o0, [%o1 + FPU_GSR] SET_SIZE(set_gsr) -#endif /* lint */ - -#if defined(lint) || defined(__lint) -void -kdi_cpu_index(void) -{ -} - -#else /* lint */ - ENTRY_NP(kdi_cpu_index) CPU_INDEX(%g1, %g2) jmp %g7 nop SET_SIZE(kdi_cpu_index) -#endif /* lint */ - -#if defined(lint) || defined(__lint) -void -kmdb_enter(void) -{ -} - -#else /* lint */ - ENTRY_NP(kmdb_enter) t ST_KMDB_TRAP retl nop SET_SIZE(kmdb_enter) -#endif /* lint */ - /* * The Spitfire floating point code has been changed not to use install/ * save/restore/fork/freectx() because of the special memcpy library @@ -492,20 +323,6 @@ kmdb_enter(void) * Store the floating point registers. */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -fp_save(kfpu_t *fp) -{} - -/* ARGSUSED */ -void -fp_fksave(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(fp_save) ALTENTRY(fp_fksave) BSTORE_FPREGS(%o0, %o1) ! store V9 regs @@ -514,113 +331,57 @@ fp_fksave(kfpu_t *fp) SET_SIZE(fp_fksave) SET_SIZE(fp_save) -#endif /* lint */ - /* * fp_v8_fksave(kfpu_t *fp) * * This is like the above routine but only saves the lower half. */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -fp_v8_fksave(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(fp_v8_fksave) BSTORE_V8_FPREGS(%o0, %o1) ! store V8 regs retl stx %fsr, [%o0 + FPU_FSR] ! store fsr SET_SIZE(fp_v8_fksave) -#endif /* lint */ - /* * fp_v8p_fksave(kfpu_t *fp) * * This is like the above routine but only saves the upper half. */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -fp_v8p_fksave(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(fp_v8p_fksave) BSTORE_V8P_FPREGS(%o0, %o1) ! store V9 extra regs retl stx %fsr, [%o0 + FPU_FSR] ! store fsr SET_SIZE(fp_v8p_fksave) -#endif /* lint */ - /* * fp_restore(kfpu_t *fp) */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -fp_restore(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(fp_restore) BLOAD_FPREGS(%o0, %o1) ! load V9 regs retl ldx [%o0 + FPU_FSR], %fsr ! restore fsr SET_SIZE(fp_restore) -#endif /* lint */ - /* * fp_v8_load(kfpu_t *fp) */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -fp_v8_load(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(fp_v8_load) BLOAD_V8_FPREGS(%o0, %o1) ! load V8 regs retl ldx [%o0 + FPU_FSR], %fsr ! restore fsr SET_SIZE(fp_v8_load) -#endif /* lint */ - /* * fp_v8p_load(kfpu_t *fp) */ -#if defined(lint) || defined(__lint) - -/* ARGSUSED */ -void -fp_v8p_load(kfpu_t *fp) -{} - -#else /* lint */ - ENTRY_NP(fp_v8p_load) BLOAD_V8P_FPREGS(%o0, %o1) ! load V9 extra regs retl ldx [%o0 + FPU_FSR], %fsr ! restore fsr SET_SIZE(fp_v8p_load) -#endif /* lint */ diff --git a/usr/src/uts/sun4/ml/swtch.s b/usr/src/uts/sun4/ml/swtch.s index 7c688ec551..7f994d05ed 100644 --- a/usr/src/uts/sun4/ml/swtch.s +++ b/usr/src/uts/sun4/ml/swtch.s @@ -26,11 +26,7 @@ * Process switching routines. */ -#if !defined(lint) #include "assym.h" -#else /* lint */ -#include <sys/thread.h> -#endif /* lint */ #include <sys/param.h> #include <sys/asm_linkage.h> @@ -69,15 +65,6 @@ * off the stack. */ -#if defined(lint) - -/* ARGSUSED */ -void -resume(kthread_id_t t) -{} - -#else /* lint */ - ENTRY(resume) save %sp, -SA(MINFRAME), %sp ! save ins and locals @@ -454,17 +441,6 @@ resume(kthread_id_t t) SET_SIZE(_resume_from_idle) SET_SIZE(resume) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -void -resume_from_zombie(kthread_id_t t) -{} - -#else /* lint */ - ENTRY(resume_from_zombie) save %sp, -SA(MINFRAME), %sp ! save ins and locals @@ -509,17 +485,6 @@ resume_from_zombie(kthread_id_t t) ldn [%i0 + T_PROCP], %i3 ! new process SET_SIZE(resume_from_zombie) -#endif /* lint */ - -#if defined(lint) - -/* ARGSUSED */ -void -resume_from_intr(kthread_id_t t) -{} - -#else /* lint */ - ENTRY(resume_from_intr) save %sp, -SA(MINFRAME), %sp ! save ins and locals @@ -614,8 +579,6 @@ resume_from_intr(kthread_id_t t) nop SET_SIZE(resume_from_intr) -#endif /* lint */ - /* * thread_start() @@ -628,14 +591,6 @@ resume_from_intr(kthread_id_t t) * procedure. */ -#if defined(lint) - -void -thread_start(void) -{} - -#else /* lint */ - ENTRY(thread_start) mov %i0, %o0 jmpl %i7, %o7 ! call thread_run()'s start() procedure. @@ -645,5 +600,3 @@ thread_start(void) nop unimp 0 SET_SIZE(thread_start) - -#endif /* lint */ diff --git a/usr/src/uts/sun4/ml/xc.s b/usr/src/uts/sun4/ml/xc.s index 0f723dfb49..e213864ed2 100644 --- a/usr/src/uts/sun4/ml/xc.s +++ b/usr/src/uts/sun4/ml/xc.s @@ -24,14 +24,7 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - -#if defined(lint) -#include <sys/types.h> -#include <sys/cpuvar.h> -#else /*lint */ #include "assym.h" -#endif /* lint */ #include <sys/param.h> #include <sys/asm_linkage.h> @@ -50,14 +43,6 @@ #endif /* TRAPTRACE */ -#if defined(lint) - -/* ARGSUSED */ -void -send_self_xcall(struct cpu *cpu, uint64_t arg1, uint64_t arg2, xcfunc_t *func) -{} - -#else /* * For a x-trap request to the same processor, just send a fast trap. * Does not accept inums. @@ -67,13 +52,7 @@ send_self_xcall(struct cpu *cpu, uint64_t arg1, uint64_t arg2, xcfunc_t *func) retl nop SET_SIZE(send_self_xcall) -#endif /* lint */ -#if defined(lint) -void -idle_stop_xcall(void) -{} -#else /* * idle or stop xcall handler. * @@ -99,5 +78,3 @@ idle_stop_xcall(void) movl %xcc, XCALL_PIL, %g4 SET_SIZE(idle_stop_xcall) -#endif /* lint */ - |