Module Name: src
Committed By: christos
Date: Tue Apr 3 07:20:52 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: db_interface.c vector.S
src/sys/arch/i386/i386: db_interface.c machdep.c vector.S
src/sys/arch/x86/x86: lapic.c
Log Message:
Rename the DDB IPI IDT vectors for consistency. ok maxv@
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/amd64/db_interface.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/amd64/vector.S
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/i386/i386/db_interface.c
cvs rdiff -u -r1.804 -r1.805 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/lapic.c
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/amd64/db_interface.c
diff -u src/sys/arch/amd64/amd64/db_interface.c:1.32 src/sys/arch/amd64/amd64/db_interface.c:1.33
--- src/sys/arch/amd64/amd64/db_interface.c:1.32 Tue Feb 13 01:44:13 2018
+++ src/sys/arch/amd64/amd64/db_interface.c Tue Apr 3 03:20:52 2018
@@ -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 @@ static bool ddb_mp_online;
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 @@ db_machine_init(void)
#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,
Index: src/sys/arch/amd64/amd64/vector.S
diff -u src/sys/arch/amd64/amd64/vector.S:1.61 src/sys/arch/amd64/amd64/vector.S:1.62
--- src/sys/arch/amd64/amd64/vector.S:1.61 Fri Mar 16 04:48:34 2018
+++ src/sys/arch/amd64/amd64/vector.S Tue Apr 3 03:20:52 2018
@@ -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 @@ IDTVEC_END(intr_lapic_ipi)
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 @@ IDTVEC(handle_intrddbipi)
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 @@ IDTVEC(handle_x2apic_intrddbipi)
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 */
Index: src/sys/arch/i386/i386/db_interface.c
diff -u src/sys/arch/i386/i386/db_interface.c:1.81 src/sys/arch/i386/i386/db_interface.c:1.82
--- src/sys/arch/i386/i386/db_interface.c:1.81 Tue Feb 13 01:44:13 2018
+++ src/sys/arch/i386/i386/db_interface.c Tue Apr 3 03:20:52 2018
@@ -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 @@ static bool ddb_mp_online;
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 @@ db_machine_init(void)
#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);
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.804 src/sys/arch/i386/i386/machdep.c:1.805
--- src/sys/arch/i386/i386/machdep.c:1.804 Fri Mar 16 08:48:54 2018
+++ src/sys/arch/i386/i386/machdep.c Tue Apr 3 03:20:52 2018
@@ -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 @@ tss_init(struct i386tss *tss, void *stac
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 @@ cpu_set_tss_gates(struct cpu_info *ci)
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);
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.76 src/sys/arch/i386/i386/vector.S:1.77
--- src/sys/arch/i386/i386/vector.S:1.76 Fri Mar 16 08:48:54 2018
+++ src/sys/arch/i386/i386/vector.S Tue Apr 3 03:20:52 2018
@@ -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 @@ IDTVEC_END(intr_x2apic_tlb)
* 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 @@ IDTVEC(intrddbipi)
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 @@ IDTVEC(x2apic_intrddbipi)
wrmsr
iret
jmp 1b
-IDTVEC_END(x2apic_intrddbipi)
+IDTVEC_END(intr_x2apic_ddbipi)
#endif /* DDB */
#endif /* MULTIPROCESSOR */
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.65 src/sys/arch/x86/x86/lapic.c:1.66
--- src/sys/arch/x86/x86/lapic.c:1.65 Sun Nov 26 06:37:10 2017
+++ src/sys/arch/x86/x86/lapic.c Tue Apr 3 03:20:52 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.
#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 @@ lapic_setup_bsp(paddr_t lapic_base)
#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. */
