Module Name: src
Committed By: maxv
Date: Sat Jul 14 14:29:40 UTC 2018
Modified Files:
src/sys/arch/amd64/acpi: acpi_wakeup_low.S
src/sys/arch/amd64/amd64: amd64_trap.S copy.S cpufunc.S
linux32_sigcode.S lock_stubs.S locore.S netbsd32_sigcode.S spl.S
vector.S
src/sys/arch/amd64/stand/prekern: trap.S
src/sys/arch/i386/i386: bioscall.S copy.S cpufunc.S i386_trap.S
linux_sigcode.S lock_stubs.S locore.S vector.S
src/sys/arch/i386/pnpbios: pnpbioscall.S
Log Message:
Drop NENTRY() from the x86 kernels, use ENTRY(). With PMCs (and other hardware
tracing facilities) we have a much better ways of monitoring the CPU activity
than GPROF, without software modification.
Also I think GPROF has never worked, because the 'start' functions of both
i386 and amd64 use ENTRY(), and it would have caused a function call while the
kernel was not yet relocated.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amd64/acpi/acpi_wakeup_low.S
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/amd64/amd64/amd64_trap.S
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/amd64/copy.S
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amd64/amd64/linux32_sigcode.S
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amd64/amd64/lock_stubs.S
cvs rdiff -u -r1.170 -r1.171 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/amd64/netbsd32_sigcode.S
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/amd64/spl.S
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/amd64/stand/prekern/trap.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/i386/bioscall.S \
src/sys/arch/i386/i386/linux_sigcode.S
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/i386/copy.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/i386/cpufunc.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/i386/i386_trap.S
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/i386/i386/lock_stubs.S
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/pnpbios/pnpbioscall.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/acpi/acpi_wakeup_low.S
diff -u src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.9 src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.10
--- src/sys/arch/amd64/acpi/acpi_wakeup_low.S:1.9 Wed Nov 1 09:47:53 2017
+++ src/sys/arch/amd64/acpi/acpi_wakeup_low.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup_low.S,v 1.9 2017/11/01 09:47:53 maxv Exp $ */
+/* $NetBSD: acpi_wakeup_low.S,v 1.10 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 2007 Joerg Sonnenberger <[email protected]>
@@ -36,7 +36,7 @@
.text
.p2align 2, 0x90
-NENTRY(acpi_md_sleep_exit)
+ENTRY(acpi_md_sleep_exit)
lgdt ACPI_SUSPEND_GDT(%r8)
/* Reload fixed descriptors for new GDT */
@@ -113,7 +113,7 @@ NENTRY(acpi_md_sleep_exit)
END(acpi_md_sleep_exit)
.p2align 2, 0x90
-NENTRY(acpi_md_sleep_prepare)
+ENTRY(acpi_md_sleep_prepare)
movq CPUVAR(SELF),%r8
movq %rbx,ACPI_SUSPEND_REG+(1*8)(%r8)
movq %rbp,ACPI_SUSPEND_REG+(2*8)(%r8)
Index: src/sys/arch/amd64/amd64/amd64_trap.S
diff -u src/sys/arch/amd64/amd64/amd64_trap.S:1.43 src/sys/arch/amd64/amd64/amd64_trap.S:1.44
--- src/sys/arch/amd64/amd64/amd64_trap.S:1.43 Thu Jul 12 19:48:16 2018
+++ src/sys/arch/amd64/amd64/amd64_trap.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amd64_trap.S,v 1.43 2018/07/12 19:48:16 maxv Exp $ */
+/* $NetBSD: amd64_trap.S,v 1.44 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008, 2017 The NetBSD Foundation, Inc.
@@ -626,7 +626,7 @@ END(kernuser_reenter)
* All traps go through here. Call the generic trap handler, and
* check for ASTs afterwards.
*/
-NENTRY(alltraps)
+ENTRY(alltraps)
INTRENTRY
.Lalltraps_noentry:
STI(si)
Index: src/sys/arch/amd64/amd64/copy.S
diff -u src/sys/arch/amd64/amd64/copy.S:1.29 src/sys/arch/amd64/amd64/copy.S:1.30
--- src/sys/arch/amd64/amd64/copy.S:1.29 Sun Jan 7 12:42:46 2018
+++ src/sys/arch/amd64/amd64/copy.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.S,v 1.29 2018/01/07 12:42:46 maxv Exp $ */
+/* $NetBSD: copy.S,v 1.30 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -236,16 +236,16 @@ ENTRY(copyin)
DEFERRED_SWITCH_CALL
END(copyin)
-NENTRY(copy_efault)
+ENTRY(copy_efault)
movq $EFAULT,%rax
ret
END(copy_efault)
-NENTRY(kcopy_fault)
+ENTRY(kcopy_fault)
ret
END(kcopy_fault)
-NENTRY(copy_fault)
+ENTRY(copy_fault)
SMAP_ENABLE
ret
END(copy_fault)
@@ -547,7 +547,7 @@ ENTRY(ucas_efault)
ret
END(ucas_efault)
-NENTRY(ucas_fault)
+ENTRY(ucas_fault)
SMAP_ENABLE
ret
END(ucas_fault)
Index: src/sys/arch/amd64/amd64/cpufunc.S
diff -u src/sys/arch/amd64/amd64/cpufunc.S:1.31 src/sys/arch/amd64/amd64/cpufunc.S:1.32
--- src/sys/arch/amd64/amd64/cpufunc.S:1.31 Wed Nov 1 09:17:28 2017
+++ src/sys/arch/amd64/amd64/cpufunc.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.31 2017/11/01 09:17:28 maxv Exp $ */
+/* $NetBSD: cpufunc.S,v 1.32 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -344,7 +344,7 @@ END(wrxcr)
/*
* MSR operations fault handler
*/
-NENTRY(msr_onfault)
+ENTRY(msr_onfault)
movq CPUVAR(CURLWP), %r8
movq L_PCB(%r8), %r8
movq $0, PCB_ONFAULT(%r8)
@@ -499,7 +499,7 @@ ENTRY(x86_mwait)
ret
END(x86_mwait)
-NENTRY(x86_pause)
+ENTRY(x86_pause)
pause
ret
END(x86_pause)
Index: src/sys/arch/amd64/amd64/linux32_sigcode.S
diff -u src/sys/arch/amd64/amd64/linux32_sigcode.S:1.5 src/sys/arch/amd64/amd64/linux32_sigcode.S:1.6
--- src/sys/arch/amd64/amd64/linux32_sigcode.S:1.5 Wed Nov 1 09:38:43 2017
+++ src/sys/arch/amd64/amd64/linux32_sigcode.S Sat Jul 14 14:29:40 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_sigcode.S,v 1.5 2017/11/01 09:38:43 maxv Exp $ */
+/* $NetBSD: linux32_sigcode.S,v 1.6 2018/07/14 14:29:40 maxv Exp $ */
#include "assym.h"
#include <machine/asm.h>
.code32
-NENTRY(linux32_sigcode)
+ENTRY(linux32_sigcode)
call *LINUX32_SF_HANDLER(%esp)
leal LINUX32_SF_SC(%esp),%ebx /* scp */
pushl %eax
@@ -15,7 +15,7 @@ NENTRY(linux32_sigcode)
END(linux32_sigcode)
.balign 16
-NENTRY(linux32_rt_sigcode)
+ENTRY(linux32_rt_sigcode)
call *LINUX32_RT_SF_HANDLER(%esp)
leal LINUX32_RT_SF_UC(%esp),%ebx /* scp */
pushl %eax
Index: src/sys/arch/amd64/amd64/lock_stubs.S
diff -u src/sys/arch/amd64/amd64/lock_stubs.S:1.28 src/sys/arch/amd64/amd64/lock_stubs.S:1.29
--- src/sys/arch/amd64/amd64/lock_stubs.S:1.28 Sun Jan 7 13:43:23 2018
+++ src/sys/arch/amd64/amd64/lock_stubs.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.28 2018/01/07 13:43:23 maxv Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.29 2018/07/14 14:29:40 maxv Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -307,7 +307,7 @@ ENTRY(__cpu_simple_lock_init)
ret
END(__cpu_simple_lock_init)
-NENTRY(__cpu_simple_lock)
+ENTRY(__cpu_simple_lock)
movl $0x0100, %eax
1:
LOCK(6)
@@ -324,7 +324,7 @@ NENTRY(__cpu_simple_lock)
jmp 2b
END(__cpu_simple_lock)
-NENTRY(__cpu_simple_unlock)
+ENTRY(__cpu_simple_unlock)
movb $0, (%rdi)
ret
END(__cpu_simple_unlock)
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.170 src/sys/arch/amd64/amd64/locore.S:1.171
--- src/sys/arch/amd64/amd64/locore.S:1.170 Thu Jul 12 19:48:16 2018
+++ src/sys/arch/amd64/amd64/locore.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.170 2018/07/12 19:48:16 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.171 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -1278,7 +1278,7 @@ END(savectx)
/*
* Syscall handler.
*/
-NENTRY(handle_syscall)
+ENTRY(handle_syscall)
STI(si)
movq CPUVAR(CURLWP),%r14
@@ -1356,7 +1356,7 @@ END(handle_syscall)
* This is a trampoline function pushed run by newly created LWPs
* in order to do additional setup in their context.
*/
-NENTRY(lwp_trampoline)
+ENTRY(lwp_trampoline)
movq %rbp,%rsi
movq %rbp,%r14 /* for .Lsyscall_checkast */
movq %rax,%rdi
Index: src/sys/arch/amd64/amd64/netbsd32_sigcode.S
diff -u src/sys/arch/amd64/amd64/netbsd32_sigcode.S:1.8 src/sys/arch/amd64/amd64/netbsd32_sigcode.S:1.9
--- src/sys/arch/amd64/amd64/netbsd32_sigcode.S:1.8 Wed Nov 1 09:38:43 2017
+++ src/sys/arch/amd64/amd64/netbsd32_sigcode.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_sigcode.S,v 1.8 2017/11/01 09:38:43 maxv Exp $ */
+/* $NetBSD: netbsd32_sigcode.S,v 1.9 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
* Signal trampoline for 1.6 compatibility; copied to top of user stack.
*/
.code32
-NENTRY(netbsd32_sigcode)
+ENTRY(netbsd32_sigcode)
/*
* Handler has returned here as if we called it. The sigcontext
* is on the stack after the 3 args "we" pushed.
Index: src/sys/arch/amd64/amd64/spl.S
diff -u src/sys/arch/amd64/amd64/spl.S:1.34 src/sys/arch/amd64/amd64/spl.S:1.35
--- src/sys/arch/amd64/amd64/spl.S:1.34 Wed Apr 4 22:52:58 2018
+++ src/sys/arch/amd64/amd64/spl.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.34 2018/04/04 22:52:58 christos Exp $ */
+/* $NetBSD: spl.S,v 1.35 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -137,7 +137,7 @@ IDTVEC_END(softintr)
*
* %rax prevlwp from cpu_switchto()
*/
-NENTRY(softintr_ret)
+ENTRY(softintr_ret)
incl CPUVAR(MTX_COUNT) /* re-adjust after mi_switch */
movl $0,L_CTXSWTCH(%rax) /* %rax from cpu_switchto */
cli
@@ -149,7 +149,7 @@ END(softintr_ret)
*
* Software interrupt registration.
*/
-NENTRY(softint_trigger)
+ENTRY(softint_trigger)
orl %edi,CPUVAR(IPENDING) /* atomic on local cpu */
ret
END(softint_trigger)
Index: src/sys/arch/amd64/amd64/vector.S
diff -u src/sys/arch/amd64/amd64/vector.S:1.63 src/sys/arch/amd64/amd64/vector.S:1.64
--- src/sys/arch/amd64/amd64/vector.S:1.63 Wed Jun 20 11:45:25 2018
+++ src/sys/arch/amd64/amd64/vector.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.63 2018/06/20 11:45:25 maxv Exp $ */
+/* $NetBSD: vector.S,v 1.64 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -755,7 +755,7 @@ END(xenev_stubs)
*/
/* Hypervisor callback */
-NENTRY(hypervisor_callback)
+ENTRY(hypervisor_callback)
movq (%rsp),%rcx
movq 8(%rsp),%r11
addq $16,%rsp
@@ -773,7 +773,7 @@ NENTRY(hypervisor_callback)
END(hypervisor_callback)
/* Panic? */
-NENTRY(failsafe_callback)
+ENTRY(failsafe_callback)
movq (%rsp),%rcx
movq 8(%rsp),%r11
addq $16,%rsp
Index: src/sys/arch/amd64/stand/prekern/trap.S
diff -u src/sys/arch/amd64/stand/prekern/trap.S:1.3 src/sys/arch/amd64/stand/prekern/trap.S:1.4
--- src/sys/arch/amd64/stand/prekern/trap.S:1.3 Fri May 25 15:52:11 2018
+++ src/sys/arch/amd64/stand/prekern/trap.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.S,v 1.3 2018/05/25 15:52:11 maxv Exp $ */
+/* $NetBSD: trap.S,v 1.4 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved.
@@ -167,7 +167,7 @@ IDTVEC_END(trap20)
* sf_rsp
* sf_ss
*/
-NENTRY(alltraps)
+ENTRY(alltraps)
movq %rsp,%rdi
call _C_LABEL(trap)
/* NOTREACHED */
Index: src/sys/arch/i386/i386/bioscall.S
diff -u src/sys/arch/i386/i386/bioscall.S:1.9 src/sys/arch/i386/i386/bioscall.S:1.10
--- src/sys/arch/i386/i386/bioscall.S:1.9 Sat Jul 24 00:45:54 2010
+++ src/sys/arch/i386/i386/bioscall.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bioscall.S,v 1.9 2010/07/24 00:45:54 jym Exp $ */
+/* $NetBSD: bioscall.S,v 1.10 2018/07/14 14:29:40 maxv Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: bioscall.S,v 1.9 2010/07/24 00:45:54 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bioscall.S,v 1.10 2018/07/14 14:29:40 maxv Exp $");
#include <machine/bioscall.h>
@@ -63,7 +63,7 @@ _C_LABEL(biostramp_image_size):
* Fills in *regs with registers as returned by BIOS.
*/
/* LINTSTUB: Func: void bioscall(int function, struct bioscallregs *regs) */
-NENTRY(bioscall)
+ENTRY(bioscall)
pushl %ebp
movl %esp,%ebp /* set up frame ptr */
Index: src/sys/arch/i386/i386/linux_sigcode.S
diff -u src/sys/arch/i386/i386/linux_sigcode.S:1.9 src/sys/arch/i386/i386/linux_sigcode.S:1.10
--- src/sys/arch/i386/i386/linux_sigcode.S:1.9 Sat Aug 12 07:21:57 2017
+++ src/sys/arch/i386/i386/linux_sigcode.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sigcode.S,v 1.9 2017/08/12 07:21:57 maxv Exp $ */
+/* $NetBSD: linux_sigcode.S,v 1.10 2018/07/14 14:29:40 maxv Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sigcode.S,v 1.9 2017/08/12 07:21:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sigcode.S,v 1.10 2018/07/14 14:29:40 maxv Exp $");
#include "assym.h"
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_sigcod
* Signal trampoline; copied to top of user stack.
*/
/* LINTSTUB: Var: char linux_sigcode[1], linux_esigcode[1]; */
-NENTRY(linux_sigcode)
+ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
leal LINUX_SIGF_SC(%esp),%ebx # scp (the call may have clobbered the
# copy at SIGF_SCP(%esp))
@@ -87,7 +87,7 @@ NENTRY(linux_sigcode)
int $0x80 # exit if sigreturn fails
/* LINTSTUB: Var: char linux_rt_sigcode[1]; */
-NENTRY(linux_rt_sigcode)
+ENTRY(linux_rt_sigcode)
call *LINUX_RT_SIGF_HANDLER(%esp)
leal LINUX_RT_SIGF_UC(%esp),%ebx # scp (the call may have clobbered the
# copy at SIGF_SCP(%esp))
Index: src/sys/arch/i386/i386/copy.S
diff -u src/sys/arch/i386/i386/copy.S:1.27 src/sys/arch/i386/i386/copy.S:1.28
--- src/sys/arch/i386/i386/copy.S:1.27 Sat Jan 27 09:33:25 2018
+++ src/sys/arch/i386/i386/copy.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: copy.S,v 1.27 2018/01/27 09:33:25 maxv Exp $ */
+/* $NetBSD: copy.S,v 1.28 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 1998, 2000, 2004, 2008 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: copy.S,v 1.27 2018/01/27 09:33:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: copy.S,v 1.28 2018/07/14 14:29:40 maxv Exp $");
#include "assym.h"
@@ -106,7 +106,7 @@ LABEL(x86_copyfunc_start)
* pmap on returning, because a preemption occurred within one of the
* copy functions.
*/
-NENTRY(do_pmap_load)
+ENTRY(do_pmap_load)
pushl %ebp
movl %esp,%ebp
pushl %ebx
@@ -295,7 +295,7 @@ ENTRY(copyin)
DEFERRED_SWITCH_CALL
END(copyin)
-NENTRY(copy_efault)
+ENTRY(copy_efault)
movl $EFAULT,%eax
popl %edi
popl %esi
@@ -308,20 +308,20 @@ END(copy_efault)
* they're distinguished for lazy pmap switching. see trap().
*/
-NENTRY(kcopy_fault)
+ENTRY(kcopy_fault)
popl %edi
popl %esi
ret
END(kcopy_fault)
-NENTRY(copy_fault)
+ENTRY(copy_fault)
SMAP_ENABLE
popl %edi
popl %esi
ret
END(copy_fault)
-NENTRY(return_address_fault)
+ENTRY(return_address_fault)
movl $0,PCB_ONFAULT(%edx)
movl $0,%eax
ret
@@ -433,12 +433,12 @@ ENTRY(copyinstr)
DEFERRED_SWITCH_CALL
END(copyinstr)
-NENTRY(copystr_efault)
+ENTRY(copystr_efault)
movl $EFAULT,%eax
jmp copystr_return
END(copystr_efault)
-NENTRY(copystr_fault)
+ENTRY(copystr_fault)
SMAP_ENABLE
copystr_return:
/* Set *lencopied and return %eax. */
@@ -569,7 +569,7 @@ END(fubyte)
/*
* Handle faults from [fs]u*(). Clean up and return -1.
*/
-NENTRY(fusufault)
+ENTRY(fusufault)
SMAP_ENABLE
movl $0,PCB_ONFAULT(%ecx)
movl $-1,%eax
@@ -581,7 +581,7 @@ END(fusufault)
* fusufault() in that trap() will recognize it and return immediately rather
* than trying to page fault.
*/
-NENTRY(fusubail)
+ENTRY(fusubail)
SMAP_ENABLE
movl $0,PCB_ONFAULT(%ecx)
movl $-1,%eax
@@ -591,7 +591,7 @@ END(fusubail)
/*
* Handle earlier faults from [fs]u*(), due to our of range addresses.
*/
-NENTRY(fusuaddrfault)
+ENTRY(fusuaddrfault)
movl $-1,%eax
ret
END(fusuaddrfault)
@@ -679,12 +679,12 @@ ENTRY(ucas_32)
DEFERRED_SWITCH_CALL
END(ucas_32)
-NENTRY(ucas_efault)
+ENTRY(ucas_efault)
movl $EFAULT,%eax
ret
END(ucas_efault)
-NENTRY(ucas_fault)
+ENTRY(ucas_fault)
SMAP_ENABLE
ret
END(ucas_fault)
@@ -758,13 +758,13 @@ ENTRY(x86_copyargs)
DEFERRED_SWITCH_CALL
END(x86_copyargs)
-NENTRY(x86_copyargs_efault)
+ENTRY(x86_copyargs_efault)
movl $EFAULT,%eax
popl %esi
ret
END(x86_copyargs_efault)
-NENTRY(x86_copyargs_fault)
+ENTRY(x86_copyargs_fault)
SMAP_ENABLE
popl %esi
ret
Index: src/sys/arch/i386/i386/cpufunc.S
diff -u src/sys/arch/i386/i386/cpufunc.S:1.21 src/sys/arch/i386/i386/cpufunc.S:1.22
--- src/sys/arch/i386/i386/cpufunc.S:1.21 Tue Sep 16 09:42:47 2014
+++ src/sys/arch/i386/i386/cpufunc.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.S,v 1.21 2014/09/16 09:42:47 mrg Exp $ */
+/* $NetBSD: cpufunc.S,v 1.22 2018/07/14 14:29:40 maxv Exp $ */
/*-
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/errno.h>
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.21 2014/09/16 09:42:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.22 2018/07/14 14:29:40 maxv Exp $");
#include "opt_xen.h"
@@ -182,7 +182,7 @@ END(wrxcr)
/*
* MSR operations fault handler
*/
-NENTRY(msr_onfault)
+ENTRY(msr_onfault)
movl CPUVAR(CURLWP), %ecx
movl L_PCB(%ecx), %ecx
movl $0, PCB_ONFAULT(%ecx)
Index: src/sys/arch/i386/i386/i386_trap.S
diff -u src/sys/arch/i386/i386/i386_trap.S:1.14 src/sys/arch/i386/i386/i386_trap.S:1.15
--- src/sys/arch/i386/i386/i386_trap.S:1.14 Wed May 16 08:16:36 2018
+++ src/sys/arch/i386/i386/i386_trap.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i386_trap.S,v 1.14 2018/05/16 08:16:36 maxv Exp $ */
+/* $NetBSD: i386_trap.S,v 1.15 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
#if 0
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.14 2018/05/16 08:16:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.15 2018/07/14 14:29:40 maxv Exp $");
#endif
/*
@@ -403,7 +403,7 @@ LABEL(trap_return_fault_return)
END(trap_return_fault_return)
/* LINTSTUB: Ignore */
-NENTRY(alltraps)
+ENTRY(alltraps)
INTRENTRY
STI(%eax)
calltrap:
Index: src/sys/arch/i386/i386/lock_stubs.S
diff -u src/sys/arch/i386/i386/lock_stubs.S:1.28 src/sys/arch/i386/i386/lock_stubs.S:1.29
--- src/sys/arch/i386/i386/lock_stubs.S:1.28 Sun Jan 7 13:43:24 2018
+++ src/sys/arch/i386/i386/lock_stubs.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.28 2018/01/07 13:43:24 maxv Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.29 2018/07/14 14:29:40 maxv Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.28 2018/01/07 13:43:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.S,v 1.29 2018/07/14 14:29:40 maxv Exp $");
#include "opt_lockdebug.h"
@@ -329,7 +329,7 @@ ENTRY(__cpu_simple_lock_init)
ret
END(__cpu_simple_lock_init)
-NENTRY(__cpu_simple_lock)
+ENTRY(__cpu_simple_lock)
movl 4(%esp), %edx
movl $0x0100, %eax
1:
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.158 src/sys/arch/i386/i386/locore.S:1.159
--- src/sys/arch/i386/i386/locore.S:1.158 Fri Jun 29 19:21:43 2018
+++ src/sys/arch/i386/i386/locore.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.158 2018/06/29 19:21:43 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.159 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.158 2018/06/29 19:21:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.159 2018/07/14 14:29:40 maxv Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -934,7 +934,7 @@ END(hypercall_page)
* this only happens at run time when the GDT is resized.
*/
/* LINTSTUB: Func: void lgdt_finish(void) */
-NENTRY(lgdt_finish)
+ENTRY(lgdt_finish)
movl $GSEL(GDATA_SEL, SEL_KPL),%eax
movw %ax,%ds
movw %ax,%es
@@ -961,7 +961,7 @@ END(lgdt_finish)
* stub to call.
* NOTE: This function does not have a normal calling sequence!
*/
-NENTRY(lwp_trampoline)
+ENTRY(lwp_trampoline)
movl %ebp,%edi /* for .Lsyscall_checkast */
xorl %ebp,%ebp
pushl %edi
@@ -981,7 +981,7 @@ END(lwp_trampoline)
* Signal trampoline; copied to top of user stack. Used only for
* compatibility with old releases of NetBSD.
*/
-NENTRY(sigcode)
+ENTRY(sigcode)
/*
* Handler has returned here as if we called it. The sigcontext
* is on the stack after the 3 args "we" pushed.
@@ -1336,7 +1336,7 @@ IDTVEC_END(syscall)
* Used when checking for the FDIV bug on first generations pentiums.
* Anything 120MHz or above is fine.
*/
-NENTRY(npx586bug1)
+ENTRY(npx586bug1)
fildl 4(%esp) /* x */
fildl 8(%esp) /* y */
fld %st(1)
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.77 src/sys/arch/i386/i386/vector.S:1.78
--- src/sys/arch/i386/i386/vector.S:1.77 Tue Apr 3 07:20:52 2018
+++ src/sys/arch/i386/i386/vector.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.77 2018/04/03 07:20:52 christos Exp $ */
+/* $NetBSD: vector.S,v 1.78 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.77 2018/04/03 07:20:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.78 2018/07/14 14:29:40 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -1017,7 +1017,7 @@ END(xenev_stubs)
* existing activation in its critical region -- if so, we pop the current
* activation and restart the handler using the previous one.
*/
-NENTRY(hypervisor_callback)
+ENTRY(hypervisor_callback)
pushl $0 /* dummy error code */
pushl $T_ASTFLT
INTRENTRY
@@ -1084,7 +1084,7 @@ END(hypervisor_callback)
/*
* Hypervisor uses this for application faults while it executes.
*/
-NENTRY(failsafe_callback)
+ENTRY(failsafe_callback)
pop %ds
pop %es
pop %fs
Index: src/sys/arch/i386/pnpbios/pnpbioscall.S
diff -u src/sys/arch/i386/pnpbios/pnpbioscall.S:1.2 src/sys/arch/i386/pnpbios/pnpbioscall.S:1.3
--- src/sys/arch/i386/pnpbios/pnpbioscall.S:1.2 Tue Dec 11 23:06:14 2007
+++ src/sys/arch/i386/pnpbios/pnpbioscall.S Sat Jul 14 14:29:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbioscall.S,v 1.2 2007/12/11 23:06:14 lukem Exp $ */
+/* $NetBSD: pnpbioscall.S,v 1.3 2018/07/14 14:29:40 maxv Exp $ */
/*
* Copyright (c) 1999
* Matthias Drochner. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbioscall.S,v 1.2 2007/12/11 23:06:14 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbioscall.S,v 1.3 2018/07/14 14:29:40 maxv Exp $");
#include "assym.h"
#include <machine/segments.h>
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: pnpbioscall.
saveesp:
.space 4
-NENTRY(pnpbioscall)
+ENTRY(pnpbioscall)
pushl %ebp
movl %esp, %ebp
/*
@@ -52,7 +52,7 @@ NENTRY(pnpbioscall)
popl %ebp
ret
-NENTRY(pnpbiostramp)
+ENTRY(pnpbiostramp)
pushl %ebx
/* save current stack pointer */
