[src/trunk]: src/sys/arch Rename Xpreempt{recurse, resume} -> X{recurse, resume...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c86e140a11c2
branches:  trunk
changeset: 321769:c86e140a11c2
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Apr 04 22:52:58 2018 +0000

description:
Rename Xpreempt{recurse,resume} -> X{recurse,resume}_preempt so that
they fit the pattern. Also the debugger trap sniffer matches them
without adding special entries...
XXX: pullup-8.

diffstat:

 sys/arch/amd64/amd64/spl.S  |  14 +++++++-------
 sys/arch/i386/i386/spl.S    |  16 ++++++++--------
 sys/arch/x86/include/intr.h |   6 +++---
 sys/arch/x86/x86/intr.c     |   8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)

diffs (155 lines):

diff -r 0fa18ab17473 -r c86e140a11c2 sys/arch/amd64/amd64/spl.S
--- a/sys/arch/amd64/amd64/spl.S        Wed Apr 04 21:39:35 2018 +0000
+++ b/sys/arch/amd64/amd64/spl.S        Wed Apr 04 22:52:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spl.S,v 1.33 2018/04/02 22:29:33 mlelstv Exp $ */
+/*     $NetBSD: spl.S,v 1.34 2018/04/04 22:52:58 christos Exp $        */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -156,25 +156,25 @@
 
 
 /*
- * Xpreemptrecurse()
+ * Xrecurse_preempt()
  *
  * Handles preemption interrupts via Xspllower().
  */
-IDTVEC(preemptrecurse)
+IDTVEC(recurse_preempt)
        movl    $IPL_PREEMPT,CPUVAR(ILEVEL)
        sti
        xorq    %rdi,%rdi
        call    _C_LABEL(kpreempt)
        cli
        jmp     *%r13                   /* back to Xspllower */
-IDTVEC_END(preemptrecurse)
+IDTVEC_END(recurse_preempt)
 
 /*
- * Xpreemptresume()
+ * Xresume_preempt()
  *
  * Handles preemption interrupts via Xdoreti().
  */
-IDTVEC(preemptresume)
+IDTVEC(resume_preempt)
        movl    $IPL_PREEMPT,CPUVAR(ILEVEL)
        sti
        testq   $SEL_RPL,TF_CS(%rsp)
@@ -187,7 +187,7 @@
        call    _C_LABEL(preempt)       /* from user */
        cli
        jmp     *%r13                   /* back to Xdoreti */
-IDTVEC_END(preemptresume)
+IDTVEC_END(resume_preempt)
 
 /*
  * int splraise(int s);
diff -r 0fa18ab17473 -r c86e140a11c2 sys/arch/i386/i386/spl.S
--- a/sys/arch/i386/i386/spl.S  Wed Apr 04 21:39:35 2018 +0000
+++ b/sys/arch/i386/i386/spl.S  Wed Apr 04 22:52:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spl.S,v 1.42 2018/01/27 18:44:19 maxv Exp $    */
+/*     $NetBSD: spl.S,v 1.43 2018/04/04 22:52:58 christos Exp $        */
 
 /*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.42 2018/01/27 18:44:19 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.43 2018/04/04 22:52:58 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_spldebug.h"
@@ -389,11 +389,11 @@
 END(softint_trigger)
 
 /*
- * Xpreemptrecurse()
+ * Xrecurse_preempt()
  *
  * Handles preemption interrupts via Xspllower().
  */
-IDTVEC(preemptrecurse)
+IDTVEC(recurse_preempt)
        movl    $IPL_PREEMPT,CPUVAR(ILEVEL)
        sti
        pushl   $0
@@ -401,14 +401,14 @@
        addl    $4,%esp
        cli
        jmp     *%esi
-IDTVEC_END(preemptrecurse)
+IDTVEC_END(recurse_preempt)
 
 /*
- * Xpreemptresume()
+ * Xresume_preempt()
  *
  * Handles preemption interrupts via Xdoreti().
  */
-IDTVEC(preemptresume)
+IDTVEC(resume_preempt)
        movl    $IPL_PREEMPT,CPUVAR(ILEVEL)
        sti
        testb   $CHK_UPL,TF_CS(%esp)
@@ -423,5 +423,5 @@
        call    _C_LABEL(preempt)               /* from user */
        cli
        jmp     *%esi
-IDTVEC_END(preemptresume)
+IDTVEC_END(resume_preempt)
 #endif /* !XEN */
diff -r 0fa18ab17473 -r c86e140a11c2 sys/arch/x86/include/intr.h
--- a/sys/arch/x86/include/intr.h       Wed Apr 04 21:39:35 2018 +0000
+++ b/sys/arch/x86/include/intr.h       Wed Apr 04 22:52:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.h,v 1.54 2018/02/17 18:51:53 maxv Exp $   */
+/*     $NetBSD: intr.h,v 1.55 2018/04/04 22:52:58 christos Exp $       */
 
 /*-
  * Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -194,8 +194,8 @@
  */
 
 void Xsoftintr(void);
-void Xpreemptrecurse(void);
-void Xpreemptresume(void);
+void Xrecurse_preempt(void);
+void Xresume_preempt(void);
 
 extern struct intrstub legacy_stubs[];
 extern struct intrstub ioapic_edge_stubs[];
diff -r 0fa18ab17473 -r c86e140a11c2 sys/arch/x86/x86/intr.c
--- a/sys/arch/x86/x86/intr.c   Wed Apr 04 21:39:35 2018 +0000
+++ b/sys/arch/x86/x86/intr.c   Wed Apr 04 22:52:58 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intr.c,v 1.124 2018/03/26 02:30:08 knakahara Exp $     */
+/*     $NetBSD: intr.c,v 1.125 2018/04/04 22:52:59 christos Exp $      */
 
 /*
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.124 2018/03/26 02:30:08 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.125 2018/04/04 22:52:59 christos Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -1492,8 +1492,8 @@
 
 #if defined(__HAVE_PREEMPTION)
        isp = kmem_zalloc(sizeof(*isp), KM_SLEEP);
-       isp->is_recurse = Xpreemptrecurse;
-       isp->is_resume = Xpreemptresume;
+       isp->is_recurse = Xrecurse_preempt;
+       isp->is_resume = Xresume_preempt;
        fake_preempt_intrhand.ih_level = IPL_PREEMPT;
        isp->is_handlers = &fake_preempt_intrhand;
        isp->is_pic = &softintr_pic;