Use the same wisdom of sys/i386/i386/support.s 1.97 to remove obfuscation.

Pointed out by:	bde
This commit is contained in:
Jung-uk Kim 2007-03-30 18:27:57 +00:00
parent 641e4b2940
commit 6403d3a160
2 changed files with 16 additions and 17 deletions

View File

@ -690,12 +690,6 @@ NON_GPROF_ENTRY(__bb_init_func)
movq %rdi,bbhead
NON_GPROF_RET
#if defined(SMP) || !defined(_KERNEL)
#define MPLOCKED lock ;
#else
#define MPLOCKED
#endif
.text
futex_fault:
@ -713,7 +707,10 @@ ENTRY(futex_xchgl)
cmpq %rax, %rsi
ja futex_fault
MPLOCKED xchgl %edi, (%rsi)
#if defined(SMP) || !defined(_KERNEL)
lock
#endif
xchgl %edi, (%rsi)
movl %edi, (%rdx)
xorl %eax, %eax
movq %rax, PCB_ONFAULT(%r11)
@ -728,7 +725,10 @@ ENTRY(futex_addl)
cmpq %rax, %rsi
ja futex_fault
MPLOCKED xaddl %edi, (%rsi)
#if defined(SMP) || !defined(_KERNEL)
lock
#endif
xaddl %edi, (%rsi)
movl %edi, (%rdx)
xorl %eax, %eax
movq %rax, PCB_ONFAULT(%r11)

View File

@ -1524,12 +1524,6 @@ ENTRY(longjmp)
bbhead:
.long 0
#if defined(SMP) || !defined(_KERNEL)
#define MPLOCKED lock ;
#else
#define MPLOCKED
#endif
.text
NON_GPROF_ENTRY(__bb_init_func)
movl 4(%esp),%eax
@ -1557,7 +1551,10 @@ ENTRY(futex_xchgl)
cmpl $VM_MAXUSER_ADDRESS,%edx
ja futex_fault
MPLOCKED xchgl %eax, (%edx)
#if defined(SMP) || !defined(_KERNEL)
lock
#endif
xchgl %eax, (%edx)
movl 0xc(%esp), %edx
movl %eax, (%edx)
xorl %eax, %eax
@ -1575,7 +1572,10 @@ ENTRY(futex_addl)
cmpl $VM_MAXUSER_ADDRESS,%edx
ja futex_fault
MPLOCKED xaddl %eax, (%edx)
#if defined(SMP) || !defined(_KERNEL)
lock
#endif
xaddl %eax, (%edx)
movl 0xc(%esp), %edx
movl %eax, (%edx)
xorl %eax, %eax
@ -1583,4 +1583,3 @@ ENTRY(futex_addl)
movl PCPU(CURPCB), %edx
movl $0, PCB_ONFAULT(%edx)
ret