Print this page
de-linting of .s files
first
@@ -21,20 +21,15 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
+/*
+ * Copyright 2019 Joyent, Inc.
+ */
-#if defined(lint) || defined(__lint)
-#include <sys/types.h>
-#include <sys/thread.h>
-#include <sys/cpuvar.h>
-#include <vm/page.h>
-#else /* __lint */
#include "assym.h"
-#endif /* __lint */
#include <sys/mutex_impl.h>
#include <sys/asm_linkage.h>
#include <sys/asm_misc.h>
#include <sys/regset.h>
@@ -47,32 +42,12 @@
* - doesn't block interrupts so don't use this to spin on a lock.
*
* ulock_try() is for a lock in the user address space.
*/
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-int
-lock_try(lock_t *lp)
-{ return (0); }
-
-/* ARGSUSED */
-int
-lock_spin_try(lock_t *lp)
-{ return (0); }
-
-/* ARGSUSED */
-int
-ulock_try(lock_t *lp)
-{ return (0); }
-
-#else /* __lint */
.globl kernelbase
-#if defined(__amd64)
-
ENTRY(lock_try)
movb $-1, %dl
movzbq %dl, %rax
xchgb %dl, (%rdi)
xorb %dl, %al
@@ -116,91 +91,22 @@
xchgb %al, (%rdi)
xorb $1, %al
ret
SET_SIZE(ulock_try)
-#else
-
- ENTRY(lock_try)
- movl $1,%edx
- movl 4(%esp),%ecx /* ecx = lock addr */
- xorl %eax,%eax
- xchgb %dl, (%ecx) /* using dl will avoid partial */
- testb %dl,%dl /* stalls on P6 ? */
- setz %al
-.lock_try_lockstat_patch_point:
- ret
- movl %gs:CPU_THREAD, %edx /* edx = thread addr */
- testl %eax, %eax
- jz 0f
- movl $LS_LOCK_TRY_ACQUIRE, %eax
- jmp lockstat_wrapper
-0:
- ret
- SET_SIZE(lock_try)
-
- ENTRY(lock_spin_try)
- movl $-1,%edx
- movl 4(%esp),%ecx /* ecx = lock addr */
- xorl %eax,%eax
- xchgb %dl, (%ecx) /* using dl will avoid partial */
- testb %dl,%dl /* stalls on P6 ? */
- setz %al
- ret
- SET_SIZE(lock_spin_try)
-
- ENTRY(ulock_try)
#ifdef DEBUG
- movl kernelbase, %eax
- cmpl %eax, 4(%esp) /* test uaddr < kernelbase */
- jb ulock_pass /* uaddr < kernelbase, proceed */
-
- pushl $.ulock_panic_msg
- call panic
-
-#endif /* DEBUG */
-
-ulock_pass:
- movl $1,%eax
- movl 4(%esp),%ecx
- xchgb %al, (%ecx)
- xorb $1, %al
- ret
- SET_SIZE(ulock_try)
-
-#endif /* !__amd64 */
-
-#ifdef DEBUG
.data
.ulock_panic_msg:
.string "ulock_try: Argument is above kernelbase"
.text
#endif /* DEBUG */
-#endif /* __lint */
-
/*
* lock_clear(lp)
* - unlock lock without changing interrupt priority level.
*/
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-void
-lock_clear(lock_t *lp)
-{}
-
-/* ARGSUSED */
-void
-ulock_clear(lock_t *lp)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(lock_clear)
movb $0, (%rdi)
.lock_clear_lockstat_patch_point:
ret
movq %rdi, %rsi /* rsi = lock addr */
@@ -225,68 +131,23 @@
ulock_clr:
movb $0, (%rdi)
ret
SET_SIZE(ulock_clear)
-#else
-
- ENTRY(lock_clear)
- movl 4(%esp), %eax
- movb $0, (%eax)
-.lock_clear_lockstat_patch_point:
- ret
- movl %gs:CPU_THREAD, %edx /* edx = thread addr */
- movl %eax, %ecx /* ecx = lock pointer */
- movl $LS_LOCK_CLEAR_RELEASE, %eax
- jmp lockstat_wrapper
- SET_SIZE(lock_clear)
-
- ENTRY(ulock_clear)
#ifdef DEBUG
- movl kernelbase, %ecx
- cmpl %ecx, 4(%esp) /* test uaddr < kernelbase */
- jb ulock_clr /* uaddr < kernelbase, proceed */
-
- pushl $.ulock_clear_msg
- call panic
-#endif
-
-ulock_clr:
- movl 4(%esp),%eax
- xorl %ecx,%ecx
- movb %cl, (%eax)
- ret
- SET_SIZE(ulock_clear)
-
-#endif /* !__amd64 */
-
-#ifdef DEBUG
.data
.ulock_clear_msg:
.string "ulock_clear: Argument is above kernelbase"
.text
#endif /* DEBUG */
-#endif /* __lint */
-
/*
* lock_set_spl(lock_t *lp, int new_pil, u_short *old_pil)
* Drops lp, sets pil to new_pil, stores old pil in *old_pil.
*/
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-void
-lock_set_spl(lock_t *lp, int new_pil, u_short *old_pil)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(lock_set_spl)
pushq %rbp
movq %rsp, %rbp
subq $32, %rsp
movl %esi, 8(%rsp) /* save priority level */
@@ -314,92 +175,25 @@
movl %eax, %ecx /* original pil */
leave /* unwind stack */
jmp lock_set_spl_spin
SET_SIZE(lock_set_spl)
-#else
-
- ENTRY(lock_set_spl)
- movl 8(%esp), %eax /* get priority level */
- pushl %eax
- call splr /* raise priority level */
- movl 8(%esp), %ecx /* ecx = lock addr */
- movl $-1, %edx
- addl $4, %esp
- xchgb %dl, (%ecx) /* try to set lock */
- testb %dl, %dl /* did we get the lock? ... */
- movl 12(%esp), %edx /* edx = olp pil addr (ZF unaffected) */
- jnz .lss_miss /* ... no, go to C for the hard case */
- movw %ax, (%edx) /* store old pil */
-.lock_set_spl_lockstat_patch_point:
- ret
- movl %gs:CPU_THREAD, %edx /* edx = thread addr*/
- movl $LS_LOCK_SET_SPL_ACQUIRE, %eax
- jmp lockstat_wrapper
-.lss_miss:
- pushl %eax /* original pil */
- pushl %edx /* old_pil addr */
- pushl 16(%esp) /* new_pil */
- pushl %ecx /* lock addr */
- call lock_set_spl_spin
- addl $16, %esp
- ret
- SET_SIZE(lock_set_spl)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
/*
* void
* lock_init(lp)
*/
-#if defined(__lint)
-
-/* ARGSUSED */
-void
-lock_init(lock_t *lp)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(lock_init)
movb $0, (%rdi)
ret
SET_SIZE(lock_init)
-#else
-
- ENTRY(lock_init)
- movl 4(%esp), %eax
- movb $0, (%eax)
- ret
- SET_SIZE(lock_init)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
/*
* void
* lock_set(lp)
*/
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-void
-lock_set(lock_t *lp)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(lock_set)
movb $-1, %dl
xchgb %dl, (%rdi) /* try to set lock */
testb %dl, %dl /* did we get it? */
jnz lock_set_spin /* no, go to C for the hard case */
@@ -409,44 +203,14 @@
movq %gs:CPU_THREAD, %rdx /* rdx = thread addr */
movl $LS_LOCK_SET_ACQUIRE, %edi
jmp lockstat_wrapper
SET_SIZE(lock_set)
-#else
-
- ENTRY(lock_set)
- movl 4(%esp), %ecx /* ecx = lock addr */
- movl $-1, %edx
- xchgb %dl, (%ecx) /* try to set lock */
- testb %dl, %dl /* did we get it? */
- jnz lock_set_spin /* no, go to C for the hard case */
-.lock_set_lockstat_patch_point:
- ret
- movl %gs:CPU_THREAD, %edx /* edx = thread addr */
- movl $LS_LOCK_SET_ACQUIRE, %eax
- jmp lockstat_wrapper
- SET_SIZE(lock_set)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
/*
* lock_clear_splx(lp, s)
*/
-#if defined(lint) || defined(__lint)
-
-/* ARGSUSED */
-void
-lock_clear_splx(lock_t *lp, int s)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(lock_clear_splx)
movb $0, (%rdi) /* clear lock */
.lock_clear_splx_lockstat_patch_point:
jmp 0f
0:
@@ -464,36 +228,10 @@
movq %gs:CPU_THREAD, %rdx /* rdx = thread addr */
movl $LS_LOCK_CLEAR_SPLX_RELEASE, %edi
jmp lockstat_wrapper
SET_SIZE(lock_clear_splx)
-#else
-
- ENTRY(lock_clear_splx)
- movl 4(%esp), %eax /* eax = lock addr */
- movb $0, (%eax) /* clear lock */
-.lock_clear_splx_lockstat_patch_point:
- jmp 0f
-0:
- movl 8(%esp), %edx /* edx = desired pil */
- movl %edx, 4(%esp) /* set spl arg up for splx */
- jmp splx /* let splx do it's thing */
-.lock_clear_splx_lockstat:
- movl 8(%esp), %edx /* edx = desired pil */
- pushl %ebp /* set up stack frame */
- movl %esp, %ebp
- pushl %edx
- call splx
- leave /* unwind stack */
- movl 4(%esp), %ecx /* ecx = lock pointer */
- movl %gs:CPU_THREAD, %edx /* edx = thread addr */
- movl $LS_LOCK_CLEAR_SPLX_RELEASE, %eax
- jmp lockstat_wrapper
- SET_SIZE(lock_clear_splx)
-
-#endif /* !__amd64 */
-
#if defined(__GNUC_AS__)
#define LOCK_CLEAR_SPLX_LOCKSTAT_PATCH_VAL \
(.lock_clear_splx_lockstat - .lock_clear_splx_lockstat_patch_point - 2)
#define LOCK_CLEAR_SPLX_LOCKSTAT_PATCH_POINT \
@@ -504,12 +242,10 @@
#define LOCK_CLEAR_SPLX_LOCKSTAT_PATCH_POINT \
[.lock_clear_splx_lockstat_patch_point + 1]
#endif
-#endif /* __lint */
-
/*
* mutex_enter() and mutex_exit().
*
* These routines handle the simple cases of mutex_enter() (adaptive
* lock, not held) and mutex_exit() (adaptive lock, held, no waiters).
@@ -529,36 +265,11 @@
* The lockstat code below is activated when the lockstat driver
* calls lockstat_hot_patch() to hot-patch the kernel mutex code.
* Note that we don't need to test lockstat_event_mask here -- we won't
* patch this code in unless we're gathering ADAPTIVE_HOLD lockstats.
*/
-#if defined(lint) || defined(__lint)
-/* ARGSUSED */
-void
-mutex_enter(kmutex_t *lp)
-{}
-
-/* ARGSUSED */
-int
-mutex_tryenter(kmutex_t *lp)
-{ return (0); }
-
-/* ARGSUSED */
-int
-mutex_adaptive_tryenter(mutex_impl_t *lp)
-{ return (0); }
-
-/* ARGSUSED */
-void
-mutex_exit(kmutex_t *lp)
-{}
-
-#else
-
-#if defined(__amd64)
-
ENTRY_NP(mutex_enter)
movq %gs:CPU_THREAD, %rdx /* rdx = thread ptr */
xorl %eax, %eax /* rax = 0 (unheld adaptive) */
lock
cmpxchgq %rdx, (%rdi)
@@ -716,209 +427,19 @@
.align CPTRSIZE
mutex_exit_critical_size:
.quad .mutex_exit_critical_end - mutex_exit_critical_start
SET_SIZE(mutex_exit_critical_size)
-#else
-
- ENTRY_NP(mutex_enter)
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl 4(%esp), %ecx /* ecx = lock ptr */
- xorl %eax, %eax /* eax = 0 (unheld adaptive) */
- lock
- cmpxchgl %edx, (%ecx)
- jnz mutex_vector_enter
-#if defined(OPTERON_WORKAROUND_6323525)
-.mutex_enter_lockstat_patch_point:
-.mutex_enter_6323525_patch_point:
- ret /* nop space for lfence */
- nop
- nop
-.mutex_enter_lockstat_6323525_patch_point: /* new patch point if lfence */
- nop
-#else /* OPTERON_WORKAROUND_6323525 */
-.mutex_enter_lockstat_patch_point:
- ret
-#endif /* OPTERON_WORKAROUND_6323525 */
- movl $LS_MUTEX_ENTER_ACQUIRE, %eax
- ALTENTRY(lockstat_wrapper) /* expects edx=thread, ecx=lock, */
- /* eax=lockstat event */
- pushl %ebp /* buy a frame */
- movl %esp, %ebp
- incb T_LOCKSTAT(%edx) /* curthread->t_lockstat++ */
- pushl %edx /* save thread pointer */
- movl $lockstat_probemap, %edx
- movl (%edx, %eax, DTRACE_IDSIZE), %eax
- testl %eax, %eax /* check for non-zero probe */
- jz 1f
- pushl %ecx /* push lock */
- pushl %eax /* push probe ID */
- call *lockstat_probe
- addl $8, %esp
-1:
- popl %edx /* restore thread pointer */
- decb T_LOCKSTAT(%edx) /* curthread->t_lockstat-- */
- movl $1, %eax /* return success if tryenter */
- popl %ebp /* pop off frame */
- ret
- SET_SIZE(lockstat_wrapper)
- SET_SIZE(mutex_enter)
-
- ENTRY(lockstat_wrapper_arg) /* expects edx=thread, ecx=lock, */
- /* eax=lockstat event, pushed arg */
- incb T_LOCKSTAT(%edx) /* curthread->t_lockstat++ */
- pushl %edx /* save thread pointer */
- movl $lockstat_probemap, %edx
- movl (%edx, %eax, DTRACE_IDSIZE), %eax
- testl %eax, %eax /* check for non-zero probe */
- jz 1f
- pushl %ebp /* save %ebp */
- pushl 8(%esp) /* push arg1 */
- movl %ebp, 12(%esp) /* fake up the stack frame */
- movl %esp, %ebp /* fake up base pointer */
- addl $12, %ebp /* adjust faked base pointer */
- pushl %ecx /* push lock */
- pushl %eax /* push probe ID */
- call *lockstat_probe
- addl $12, %esp /* adjust for arguments */
- popl %ebp /* pop frame */
-1:
- popl %edx /* restore thread pointer */
- decb T_LOCKSTAT(%edx) /* curthread->t_lockstat-- */
- movl $1, %eax /* return success if tryenter */
- addl $4, %esp /* pop argument */
- ret
- SET_SIZE(lockstat_wrapper_arg)
-
-
- ENTRY(mutex_tryenter)
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl 4(%esp), %ecx /* ecx = lock ptr */
- xorl %eax, %eax /* eax = 0 (unheld adaptive) */
- lock
- cmpxchgl %edx, (%ecx)
- jnz mutex_vector_tryenter
- movl %ecx, %eax
-#if defined(OPTERON_WORKAROUND_6323525)
-.mutex_tryenter_lockstat_patch_point:
-.mutex_tryenter_6323525_patch_point:
- ret /* nop space for lfence */
- nop
- nop
-.mutex_tryenter_lockstat_6323525_patch_point: /* new patch point if lfence */
- nop
-#else /* OPTERON_WORKAROUND_6323525 */
-.mutex_tryenter_lockstat_patch_point:
- ret
-#endif /* OPTERON_WORKAROUND_6323525 */
- movl $LS_MUTEX_ENTER_ACQUIRE, %eax
- jmp lockstat_wrapper
- SET_SIZE(mutex_tryenter)
-
- ENTRY(mutex_adaptive_tryenter)
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl 4(%esp), %ecx /* ecx = lock ptr */
- xorl %eax, %eax /* eax = 0 (unheld adaptive) */
- lock
- cmpxchgl %edx, (%ecx)
- jnz 0f
- movl %ecx, %eax
-#if defined(OPTERON_WORKAROUND_6323525)
-.mutex_atryenter_6323525_patch_point:
- ret /* nop space for lfence */
- nop
- nop
- nop
-#else /* OPTERON_WORKAROUND_6323525 */
- ret
-#endif /* OPTERON_WORKAROUND_6323525 */
-0:
- xorl %eax, %eax
- ret
- SET_SIZE(mutex_adaptive_tryenter)
-
- .globl mutex_owner_running_critical_start
-
- ENTRY(mutex_owner_running)
-mutex_owner_running_critical_start:
- movl 4(%esp), %eax /* get owner field */
- movl (%eax), %eax
- andl $MUTEX_THREAD, %eax /* remove waiters bit */
- cmpl $0, %eax /* if free, skip */
- je 1f /* go return 0 */
- movl T_CPU(%eax), %ecx /* get owner->t_cpu */
- movl CPU_THREAD(%ecx), %edx /* get t_cpu->cpu_thread */
-.mutex_owner_running_critical_end:
- cmpl %eax, %edx /* owner == running thread? */
- je 2f /* yes, go return cpu */
-1:
- xorl %eax, %eax /* return 0 */
- ret
-2:
- movl %ecx, %eax /* return cpu */
- ret
-
- SET_SIZE(mutex_owner_running)
-
- .globl mutex_owner_running_critical_size
- .type mutex_owner_running_critical_size, @object
- .align CPTRSIZE
-mutex_owner_running_critical_size:
- .long .mutex_owner_running_critical_end - mutex_owner_running_critical_start
- SET_SIZE(mutex_owner_running_critical_size)
-
- .globl mutex_exit_critical_start
-
- ENTRY(mutex_exit)
-mutex_exit_critical_start: /* If interrupted, restart here */
- movl %gs:CPU_THREAD, %edx
- movl 4(%esp), %ecx
- cmpl %edx, (%ecx)
- jne mutex_vector_exit /* wrong type or wrong owner */
- movl $0, (%ecx) /* clear owner AND lock */
-.mutex_exit_critical_end:
-.mutex_exit_lockstat_patch_point:
- ret
- movl $LS_MUTEX_EXIT_RELEASE, %eax
- jmp lockstat_wrapper
- SET_SIZE(mutex_exit)
-
- .globl mutex_exit_critical_size
- .type mutex_exit_critical_size, @object
- .align CPTRSIZE
-mutex_exit_critical_size:
- .long .mutex_exit_critical_end - mutex_exit_critical_start
- SET_SIZE(mutex_exit_critical_size)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
/*
* rw_enter() and rw_exit().
*
* These routines handle the simple cases of rw_enter (write-locking an unheld
* lock or read-locking a lock that's neither write-locked nor write-wanted)
* and rw_exit (no waiters or not the last reader). If anything complicated
* is going on we punt to rw_enter_sleep() and rw_exit_wakeup(), respectively.
*/
-#if defined(lint) || defined(__lint)
-/* ARGSUSED */
-void
-rw_enter(krwlock_t *lp, krw_t rw)
-{}
-
-/* ARGSUSED */
-void
-rw_exit(krwlock_t *lp)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(rw_enter)
movq %gs:CPU_THREAD, %rdx /* rdx = thread ptr */
cmpl $RW_WRITER, %esi
je .rw_write_enter
incl T_KPRI_REQ(%rdx) /* THREAD_KPRI_REQUEST() */
@@ -1001,122 +522,21 @@
movl $LS_RW_EXIT_RELEASE, %edi
movl $RW_WRITER, %edx
jmp lockstat_wrapper_arg
SET_SIZE(rw_exit)
-#else
-
- ENTRY(rw_enter)
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl 4(%esp), %ecx /* ecx = lock ptr */
- cmpl $RW_WRITER, 8(%esp)
- je .rw_write_enter
- incl T_KPRI_REQ(%edx) /* THREAD_KPRI_REQUEST() */
- movl (%ecx), %eax /* eax = old rw_wwwh value */
- testl $RW_WRITE_LOCKED|RW_WRITE_WANTED, %eax
- jnz rw_enter_sleep
- leal RW_READ_LOCK(%eax), %edx /* edx = new rw_wwwh value */
- lock
- cmpxchgl %edx, (%ecx) /* try to grab read lock */
- jnz rw_enter_sleep
-.rw_read_enter_lockstat_patch_point:
- ret
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl $LS_RW_ENTER_ACQUIRE, %eax
- pushl $RW_READER
- jmp lockstat_wrapper_arg
-.rw_write_enter:
- orl $RW_WRITE_LOCKED, %edx /* edx = write-locked value */
- xorl %eax, %eax /* eax = unheld value */
- lock
- cmpxchgl %edx, (%ecx) /* try to grab write lock */
- jnz rw_enter_sleep
-
#if defined(OPTERON_WORKAROUND_6323525)
-.rw_write_enter_lockstat_patch_point:
-.rw_write_enter_6323525_patch_point:
- ret
- nop
- nop
-.rw_write_enter_lockstat_6323525_patch_point:
- nop
-#else /* OPTERON_WORKAROUND_6323525 */
-.rw_write_enter_lockstat_patch_point:
- ret
-#endif /* OPTERON_WORKAROUND_6323525 */
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl $LS_RW_ENTER_ACQUIRE, %eax
- pushl $RW_WRITER
- jmp lockstat_wrapper_arg
- SET_SIZE(rw_enter)
-
- ENTRY(rw_exit)
- movl 4(%esp), %ecx /* ecx = lock ptr */
- movl (%ecx), %eax /* eax = old rw_wwwh value */
- cmpl $RW_READ_LOCK, %eax /* single-reader, no waiters? */
- jne .rw_not_single_reader
- xorl %edx, %edx /* edx = new value (unheld) */
-.rw_read_exit:
- lock
- cmpxchgl %edx, (%ecx) /* try to drop read lock */
- jnz rw_exit_wakeup
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- decl T_KPRI_REQ(%edx) /* THREAD_KPRI_RELEASE() */
-.rw_read_exit_lockstat_patch_point:
- ret
- movl $LS_RW_EXIT_RELEASE, %eax
- pushl $RW_READER
- jmp lockstat_wrapper_arg
-.rw_not_single_reader:
- testl $RW_WRITE_LOCKED, %eax /* write-locked or write-wanted? */
- jnz .rw_write_exit
- leal -RW_READ_LOCK(%eax), %edx /* edx = new value */
- cmpl $RW_READ_LOCK, %edx
- jge .rw_read_exit /* not last reader, safe to drop */
- jmp rw_exit_wakeup /* last reader with waiters */
-.rw_write_exit:
- movl %gs:CPU_THREAD, %eax /* eax = thread ptr */
- xorl %edx, %edx /* edx = new value (unheld) */
- orl $RW_WRITE_LOCKED, %eax /* eax = write-locked value */
- lock
- cmpxchgl %edx, (%ecx) /* try to drop read lock */
- jnz rw_exit_wakeup
-.rw_write_exit_lockstat_patch_point:
- ret
- movl %gs:CPU_THREAD, %edx /* edx = thread ptr */
- movl $LS_RW_EXIT_RELEASE, %eax
- pushl $RW_WRITER
- jmp lockstat_wrapper_arg
- SET_SIZE(rw_exit)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
-#if defined(OPTERON_WORKAROUND_6323525)
-#if defined(lint) || defined(__lint)
-
-int workaround_6323525_patched;
-
-void
-patch_workaround_6323525(void)
-{}
-
-#else /* lint */
-
/*
* If it is necessary to patch the lock enter routines with the lfence
* workaround, workaround_6323525_patched is set to a non-zero value so that
* the lockstat_hat_patch routine can patch to the new location of the 'ret'
* instruction.
*/
DGDEF3(workaround_6323525_patched, 4, 4)
.long 0
-#if defined(__amd64)
-
#define HOT_MUTEX_PATCH(srcaddr, dstaddr, size) \
movq $size, %rbx; \
movq $dstaddr, %r13; \
addq %rbx, %r13; \
movq $srcaddr, %r12; \
@@ -1176,73 +596,13 @@
lfence
ret
SET_SIZE(patch_workaround_6323525)
-#else /* __amd64 */
-
-#define HOT_MUTEX_PATCH(srcaddr, dstaddr, size) \
- movl $size, %ebx; \
- movl $srcaddr, %esi; \
- addl %ebx, %esi; \
- movl $dstaddr, %edi; \
- addl %ebx, %edi; \
-0: \
- decl %esi; \
- decl %edi; \
- pushl $1; \
- movzbl (%esi), %eax; \
- pushl %eax; \
- pushl %edi; \
- call hot_patch_kernel_text; \
- addl $12, %esp; \
- decl %ebx; \
- testl %ebx, %ebx; \
- jg 0b;
-
-
- /* see comments above */
- ENTRY_NP(patch_workaround_6323525)
- pushl %ebp
- movl %esp, %ebp
- pushl %ebx
- pushl %esi
- pushl %edi
-
- movl $1, workaround_6323525_patched
-
- HOT_MUTEX_PATCH(_lfence_insn, .mutex_enter_6323525_patch_point, 4)
- HOT_MUTEX_PATCH(_lfence_insn, .mutex_tryenter_6323525_patch_point, 4)
- HOT_MUTEX_PATCH(_lfence_insn, .mutex_atryenter_6323525_patch_point, 4)
- HOT_MUTEX_PATCH(_lfence_insn, .rw_write_enter_6323525_patch_point, 4)
-
- popl %edi
- popl %esi
- popl %ebx
- movl %ebp, %esp
- popl %ebp
- ret
-_lfence_insn:
- .byte 0xf, 0xae, 0xe8 / [lfence instruction]
- ret
- SET_SIZE(patch_workaround_6323525)
-
-#endif /* !__amd64 */
-#endif /* !lint */
#endif /* OPTERON_WORKAROUND_6323525 */
-#if defined(lint) || defined(__lint)
-
-void
-lockstat_hot_patch(void)
-{}
-
-#else
-
-#if defined(__amd64)
-
#define HOT_PATCH(addr, event, active_instr, normal_instr, len) \
movq $normal_instr, %rsi; \
movq $active_instr, %rdi; \
leaq lockstat_probemap(%rip), %rax; \
movl _MUL(event, DTRACE_IDSIZE)(%rax), %eax; \
@@ -1252,33 +612,13 @@
9: \
movq $len, %rdx; \
movq $addr, %rdi; \
call hot_patch_kernel_text
-#else
-
-#define HOT_PATCH(addr, event, active_instr, normal_instr, len) \
- movl $normal_instr, %ecx; \
- movl $active_instr, %edx; \
- movl $lockstat_probemap, %eax; \
- movl _MUL(event, DTRACE_IDSIZE)(%eax), %eax; \
- testl %eax, %eax; \
- jz . + 4; \
- movl %edx, %ecx; \
- pushl $len; \
- pushl %ecx; \
- pushl $addr; \
- call hot_patch_kernel_text; \
- addl $12, %esp;
-
-#endif /* !__amd64 */
-
ENTRY(lockstat_hot_patch)
-#if defined(__amd64)
pushq %rbp /* align stack properly */
movq %rsp, %rbp
-#endif /* __amd64 */
#if defined(OPTERON_WORKAROUND_6323525)
cmpl $0, workaround_6323525_patched
je 1f
HOT_PATCH(.mutex_enter_lockstat_6323525_patch_point,
@@ -1322,46 +662,14 @@
LS_LOCK_SET_SPL_ACQUIRE, NOP_INSTR, RET_INSTR, 1)
HOT_PATCH(LOCK_CLEAR_SPLX_LOCKSTAT_PATCH_POINT,
LS_LOCK_CLEAR_SPLX_RELEASE,
LOCK_CLEAR_SPLX_LOCKSTAT_PATCH_VAL, 0, 1);
-#if defined(__amd64)
leave /* unwind stack */
-#endif /* __amd64 */
ret
SET_SIZE(lockstat_hot_patch)
-#endif /* __lint */
-
-#if defined(lint) || defined(__lint)
-
-/* XX64 membar_*() should be inlines */
-
-void
-membar_sync(void)
-{}
-
-void
-membar_enter(void)
-{}
-
-void
-membar_exit(void)
-{}
-
-void
-membar_producer(void)
-{}
-
-void
-membar_consumer(void)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(membar_enter)
ALTENTRY(membar_exit)
ALTENTRY(membar_sync)
mfence /* lighter weight than lock; xorq $0,(%rsp) */
ret
@@ -1377,123 +685,32 @@
ENTRY(membar_consumer)
lfence
ret
SET_SIZE(membar_consumer)
-#else
-
- ENTRY(membar_enter)
- ALTENTRY(membar_exit)
- ALTENTRY(membar_sync)
- lock
- xorl $0, (%esp)
- ret
- SET_SIZE(membar_sync)
- SET_SIZE(membar_exit)
- SET_SIZE(membar_enter)
-
/*
- * On machines that support sfence and lfence, these
- * memory barriers can be more precisely implemented
- * without causing the whole world to stop
- */
- ENTRY(membar_producer)
- .globl _patch_sfence_ret
-_patch_sfence_ret: /* c.f. membar #StoreStore */
- lock
- xorl $0, (%esp)
- ret
- SET_SIZE(membar_producer)
-
- ENTRY(membar_consumer)
- .globl _patch_lfence_ret
-_patch_lfence_ret: /* c.f. membar #LoadLoad */
- lock
- xorl $0, (%esp)
- ret
- SET_SIZE(membar_consumer)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
-/*
* thread_onproc()
* Set thread in onproc state for the specified CPU.
* Also set the thread lock pointer to the CPU's onproc lock.
* Since the new lock isn't held, the store ordering is important.
* If not done in assembler, the compiler could reorder the stores.
*/
-#if defined(lint) || defined(__lint)
-void
-thread_onproc(kthread_id_t t, cpu_t *cp)
-{
- t->t_state = TS_ONPROC;
- t->t_lockp = &cp->cpu_thread_lock;
-}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(thread_onproc)
addq $CPU_THREAD_LOCK, %rsi /* pointer to disp_lock while running */
movl $ONPROC_THREAD, T_STATE(%rdi) /* set state to TS_ONPROC */
movq %rsi, T_LOCKP(%rdi) /* store new lock pointer */
ret
SET_SIZE(thread_onproc)
-#else
-
- ENTRY(thread_onproc)
- movl 4(%esp), %eax
- movl 8(%esp), %ecx
- addl $CPU_THREAD_LOCK, %ecx /* pointer to disp_lock while running */
- movl $ONPROC_THREAD, T_STATE(%eax) /* set state to TS_ONPROC */
- movl %ecx, T_LOCKP(%eax) /* store new lock pointer */
- ret
- SET_SIZE(thread_onproc)
-
-#endif /* !__amd64 */
-
-#endif /* __lint */
-
/*
* mutex_delay_default(void)
* Spins for approx a few hundred processor cycles and returns to caller.
*/
-#if defined(lint) || defined(__lint)
-
-void
-mutex_delay_default(void)
-{}
-
-#else /* __lint */
-
-#if defined(__amd64)
-
ENTRY(mutex_delay_default)
movq $92,%r11
0: decq %r11
jg 0b
ret
SET_SIZE(mutex_delay_default)
-#else
-
- ENTRY(mutex_delay_default)
- push %ebp
- movl %esp,%ebp
- andl $-16,%esp
- push %ebx
- movl $93,%ebx
-0: decl %ebx
- jg 0b
- pop %ebx
- leave
- ret
- SET_SIZE(mutex_delay_default)
-
-#endif /* !__amd64 */
-#endif /* __lint */