Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/sys/arch Pull up following revision(s) (requested by chri...
details: https://anonhg.NetBSD.org/src/rev/dfa3247f41cc
branches: netbsd-8
changeset: 851567:dfa3247f41cc
user: martin <martin%NetBSD.org@localhost>
date: Thu Apr 05 18:15:02 2018 +0000
description:
Pull up following revision(s) (requested by christos in ticket #696):
sys/arch/amd64/amd64/vector.S: revision 1.62 (patch)
sys/arch/x86/include/intr.h: revision 1.55
sys/arch/i386/i386/vector.S: revision 1.77
sys/arch/i386/i386/db_interface.c: revision 1.82 (patch)
sys/arch/amd64/amd64/spl.S: revision 1.34 (patch)
sys/arch/amd64/amd64/db_interface.c: revision 1.33 (patch)
sys/arch/x86/x86/intr.c: revision 1.125
sys/arch/i386/i386/spl.S: revision 1.43 (patch)
sys/arch/i386/i386/machdep.c: revision 1.805 (patch)
sys/arch/x86/x86/lapic.c: revision 1.66 (patch)
Rename the DDB IPI IDT vectors for consistency. ok maxv@
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/db_interface.c | 10 +++++-----
sys/arch/amd64/amd64/spl.S | 20 ++++++++++----------
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/spl.S | 16 ++++++++--------
sys/arch/i386/i386/vector.S | 12 ++++++------
sys/arch/x86/include/intr.h | 6 +++---
sys/arch/x86/x86/intr.c | 8 ++++----
sys/arch/x86/x86/lapic.c | 8 ++++----
10 files changed, 60 insertions(+), 60 deletions(-)
diffs (truncated from 437 to 300 lines):
diff -r cd5d5813b907 -r dfa3247f41cc sys/arch/amd64/amd64/db_interface.c
--- a/sys/arch/amd64/amd64/db_interface.c Thu Apr 05 14:42:36 2018 +0000
+++ b/sys/arch/amd64/amd64/db_interface.c Thu Apr 05 18:15:02 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.25 2017/05/23 08:54:38 nonaka Exp $ */
+/* $NetBSD: db_interface.c,v 1.25.2.1 2018/04/05 18:15:02 martin Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.25 2017/05/23 08:54:38 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.25.2.1 2018/04/05 18:15:02 martin Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -95,7 +95,7 @@
int ddb_cpu = NOCPU;
typedef void (vector)(void);
-extern vector Xintrddb, Xx2apic_intrddb;
+extern vector Xintr_ddbipi, Xintr_x2apic_ddbipi;
void
db_machine_init(void)
@@ -103,10 +103,10 @@
#ifdef MULTIPROCESSOR
#ifndef XEN
- vector *handler = &Xintrddb;
+ vector *handler = &Xintr_ddbipi;
#if NLAPIC > 0
if (lapic_is_x2apic())
- handler = &Xx2apic_intrddb;
+ handler = &Xintr_x2apic_ddbipi;
#endif
ddb_vec = idt_vec_alloc(0xf0, 0xff);
setgate(&idt[ddb_vec], handler, 1, SDT_SYS386IGT, SEL_KPL,
diff -r cd5d5813b907 -r dfa3247f41cc sys/arch/amd64/amd64/spl.S
--- a/sys/arch/amd64/amd64/spl.S Thu Apr 05 14:42:36 2018 +0000
+++ b/sys/arch/amd64/amd64/spl.S Thu Apr 05 18:15:02 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.30 2015/11/22 13:41:24 maxv Exp $ */
+/* $NetBSD: spl.S,v 1.30.10.1 2018/04/05 18:15:02 martin Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -116,7 +116,7 @@
popq %r15 /* unwind switchframe */
addq $(5 * 8),%rsp
jmp *%r13 /* back to Xspllower/Xdoreti */
-END(Xsoftintr)
+IDTVEC_END(softintr)
/*
* softintr_ret()
@@ -145,25 +145,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 */
-END(Xpreemptrecurse)
+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)
@@ -176,7 +176,7 @@
call _C_LABEL(preempt) # from user
cli
jmp *%r13 /* back to Xdoreti */
-END(Xpreemptresume)
+IDTVEC_END(resume_preempt)
/*
* int splraise(int s);
@@ -300,7 +300,7 @@
popq %r13
popq %rbx
ret
-END(Xspllower)
+IDTVEC_END(spllower)
/*
* void Xdoreti(void);
@@ -354,4 +354,4 @@
CLI(si)
jmp doreti_checkast /* recheck ASTs */
END(doreti_checkast)
-END(Xdoreti)
+IDTVEC_END(doreti)
diff -r cd5d5813b907 -r dfa3247f41cc sys/arch/amd64/amd64/vector.S
--- a/sys/arch/amd64/amd64/vector.S Thu Apr 05 14:42:36 2018 +0000
+++ b/sys/arch/amd64/amd64/vector.S Thu Apr 05 18:15:02 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.49.2.2 2018/03/22 16:59:03 martin Exp $ */
+/* $NetBSD: vector.S,v 1.49.2.3 2018/04/05 18:15:02 martin Exp $ */
/*-
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -160,7 +160,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
@@ -170,8 +170,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
@@ -183,21 +183,21 @@
xorl %eax,%eax
movq %rax,%cr8
INTRFASTEXIT
-IDTVEC_END(handle_x2apic_intrddbipi)
+IDTVEC_END(handle_x2apic_ddbipi)
TEXT_USER_BEGIN
-IDTVEC(intrddb)
+IDTVEC(intr_ddbipi)
pushq $0
pushq $T_BPTFLT
INTRENTRY
- jmp _C_LABEL(Xhandle_intrddbipi)
-IDTVEC_END(intrddb)
-IDTVEC(x2apic_intrddb)
+ 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_intrddb)
+ jmp _C_LABEL(Xhandle_x2apic_ddbipi)
+IDTVEC_END(intr_x2apic_ddbipi)
TEXT_USER_END
#endif /* DDB */
diff -r cd5d5813b907 -r dfa3247f41cc sys/arch/i386/i386/db_interface.c
--- a/sys/arch/i386/i386/db_interface.c Thu Apr 05 14:42:36 2018 +0000
+++ b/sys/arch/i386/i386/db_interface.c Thu Apr 05 18:15:02 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.72 2017/05/23 08:54:38 nonaka Exp $ */
+/* $NetBSD: db_interface.c,v 1.72.2.1 2018/04/05 18:15:02 martin Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.72 2017/05/23 08:54:38 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.72.2.1 2018/04/05 18:15:02 martin 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 cd5d5813b907 -r dfa3247f41cc sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c Thu Apr 05 14:42:36 2018 +0000
+++ b/sys/arch/i386/i386/machdep.c Thu Apr 05 18:15:02 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.782.6.4 2018/03/13 15:47:45 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.782.6.5 2018/04/05 18:15:02 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.782.6.4 2018/03/13 15:47:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.782.6.5 2018/04/05 18:15:02 martin Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -607,7 +607,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
@@ -639,7 +639,7 @@
ci->ci_ddbipi_stack = (char *)uvm_km_alloc(kernel_map, USPACE, 0,
UVM_KMF_WIRED);
tss_init(&ci->ci_tss->ddbipi_tss, ci->ci_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 cd5d5813b907 -r dfa3247f41cc sys/arch/i386/i386/spl.S
--- a/sys/arch/i386/i386/spl.S Thu Apr 05 14:42:36 2018 +0000
+++ b/sys/arch/i386/i386/spl.S Thu Apr 05 18:15:02 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.40 2014/01/11 17:06:15 christos Exp $ */
+/* $NetBSD: spl.S,v 1.40.22.1 2018/04/05 18:15:02 martin 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.40 2014/01/11 17:06:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.40.22.1 2018/04/05 18:15:02 martin Exp $");
#include "opt_vm86.h"
#include "opt_ddb.h"
@@ -393,11 +393,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
@@ -405,14 +405,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)
@@ -431,5 +431,5 @@
call _C_LABEL(preempt) # from user
cli
Home |
Main Index |
Thread Index |
Old Index