[src/trunk]: src/sys/arch Rename the DDB IPI IDT vectors for consistency. ok ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Rename the DDB IPI IDT vectors for consistency. ok ...
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 09:53:14 +0000
details:   https://anonhg.NetBSD.org/src/rev/9618f3046969
branches:  trunk
changeset: 831508:9618f3046969
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Apr 03 07:20:52 2018 +0000

description:
Rename the DDB IPI IDT vectors for consistency. ok maxv@

diffstat:

 sys/arch/amd64/amd64/db_interface.c |  10 +++++-----
 sys/arch/amd64/amd64/vector.S       |  22 +++++++++++-----------
 sys/arch/i386/i386/db_interface.c   |  10 +++++-----
 sys/arch/i386/i386/machdep.c        |   8 ++++----
 sys/arch/i386/i386/vector.S         |  12 ++++++------
 sys/arch/x86/x86/lapic.c            |   8 ++++----
 6 files changed, 35 insertions(+), 35 deletions(-)

diffs (258 lines):

diff -r b1227f50f254 -r 9618f3046969 sys/arch/amd64/amd64/db_interface.c
--- a/sys/arch/amd64/amd64/db_interface.c       Tue Apr 03 06:11:14 2018 +0000
+++ b/sys/arch/amd64/amd64/db_interface.c       Tue Apr 03 07:20:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.32 2018/02/13 06:44:13 maxv Exp $   */
+/*     $NetBSD: db_interface.c,v 1.33 2018/04/03 07:20:52 christos Exp $       */
 
 /*
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.32 2018/02/13 06:44:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.33 2018/04/03 07:20:52 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -99,7 +99,7 @@
 int ddb_cpu = NOCPU;
 
 typedef void (vector)(void);
-extern vector Xintrddbipi, Xx2apic_intrddbipi;
+extern vector Xintr_ddbipi, Xintr_x2apic_ddbipi;
 
 void
 db_machine_init(void)
@@ -107,10 +107,10 @@
 
 #ifdef MULTIPROCESSOR
 #ifndef XEN
-       vector *handler = &Xintrddbipi;
+       vector *handler = &Xintr_ddbipi;
 #if NLAPIC > 0
        if (lapic_is_x2apic())
-               handler = &Xx2apic_intrddbipi;
+               handler = &Xintr_x2apic_ddbipi;
 #endif
        ddb_vec = idt_vec_alloc(0xf0, 0xff);
        setgate(&idt[ddb_vec], handler, 1, SDT_SYS386IGT, SEL_KPL,
diff -r b1227f50f254 -r 9618f3046969 sys/arch/amd64/amd64/vector.S
--- a/sys/arch/amd64/amd64/vector.S     Tue Apr 03 06:11:14 2018 +0000
+++ b/sys/arch/amd64/amd64/vector.S     Tue Apr 03 07:20:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vector.S,v 1.61 2018/03/16 08:48:34 maxv Exp $ */
+/*     $NetBSD: vector.S,v 1.62 2018/04/03 07:20:52 christos Exp $     */
 
 /*
  * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -161,7 +161,7 @@
        TEXT_USER_END
 
 #if defined(DDB)
-IDTVEC(handle_intrddbipi)
+IDTVEC(handle_ddbipi)
        movl    $0xf,%eax
        movq    %rax,%cr8
        movq    _C_LABEL(local_apic_va),%rbx
@@ -171,8 +171,8 @@
        xorl    %eax,%eax
        movq    %rax,%cr8
        INTRFASTEXIT
-IDTVEC_END(handle_intrddbipi)
-IDTVEC(handle_x2apic_intrddbipi)
+IDTVEC_END(handle_ddbipi)
+IDTVEC(handle_x2apic_ddbipi)
        movl    $0xf,%eax
        movq    %rax,%cr8
        movl    $(MSR_X2APIC_BASE + MSR_X2APIC_EOI),%ecx
@@ -184,21 +184,21 @@
        xorl    %eax,%eax
        movq    %rax,%cr8
        INTRFASTEXIT
-IDTVEC_END(handle_x2apic_intrddbipi)
+IDTVEC_END(handle_x2apic_ddbipi)
 
        TEXT_USER_BEGIN
-IDTVEC(intrddbipi)
+IDTVEC(intr_ddbipi)
        pushq   $0
        pushq   $T_BPTFLT
        INTRENTRY
-       jmp     _C_LABEL(Xhandle_intrddbipi)
-IDTVEC_END(intrddbipi)
-IDTVEC(x2apic_intrddbipi)
+       jmp     _C_LABEL(Xhandle_ddbipi)
+IDTVEC_END(intr_ddbipi)
+IDTVEC(intr_x2apic_ddbipi)
        pushq   $0
        pushq   $T_BPTFLT
        INTRENTRY
-       jmp     _C_LABEL(Xhandle_x2apic_intrddbipi)
-IDTVEC_END(x2apic_intrddbipi)
+       jmp     _C_LABEL(Xhandle_x2apic_ddbipi)
+IDTVEC_END(intr_x2apic_ddbipi)
        TEXT_USER_END
 
 #endif /* DDB */
diff -r b1227f50f254 -r 9618f3046969 sys/arch/i386/i386/db_interface.c
--- a/sys/arch/i386/i386/db_interface.c Tue Apr 03 06:11:14 2018 +0000
+++ b/sys/arch/i386/i386/db_interface.c Tue Apr 03 07:20:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.81 2018/02/13 06:44:13 maxv Exp $   */
+/*     $NetBSD: db_interface.c,v 1.82 2018/04/03 07:20:52 christos Exp $       */
 
 /*
  * Mach Operating System
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.81 2018/02/13 06:44:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.82 2018/04/03 07:20:52 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -105,7 +105,7 @@
 int ddb_cpu = NOCPU;
 
 typedef void (vector)(void);
-extern vector Xintrddbipi, Xx2apic_intrddbipi;
+extern vector Xintr_ddbipi, Xintr_x2apic_ddbipi;
 
 void
 db_machine_init(void)
@@ -113,10 +113,10 @@
 
 #ifdef MULTIPROCESSOR
 #ifndef XEN
-       vector *handler = &Xintrddbipi;
+       vector *handler = &Xintr_ddbipi;
 #if NLAPIC > 0
        if (lapic_is_x2apic())
-               handler = &Xx2apic_intrddbipi;
+               handler = &Xintr_x2apic_ddbipi;
 #endif
        ddb_vec = idt_vec_alloc(0xf0, 0xff);
        idt_vec_set(ddb_vec, handler);
diff -r b1227f50f254 -r 9618f3046969 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Tue Apr 03 06:11:14 2018 +0000
+++ b/sys/arch/i386/i386/machdep.c      Tue Apr 03 07:20:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.804 2018/03/16 12:48:54 maxv Exp $       */
+/*     $NetBSD: machdep.c,v 1.805 2018/04/03 07:20:52 christos Exp $   */
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009, 2017
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.804 2018/03/16 12:48:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.805 2018/04/03 07:20:52 christos Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_freebsd.h"
@@ -564,7 +564,7 @@
 
 extern vector IDTVEC(tss_trap08);
 #if defined(DDB) && defined(MULTIPROCESSOR)
-extern vector Xintrddbipi, Xx2apic_intrddbipi;
+extern vector Xintr_ddbipi, Xintr_x2apic_ddbipi;
 extern int ddb_vec;
 #endif
 
@@ -598,7 +598,7 @@
        ddbipi_stack = (void *)uvm_km_alloc(kernel_map, USPACE, 0,
            UVM_KMF_WIRED);
        tss_init(&ci->ci_tss->ddbipi_tss, ddbipi_stack,
-           x2apic_mode ? Xx2apic_intrddbipi : Xintrddbipi);
+           x2apic_mode ? Xintr_x2apic_ddbipi : Xintr_ddbipi);
 
        setsegment(&sd, &ci->ci_tss->ddbipi_tss, sizeof(struct i386tss) - 1,
            SDT_SYS386TSS, SEL_KPL, 0, 0);
diff -r b1227f50f254 -r 9618f3046969 sys/arch/i386/i386/vector.S
--- a/sys/arch/i386/i386/vector.S       Tue Apr 03 06:11:14 2018 +0000
+++ b/sys/arch/i386/i386/vector.S       Tue Apr 03 07:20:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vector.S,v 1.76 2018/03/16 12:48:54 maxv Exp $ */
+/*     $NetBSD: vector.S,v 1.77 2018/04/03 07:20:52 christos Exp $     */
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.76 2018/03/16 12:48:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.77 2018/04/03 07:20:52 christos Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -221,7 +221,7 @@
  * No need to use INTRENTRY, since we were brought here through a task-gate
  * which triggered a hardware context switch and saved the GPRs in the TSS.
  */
-IDTVEC(intrddbipi)
+IDTVEC(intr_ddbipi)
 1:
        str     %ax
        GET_TSS
@@ -239,9 +239,9 @@
        movl    $0,LAPIC_TPRI(%ebx)
        iret
        jmp     1b
-IDTVEC_END(intrddbipi)
+IDTVEC_END(intr_ddbipi)
 
-IDTVEC(x2apic_intrddbipi)
+IDTVEC(intr_x2apic_ddbipi)
 1:
        str     %ax
        GET_TSS
@@ -265,7 +265,7 @@
        wrmsr
        iret
        jmp     1b
-IDTVEC_END(x2apic_intrddbipi)
+IDTVEC_END(intr_x2apic_ddbipi)
 #endif /* DDB */
 #endif /* MULTIPROCESSOR */
 
diff -r b1227f50f254 -r 9618f3046969 sys/arch/x86/x86/lapic.c
--- a/sys/arch/x86/x86/lapic.c  Tue Apr 03 06:11:14 2018 +0000
+++ b/sys/arch/x86/x86/lapic.c  Tue Apr 03 07:20:52 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lapic.c,v 1.65 2017/11/26 11:37:10 maxv Exp $  */
+/*     $NetBSD: lapic.c,v 1.66 2018/04/03 07:20:52 christos Exp $      */
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.65 2017/11/26 11:37:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.66 2018/04/03 07:20:52 christos Exp $");
 
 #include "acpica.h"
 #include "ioapic.h"
@@ -80,7 +80,7 @@
 #ifdef MULTIPROCESSOR
 #ifdef __x86_64__
 typedef void (vector)(void);
-extern vector Xx2apic_intrddbipi;
+extern vector Xintr_x2apic_ddbipi;
 extern int ddb_vec;
 #endif
 #endif
@@ -335,7 +335,7 @@
 #endif
 #if defined(DDB) && defined(MULTIPROCESSOR)
 #ifdef __x86_64__
-               setgate(&idt[ddb_vec], &Xx2apic_intrddbipi, 1, SDT_SYS386IGT,
+               setgate(&idt[ddb_vec], &Xintr_x2apic_ddbipi, 1, SDT_SYS386IGT,
                    SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
 #else
                /* Set DDB IPI handler in cpu_set_tss_gates() when cpu0 is attached. */
Prev by Date: [src/trunk]: src/sys/arch/vax/vax convert some spaces into new lines and tabs...
Next by Date: [src/trunk]: src/sys/netinet bcopy -> memcpy, it's obvious the areas don't ov...
Previous by Thread: [src/trunk]: src/sys/arch/vax/vax convert some spaces into new lines and tabs...
Next by Thread: [src/trunk]: src/sys/netinet bcopy -> memcpy, it's obvious the areas don't ov...
Indexes:
Home | Main Index | Thread Index | Old Index