Module Name: src
Committed By: maxv
Date: Fri Mar 16 12:48:54 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL files.i386
src/sys/arch/i386/i386: i386_trap.S machdep.c vector.S
src/sys/arch/xen/conf: files.xen
Removed Files:
src/sys/arch/i386/i386: i386_trap_ipkdb.S ipkdb_glue.c
src/sys/arch/i386/include: ipkdb.h
Log Message:
Remove ipkdb from i386. Also remove unused references in amd64.
I already talked about doing that six months ago on port-i386@. Back then
it was as general cleanup, but now, with SVS etc, we do actually have
good reasons for simplifying the entry points.
Ok kamil@. (christos@ was in the conversation too)
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.434 -r1.435 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.390 -r1.391 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/i386/i386_trap.S
cvs rdiff -u -r1.2 -r0 src/sys/arch/i386/i386/i386_trap_ipkdb.S
cvs rdiff -u -r1.14 -r0 src/sys/arch/i386/i386/ipkdb_glue.c
cvs rdiff -u -r1.803 -r1.804 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/i386/include/ipkdb.h
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/xen/conf/files.xen
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/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.82 src/sys/arch/amd64/conf/ALL:1.83
--- src/sys/arch/amd64/conf/ALL:1.82 Sun Feb 25 22:00:22 2018
+++ src/sys/arch/amd64/conf/ALL Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.82 2018/02/25 22:00:22 pgoyette Exp $
+# $NetBSD: ALL,v 1.83 2018/03/16 12:48:54 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.82 $"
+#ident "ALL-$Revision: 1.83 $"
maxusers 64 # estimated number of users
@@ -118,8 +118,6 @@ options DDB_HISTORY_SIZE=512 # enable h
options DDB_VERBOSE_HELP
options KGDB # remote debugger
options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#options IPKDB # IP Kernel Debugger
-#options IPKDBKEY="\"Pass_phrase_to_debug_over_network\""
makeoptions COPTS="-O2 -fno-omit-frame-pointer"
makeoptions DEBUG="-g" # compile full symbol table
options SYSCALL_STATS # per syscall counts
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.434 src/sys/arch/i386/conf/ALL:1.435
--- src/sys/arch/i386/conf/ALL:1.434 Sun Feb 25 22:00:22 2018
+++ src/sys/arch/i386/conf/ALL Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.434 2018/02/25 22:00:22 pgoyette Exp $
+# $NetBSD: ALL,v 1.435 2018/03/16 12:48:54 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.434 $"
+#ident "ALL-$Revision: 1.435 $"
maxusers 64 # estimated number of users
@@ -116,8 +116,6 @@ options DDB_HISTORY_SIZE=512 # enable h
options DDB_VERBOSE_HELP
options KGDB # remote debugger
options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-options IPKDB # IP Kernel Debugger
-options IPKDBKEY="\"Pass_phrase_to_debug_over_network\""
makeoptions DEBUG="-g" # compile full symbol table
options SYSCALL_STATS # per syscall counts
options SYSCALL_TIMES # per syscall times
Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.390 src/sys/arch/i386/conf/files.i386:1.391
--- src/sys/arch/i386/conf/files.i386:1.390 Mon Jan 8 09:33:53 2018
+++ src/sys/arch/i386/conf/files.i386 Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.390 2018/01/08 09:33:53 maxv Exp $
+# $NetBSD: files.i386,v 1.391 2018/03/16 12:48:54 maxv Exp $
#
# new style config file for i386 architecture
#
@@ -65,7 +65,6 @@ file kern/subr_disk_mbr.c disk
file kern/subr_spldebug.c spldebug
file arch/i386/i386/gdt.c
file arch/i386/i386/i386func.S
-file arch/i386/i386/ipkdb_glue.c ipkdb
file arch/i386/i386/kobj_machdep.c modular
file arch/i386/i386/machdep.c
file arch/i386/i386/longrun.c
Index: src/sys/arch/i386/i386/i386_trap.S
diff -u src/sys/arch/i386/i386/i386_trap.S:1.12 src/sys/arch/i386/i386/i386_trap.S:1.13
--- src/sys/arch/i386/i386/i386_trap.S:1.12 Wed Aug 30 15:34:57 2017
+++ src/sys/arch/i386/i386/i386_trap.S Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i386_trap.S,v 1.12 2017/08/30 15:34:57 maxv Exp $ */
+/* $NetBSD: i386_trap.S,v 1.13 2018/03/16 12:48:54 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.12 2017/08/30 15:34:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.13 2018/03/16 12:48:54 maxv Exp $");
#endif
/*
@@ -83,19 +83,13 @@ __KERNEL_RCSID(0, "$NetBSD: i386_trap.S,
#define TRAP(a) pushl $(a) ; jmp _C_LABEL(alltraps)
#define ZTRAP(a) pushl $0 ; TRAP(a)
-#ifdef IPKDB
-#define BPTTRAP(a) pushl $0; pushl $(a); jmp _C_LABEL(bpttraps)
-#else
-#define BPTTRAP(a) ZTRAP(a)
-#endif
-
.text
IDTVEC(trap00)
ZTRAP(T_DIVIDE)
IDTVEC_END(trap00)
IDTVEC(trap01)
- BPTTRAP(T_TRCTRAP)
+ ZTRAP(T_TRCTRAP)
IDTVEC_END(trap01)
/*
@@ -121,7 +115,7 @@ IDTVEC(trap02)
IDTVEC_END(trap02)
IDTVEC(trap03)
- BPTTRAP(T_BPTFLT)
+ ZTRAP(T_BPTFLT)
IDTVEC_END(trap03)
IDTVEC(trap04)
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.803 src/sys/arch/i386/i386/machdep.c:1.804
--- src/sys/arch/i386/i386/machdep.c:1.803 Sat Jan 13 14:12:57 2018
+++ src/sys/arch/i386/i386/machdep.c Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.803 2018/01/13 14:12:57 bouyer Exp $ */
+/* $NetBSD: machdep.c,v 1.804 2018/03/16 12:48:54 maxv Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009, 2017
@@ -67,14 +67,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.803 2018/01/13 14:12:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.804 2018/03/16 12:48:54 maxv Exp $");
#include "opt_beep.h"
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
#include "opt_cpureset_delay.h"
#include "opt_ddb.h"
-#include "opt_ipkdb.h"
#include "opt_kgdb.h"
#include "opt_mtrr.h"
#include "opt_modular.h"
@@ -109,10 +108,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sys/ksyms.h>
#include <sys/device.h>
-#ifdef IPKDB
-#include <ipkdb/ipkdb.h>
-#endif
-
#ifdef KGDB
#include <sys/kgdb.h>
#endif
@@ -1427,11 +1422,6 @@ init386(paddr_t first_avail)
if (boothowto & RB_KDB)
Debugger();
#endif
-#ifdef IPKDB
- ipkdb_init();
- if (boothowto & RB_KDB)
- ipkdb_connect(0);
-#endif
#ifdef KGDB
kgdb_port_init();
if (boothowto & RB_KDB) {
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.75 src/sys/arch/i386/i386/vector.S:1.76
--- src/sys/arch/i386/i386/vector.S:1.75 Sat Feb 17 18:51:53 2018
+++ src/sys/arch/i386/i386/vector.S Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.75 2018/02/17 18:51:53 maxv Exp $ */
+/* $NetBSD: vector.S,v 1.76 2018/03/16 12:48:54 maxv Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,11 +65,10 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.75 2018/02/17 18:51:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.76 2018/03/16 12:48:54 maxv Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
-#include "opt_ipkdb.h"
#include "opt_xen.h"
#include "opt_dtrace.h"
@@ -1002,9 +1001,6 @@ END(xenev_stubs)
#endif /* XEN */
#include "i386_trap.S"
-#ifdef IPKDB
-#include "i386_trap_ipkdb.S"
-#endif
#ifdef XEN
Index: src/sys/arch/xen/conf/files.xen
diff -u src/sys/arch/xen/conf/files.xen:1.165 src/sys/arch/xen/conf/files.xen:1.166
--- src/sys/arch/xen/conf/files.xen:1.165 Mon Jan 22 22:36:11 2018
+++ src/sys/arch/xen/conf/files.xen Fri Mar 16 12:48:54 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.xen,v 1.165 2018/01/22 22:36:11 jdolecek Exp $
+# $NetBSD: files.xen,v 1.166 2018/03/16 12:48:54 maxv Exp $
# NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp
# NetBSD: files.i386,v 1.254 2004/03/25 23:32:10 jmc Exp
@@ -47,7 +47,6 @@ file arch/i386/i386/db_interface.c ddb
file arch/i386/i386/db_machdep.c ddb
file arch/i386/i386/dumpsys.c
file arch/i386/i386/gdt.c
-file arch/i386/i386/ipkdb_glue.c ipkdb
file arch/i386/i386/kobj_machdep.c modular
file arch/i386/i386/machdep.c
file arch/i386/i386/longrun.c
