diff options
-rw-r--r-- | sys/amd64/amd64/exception.S | 30 | ||||
-rw-r--r-- | sys/amd64/amd64/exception.s | 30 | ||||
-rw-r--r-- | sys/dev/cy/cy.c | 14 | ||||
-rw-r--r-- | sys/dev/cy/cy_isa.c | 14 | ||||
-rw-r--r-- | sys/dev/sio/sio.c | 58 | ||||
-rw-r--r-- | sys/i386/i386/exception.s | 30 | ||||
-rw-r--r-- | sys/i386/isa/cy.c | 14 | ||||
-rw-r--r-- | sys/i386/isa/sio.c | 58 | ||||
-rw-r--r-- | sys/isa/sio.c | 58 | ||||
-rw-r--r-- | sys/kern/subr_prf.c | 14 | ||||
-rw-r--r-- | sys/vm/vm_extern.h | 7 | ||||
-rw-r--r-- | sys/vm/vm_glue.c | 18 |
12 files changed, 18 insertions, 327 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 8a5e6d8..a7b4574 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.15 1996/03/02 19:37:37 peter Exp $ + * $Id: exception.s,v 1.16 1996/04/12 12:22:14 phk Exp $ */ #include "npx.h" /* NNPX */ @@ -77,12 +77,7 @@ bdb_/**/name/**/_ljmp: ; \ #define BDBTRAP(name) #endif -#ifdef KGDB -# define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; \ - pushl $(a) ; jmp _bpttraps -#else -# define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) -#endif +#define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -190,27 +185,6 @@ calltrap: MEXITCOUNT jmp _doreti -#ifdef KGDB -/* - * This code checks for a kgdb trap, then falls through - * to the regular trap code. - */ - SUPERALIGN_TEXT -_bpttraps: - pushal - pushl %ds - pushl %es - movl $KDSEL,%eax - movl %ax,%ds - movl %ax,%es - FAKE_MCOUNT(12*4(%esp)) - testb $SEL_RPL_MASK,TRAPF_CS_OFF(%esp) /* non-kernel mode? */ - jne calltrap /* yes */ - call _kgdb_trap_glue - MEXITCOUNT - jmp calltrap -#endif - /* * Call gate entry for syscall. * The intersegment call has been set up to specify one dummy parameter. diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s index 8a5e6d8..a7b4574 100644 --- a/sys/amd64/amd64/exception.s +++ b/sys/amd64/amd64/exception.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.15 1996/03/02 19:37:37 peter Exp $ + * $Id: exception.s,v 1.16 1996/04/12 12:22:14 phk Exp $ */ #include "npx.h" /* NNPX */ @@ -77,12 +77,7 @@ bdb_/**/name/**/_ljmp: ; \ #define BDBTRAP(name) #endif -#ifdef KGDB -# define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; \ - pushl $(a) ; jmp _bpttraps -#else -# define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) -#endif +#define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -190,27 +185,6 @@ calltrap: MEXITCOUNT jmp _doreti -#ifdef KGDB -/* - * This code checks for a kgdb trap, then falls through - * to the regular trap code. - */ - SUPERALIGN_TEXT -_bpttraps: - pushal - pushl %ds - pushl %es - movl $KDSEL,%eax - movl %ax,%ds - movl %ax,%es - FAKE_MCOUNT(12*4(%esp)) - testb $SEL_RPL_MASK,TRAPF_CS_OFF(%esp) /* non-kernel mode? */ - jne calltrap /* yes */ - call _kgdb_trap_glue - MEXITCOUNT - jmp calltrap -#endif - /* * Call gate entry for syscall. * The intersegment call has been set up to specify one dummy parameter. diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 0c89ca4..5ebc51a 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.30 1996/01/25 07:21:29 phk Exp $ + * $Id: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $ */ #include "cy.h" @@ -399,14 +399,6 @@ static struct tty sio_tty[NSIO]; #endif static const int nsio_tty = NSIO; -#ifdef KGDB -#include <machine/remote-sl.h> - -extern int kgdb_dev; -extern int kgdb_rate; -extern int kgdb_debug_init; -#endif - #ifdef CyDebug static u_int cd_inbs; static u_int cy_inbs; @@ -880,10 +872,6 @@ comhardclose(com) outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); #endif -#ifdef KGDB - /* do not disable interrupts or hang up if debugging */ - if (kgdb_dev != makedev(CDEV_MAJOR, unit)) -#endif { #if 0 outb(iobase + com_ier, 0); diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 0c89ca4..5ebc51a 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.30 1996/01/25 07:21:29 phk Exp $ + * $Id: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $ */ #include "cy.h" @@ -399,14 +399,6 @@ static struct tty sio_tty[NSIO]; #endif static const int nsio_tty = NSIO; -#ifdef KGDB -#include <machine/remote-sl.h> - -extern int kgdb_dev; -extern int kgdb_rate; -extern int kgdb_debug_init; -#endif - #ifdef CyDebug static u_int cd_inbs; static u_int cy_inbs; @@ -880,10 +872,6 @@ comhardclose(com) outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); #endif -#ifdef KGDB - /* do not disable interrupts or hang up if debugging */ - if (kgdb_dev != makedev(CDEV_MAJOR, unit)) -#endif { #if 0 outb(iobase + com_ier, 0); diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 3d2fba5..aab233e 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.140 1996/04/13 14:55:18 bde Exp $ + * $Id: sio.c,v 1.141 1996/04/23 18:36:56 nate Exp $ */ #include "opt_comconsole.h" @@ -343,14 +343,6 @@ static struct tty sio_tty[NSIO]; #endif static const int nsio_tty = NSIO; -#ifdef KGDB -#include <machine/remote-sl.h> - -extern int kgdb_dev; -extern int kgdb_rate; -extern int kgdb_debug_init; -#endif - static struct speedtab comspeedtab[] = { { 0, 0 }, { 50, COMBRD(50) }, @@ -1012,40 +1004,6 @@ determined_type: ; kdc_sio[unit].kdc_state = (unit == comconsole) ? DC_BUSY : DC_IDLE; -#ifdef KGDB - if (kgdb_dev == makedev(CDEV_MAJOR, unit)) { - if (unit == comconsole) - kgdb_dev = -1; /* can't debug over console port */ - else { - int divisor; - - /* - * XXX now unfinished and broken. Need to do - * something more like a full open(). There's no - * suitable interrupt handler so don't enable device - * interrupts. Watch out for null tp's. - */ - outb(iobase + com_cfcr, CFCR_DLAB); - divisor = ttspeedtab(kgdb_rate, comspeedtab); - outb(iobase + com_dlbl, divisor & 0xFF); - outb(iobase + com_dlbh, (u_int) divisor >> 8); - outb(iobase + com_cfcr, CFCR_8BITS); - outb(com->modem_ctl_port, - com->mcr_image |= MCR_DTR | MCR_RTS); - - if (kgdb_debug_init) { - /* - * Print prefix of device name, - * let kgdb_connect print the rest. - */ - printf("sio%d: ", unit); - kgdb_connect(1); - } else - printf("sio%d: kgdb enabled\n", unit); - } - } -#endif - s = spltty(); com_addr(unit) = com; splx(s); @@ -1300,10 +1258,6 @@ comhardclose(com) com->poll_output = FALSE; com->do_timestamp = 0; outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); -#ifdef KGDB - /* do not disable interrupts or hang up if debugging */ - if (kgdb_dev != makedev(CDEV_MAJOR, unit)) -#endif { outb(iobase + com_ier, 0); tp = com->tp; @@ -1509,16 +1463,6 @@ siointr1(com) ++com->bytes_in; if (com->hotchar != 0 && recv_data == com->hotchar) setsofttty(); -#ifdef KGDB - /* trap into kgdb? (XXX - needs testing and optim) */ - if (recv_data == FRAME_END - && ( com->tp == NULL - || !(com->tp->t_state & TS_ISOPEN)) - && kgdb_dev == makedev(CDEV_MAJOR, unit)) { - kgdb_connect(0); - continue; - } -#endif /* KGDB */ ioptr = com->iptr; if (ioptr >= com->ibufend) CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW); diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 8a5e6d8..a7b4574 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: exception.s,v 1.15 1996/03/02 19:37:37 peter Exp $ + * $Id: exception.s,v 1.16 1996/04/12 12:22:14 phk Exp $ */ #include "npx.h" /* NNPX */ @@ -77,12 +77,7 @@ bdb_/**/name/**/_ljmp: ; \ #define BDBTRAP(name) #endif -#ifdef KGDB -# define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; \ - pushl $(a) ; jmp _bpttraps -#else -# define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) -#endif +#define BPTTRAP(a) testl $PSL_I,4+8(%esp) ; je 1f ; sti ; 1: ; TRAP(a) MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) @@ -190,27 +185,6 @@ calltrap: MEXITCOUNT jmp _doreti -#ifdef KGDB -/* - * This code checks for a kgdb trap, then falls through - * to the regular trap code. - */ - SUPERALIGN_TEXT -_bpttraps: - pushal - pushl %ds - pushl %es - movl $KDSEL,%eax - movl %ax,%ds - movl %ax,%es - FAKE_MCOUNT(12*4(%esp)) - testb $SEL_RPL_MASK,TRAPF_CS_OFF(%esp) /* non-kernel mode? */ - jne calltrap /* yes */ - call _kgdb_trap_glue - MEXITCOUNT - jmp calltrap -#endif - /* * Call gate entry for syscall. * The intersegment call has been set up to specify one dummy parameter. diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 0c89ca4..5ebc51a 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.30 1996/01/25 07:21:29 phk Exp $ + * $Id: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $ */ #include "cy.h" @@ -399,14 +399,6 @@ static struct tty sio_tty[NSIO]; #endif static const int nsio_tty = NSIO; -#ifdef KGDB -#include <machine/remote-sl.h> - -extern int kgdb_dev; -extern int kgdb_rate; -extern int kgdb_debug_init; -#endif - #ifdef CyDebug static u_int cd_inbs; static u_int cy_inbs; @@ -880,10 +872,6 @@ comhardclose(com) outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); #endif -#ifdef KGDB - /* do not disable interrupts or hang up if debugging */ - if (kgdb_dev != makedev(CDEV_MAJOR, unit)) -#endif { #if 0 outb(iobase + com_ier, 0); diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 3d2fba5..aab233e 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.140 1996/04/13 14:55:18 bde Exp $ + * $Id: sio.c,v 1.141 1996/04/23 18:36:56 nate Exp $ */ #include "opt_comconsole.h" @@ -343,14 +343,6 @@ static struct tty sio_tty[NSIO]; #endif static const int nsio_tty = NSIO; -#ifdef KGDB -#include <machine/remote-sl.h> - -extern int kgdb_dev; -extern int kgdb_rate; -extern int kgdb_debug_init; -#endif - static struct speedtab comspeedtab[] = { { 0, 0 }, { 50, COMBRD(50) }, @@ -1012,40 +1004,6 @@ determined_type: ; kdc_sio[unit].kdc_state = (unit == comconsole) ? DC_BUSY : DC_IDLE; -#ifdef KGDB - if (kgdb_dev == makedev(CDEV_MAJOR, unit)) { - if (unit == comconsole) - kgdb_dev = -1; /* can't debug over console port */ - else { - int divisor; - - /* - * XXX now unfinished and broken. Need to do - * something more like a full open(). There's no - * suitable interrupt handler so don't enable device - * interrupts. Watch out for null tp's. - */ - outb(iobase + com_cfcr, CFCR_DLAB); - divisor = ttspeedtab(kgdb_rate, comspeedtab); - outb(iobase + com_dlbl, divisor & 0xFF); - outb(iobase + com_dlbh, (u_int) divisor >> 8); - outb(iobase + com_cfcr, CFCR_8BITS); - outb(com->modem_ctl_port, - com->mcr_image |= MCR_DTR | MCR_RTS); - - if (kgdb_debug_init) { - /* - * Print prefix of device name, - * let kgdb_connect print the rest. - */ - printf("sio%d: ", unit); - kgdb_connect(1); - } else - printf("sio%d: kgdb enabled\n", unit); - } - } -#endif - s = spltty(); com_addr(unit) = com; splx(s); @@ -1300,10 +1258,6 @@ comhardclose(com) com->poll_output = FALSE; com->do_timestamp = 0; outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); -#ifdef KGDB - /* do not disable interrupts or hang up if debugging */ - if (kgdb_dev != makedev(CDEV_MAJOR, unit)) -#endif { outb(iobase + com_ier, 0); tp = com->tp; @@ -1509,16 +1463,6 @@ siointr1(com) ++com->bytes_in; if (com->hotchar != 0 && recv_data == com->hotchar) setsofttty(); -#ifdef KGDB - /* trap into kgdb? (XXX - needs testing and optim) */ - if (recv_data == FRAME_END - && ( com->tp == NULL - || !(com->tp->t_state & TS_ISOPEN)) - && kgdb_dev == makedev(CDEV_MAJOR, unit)) { - kgdb_connect(0); - continue; - } -#endif /* KGDB */ ioptr = com->iptr; if (ioptr >= com->ibufend) CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW); diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 3d2fba5..aab233e 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.140 1996/04/13 14:55:18 bde Exp $ + * $Id: sio.c,v 1.141 1996/04/23 18:36:56 nate Exp $ */ #include "opt_comconsole.h" @@ -343,14 +343,6 @@ static struct tty sio_tty[NSIO]; #endif static const int nsio_tty = NSIO; -#ifdef KGDB -#include <machine/remote-sl.h> - -extern int kgdb_dev; -extern int kgdb_rate; -extern int kgdb_debug_init; -#endif - static struct speedtab comspeedtab[] = { { 0, 0 }, { 50, COMBRD(50) }, @@ -1012,40 +1004,6 @@ determined_type: ; kdc_sio[unit].kdc_state = (unit == comconsole) ? DC_BUSY : DC_IDLE; -#ifdef KGDB - if (kgdb_dev == makedev(CDEV_MAJOR, unit)) { - if (unit == comconsole) - kgdb_dev = -1; /* can't debug over console port */ - else { - int divisor; - - /* - * XXX now unfinished and broken. Need to do - * something more like a full open(). There's no - * suitable interrupt handler so don't enable device - * interrupts. Watch out for null tp's. - */ - outb(iobase + com_cfcr, CFCR_DLAB); - divisor = ttspeedtab(kgdb_rate, comspeedtab); - outb(iobase + com_dlbl, divisor & 0xFF); - outb(iobase + com_dlbh, (u_int) divisor >> 8); - outb(iobase + com_cfcr, CFCR_8BITS); - outb(com->modem_ctl_port, - com->mcr_image |= MCR_DTR | MCR_RTS); - - if (kgdb_debug_init) { - /* - * Print prefix of device name, - * let kgdb_connect print the rest. - */ - printf("sio%d: ", unit); - kgdb_connect(1); - } else - printf("sio%d: kgdb enabled\n", unit); - } - } -#endif - s = spltty(); com_addr(unit) = com; splx(s); @@ -1300,10 +1258,6 @@ comhardclose(com) com->poll_output = FALSE; com->do_timestamp = 0; outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK); -#ifdef KGDB - /* do not disable interrupts or hang up if debugging */ - if (kgdb_dev != makedev(CDEV_MAJOR, unit)) -#endif { outb(iobase + com_ier, 0); tp = com->tp; @@ -1509,16 +1463,6 @@ siointr1(com) ++com->bytes_in; if (com->hotchar != 0 && recv_data == com->hotchar) setsofttty(); -#ifdef KGDB - /* trap into kgdb? (XXX - needs testing and optim) */ - if (recv_data == FRAME_END - && ( com->tp == NULL - || !(com->tp->t_state & TS_ISOPEN)) - && kgdb_dev == makedev(CDEV_MAJOR, unit)) { - kgdb_connect(0); - continue; - } -#endif /* KGDB */ ioptr = com->iptr; if (ioptr >= com->ibufend) CE_RECORD(com, CE_INTERRUPT_BUF_OVERFLOW); diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index d6c6dfd..c718a65 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)subr_prf.c 8.3 (Berkeley) 1/21/94 - * $Id: subr_prf.c,v 1.33 1996/03/23 21:41:00 jkh Exp $ + * $Id: subr_prf.c,v 1.34 1996/03/25 17:06:34 jkh Exp $ */ #include "opt_ddb.h" @@ -61,7 +61,7 @@ */ #include <machine/stdarg.h> -#if defined(DDB) || defined (KGDB) +#if defined(DDB) #ifdef DDB_UNATTENDED static int debugger_on_panic = 0; #else @@ -120,16 +120,10 @@ panic(const char *fmt, ...) va_end(ap); printf("\n"); -#if defined(DDB) || defined (KGDB) - if (debugger_on_panic) { -#ifdef KGDB - kgdb_panic(); -#endif -#ifdef DDB +#if defined(DDB) + if (debugger_on_panic) Debugger ("panic"); #endif - } -#endif boot(bootopt); } diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index b0d7480..60c7850 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $Id: vm_extern.h,v 1.23 1996/02/04 22:08:57 dyson Exp $ + * $Id: vm_extern.h,v 1.24 1996/02/23 18:49:23 peter Exp $ */ #ifndef _VM_EXTERN_H_ @@ -44,11 +44,6 @@ struct vmtotal; struct mount; struct vnode; -#ifdef KGDB -void chgkprot __P((caddr_t, int, int)); - -#endif - #ifdef KERNEL extern int indent; diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 4bcb2cd..4e6db8c 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.46 1996/04/08 03:42:01 dyson Exp $ + * $Id: vm_glue.c,v 1.47 1996/04/09 04:36:58 dyson Exp $ */ #include "opt_ddb.h" @@ -158,22 +158,6 @@ useracc(addr, len, rw) return (rv == TRUE); } -#ifdef KGDB -/* - * Change protections on kernel pages from addr to addr+len - * (presumably so debugger can plant a breakpoint). - * All addresses are assumed to reside in the Sysmap, - */ -chgkprot(addr, len, rw) - register caddr_t addr; - int len, rw; -{ - vm_prot_t prot = rw == B_READ ? VM_PROT_READ : VM_PROT_WRITE; - - vm_map_protect(kernel_map, trunc_page(addr), - round_page(addr + len), prot, FALSE); -} -#endif void vslock(addr, len) caddr_t addr; |