[Midnightbsd-cvs] src: sys/gdb: Update gdb
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Oct 1 12:36:26 EDT 2008
Log Message:
-----------
Update gdb
Modified Files:
--------------
src/sys/gdb:
gdb.h (r1.1.1.1 -> r1.2)
gdb_int.h (r1.1.1.1 -> r1.2)
gdb_main.c (r1.1.1.1 -> r1.2)
gdb_packet.c (r1.1.1.1 -> r1.2)
Added Files:
-----------
src/sys/gdb:
gdb_cons.c (r1.1)
-------------- next part --------------
Index: gdb_packet.c
===================================================================
RCS file: /home/cvs/src/sys/gdb/gdb_packet.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/gdb/gdb_packet.c -L sys/gdb/gdb_packet.c -u -r1.1.1.1 -r1.2
--- sys/gdb/gdb_packet.c
+++ sys/gdb/gdb_packet.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/gdb/gdb_packet.c,v 1.2 2005/01/06 18:27:29 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_packet.c,v 1.4 2007/06/09 21:55:17 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -33,6 +33,7 @@
#include <sys/kdb.h>
#include <machine/gdb_machdep.h>
+#include <machine/kdb.h>
#include <gdb/gdb.h>
#include <gdb/gdb_int.h>
@@ -48,6 +49,21 @@
#define N2C(n) (((n) < 10) ? (n) + '0' : (n) + 'a' - 10)
/*
+ * Get a single character
+ */
+
+static int
+gdb_getc(void)
+{
+ int c;
+
+ do
+ c = gdb_cur->gdb_getc();
+ while (c == -1);
+ return (c);
+}
+
+/*
* Functions to receive and extract from a packet.
*/
@@ -62,14 +78,14 @@
* Wait for the start character, ignore all others.
* XXX needs a timeout.
*/
- while ((c = gdb_cur->gdb_getc()) != '$')
+ while ((c = gdb_getc()) != '$')
;
/* Read until a # or end of buffer is found. */
cksum = 0;
gdb_rxsz = 0;
while (gdb_rxsz < sizeof(gdb_rxbuf) - 1) {
- c = gdb_cur->gdb_getc();
+ c = gdb_getc();
if (c == '#')
break;
gdb_rxbuf[gdb_rxsz++] = c;
@@ -84,9 +100,9 @@
return (ENOSPC);
}
- c = gdb_cur->gdb_getc();
+ c = gdb_getc();
cksum -= (C2N(c) << 4) & 0xf0;
- c = gdb_cur->gdb_getc();
+ c = gdb_getc();
cksum -= C2N(c) & 0x0f;
gdb_cur->gdb_putc((cksum == 0) ? '+' : '-');
if (cksum != 0)
@@ -114,8 +130,10 @@
int
gdb_rx_mem(unsigned char *addr, size_t size)
{
+ unsigned char *p;
void *prev;
jmp_buf jb;
+ size_t cnt;
int ret;
unsigned char c;
@@ -125,13 +143,16 @@
prev = kdb_jmpbuf(jb);
ret = setjmp(jb);
if (ret == 0) {
- while (size-- > 0) {
+ p = addr;
+ cnt = size;
+ while (cnt-- > 0) {
c = (C2N(gdb_rxp[0]) << 4) & 0xf0;
c |= C2N(gdb_rxp[1]) & 0x0f;
- *addr++ = c;
+ *p++ = c;
gdb_rxsz -= 2;
gdb_rxp += 2;
}
+ kdb_cpu_sync_icache(addr, size);
}
(void)kdb_jmpbuf(prev);
return ((ret == 0) ? 1 : 0);
@@ -245,7 +266,7 @@
c = cksum & 0x0f;
gdb_cur->gdb_putc(N2C(c));
- c = gdb_cur->gdb_getc();
+ c = gdb_getc();
} while (c != '+');
return (0);
--- /dev/null
+++ sys/gdb/gdb_cons.c
@@ -0,0 +1,175 @@
+/*-
+ * Copyright (c) 2006 Sam Leffler
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Support for redirecting console msgs to gdb. We register
+ * a pseudo console to hook cnputc and send stuff to the gdb
+ * port. The only trickiness here is buffering output so this
+ * isn't dog slow.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_cons.c,v 1.2 2006/05/26 13:54:27 phk Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/cons.h>
+#include <sys/kdb.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/reboot.h>
+#include <sys/sysctl.h>
+
+#include <machine/gdb_machdep.h>
+#include <machine/kdb.h>
+
+#include <gdb/gdb.h>
+#include <gdb/gdb_int.h>
+
+struct gdbcons {
+ int npending;
+ /* /2 for hex conversion, -6 for protocol glue */
+ char buf[GDB_BUFSZ/2 - 6];
+ struct callout flush;
+};
+static struct gdbcons state = { -1 };
+
+static int gdbcons_enable = 0;
+SYSCTL_INT(_debug, OID_AUTO, gdbcons, CTLFLAG_RW, &gdbcons_enable,
+ 0, "copy console messages to gdb");
+TUNABLE_INT("debug.gdbcons", &gdbcons_enable);
+
+static void
+gdb_cnprobe(struct consdev *cp)
+{
+ sprintf(cp->cn_name, "gdb");
+ cp->cn_pri = CN_LOW; /* XXX no way to say "write only" */
+}
+
+static void
+gdb_cninit(struct consdev *cp)
+{
+ struct gdbcons *c = &state;
+
+ /* setup tx buffer and callout */
+ if (c->npending == -1) {
+ c->npending = 0;
+ callout_init(&c->flush, CALLOUT_MPSAFE);
+ cp->cn_arg = c;
+ }
+}
+
+static void
+gdb_cnterm(struct consdev *cp)
+{
+}
+
+static int
+gdb_cngetc(struct consdev *cp)
+{
+ return -1;
+}
+
+static void
+gdb_tx_puthex(int c)
+{
+ const char *hex = "0123456789abcdef";
+
+ gdb_tx_char(hex[(c>>4)&0xf]);
+ gdb_tx_char(hex[(c>>0)&0xf]);
+}
+
+static void
+gdb_cnflush(void *arg)
+{
+ struct gdbcons *gc = arg;
+ int i;
+
+ gdb_tx_begin('O');
+ for (i = 0; i < gc->npending; i++)
+ gdb_tx_puthex(gc->buf[i]);
+ gdb_tx_end();
+ gc->npending = 0;
+}
+
+/*
+ * This glop is to figure out when it's safe to use callouts
+ * to defer buffer flushing. There's probably a better way
+ * and/or an earlier point in the boot process when it's ok.
+ */
+static int calloutok = 0;
+static void
+oktousecallout(void *data __unused)
+{
+ calloutok = 1;
+}
+SYSINIT(gdbhack, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, oktousecallout, NULL)
+
+static void
+gdb_cnputc(struct consdev *cp, int c)
+{
+ struct gdbcons *gc;
+
+ if (gdbcons_enable && gdb_cur != NULL && gdb_listening) {
+ gc = cp->cn_arg;
+ if (gc->npending != 0) {
+ /*
+ * Cancel any pending callout and flush the
+ * buffer if there's no space for this byte.
+ */
+ if (calloutok)
+ callout_stop(&gc->flush);
+ if (gc->npending == sizeof(gc->buf))
+ gdb_cnflush(gc);
+ }
+ gc->buf[gc->npending++] = c;
+ /*
+ * Flush on end of line; this is especially helpful
+ * during boot when we don't have callouts to flush
+ * the buffer. Otherwise we defer flushing; a 1/4
+ * second is a guess.
+ */
+ if (c == '\n')
+ gdb_cnflush(gc);
+ else if (calloutok)
+ callout_reset(&gc->flush, hz/4, gdb_cnflush, gc);
+ }
+}
+
+CONSOLE_DRIVER(gdb);
+
+/*
+ * Our console device only gets attached if the system is booted
+ * with RB_MULTIPLE set so gdb_init also calls us to attach the
+ * console so we're setup regardless.
+ */
+void
+gdb_consinit(void)
+{
+ gdb_cnprobe(&gdb_consdev);
+ gdb_cninit(&gdb_consdev);
+ cnadd(&gdb_consdev);
+}
Index: gdb.h
===================================================================
RCS file: /home/cvs/src/sys/gdb/gdb.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/gdb/gdb.h -L sys/gdb/gdb.h -u -r1.1.1.1 -r1.2
--- sys/gdb/gdb.h
+++ sys/gdb/gdb.h
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/gdb/gdb.h,v 1.2 2005/01/06 18:27:29 imp Exp $
+ * $FreeBSD: src/sys/gdb/gdb.h,v 1.3 2006/05/26 11:54:32 phk Exp $
*/
#ifndef _GDB_GDB_H_
@@ -38,7 +38,6 @@
struct gdb_dbgport {
const char *gdb_name;
- gdb_checkc_f *gdb_checkc;
gdb_getc_f *gdb_getc;
gdb_init_f *gdb_init;
gdb_probe_f *gdb_probe;
@@ -47,15 +46,14 @@
int gdb_active;
};
-#define GDB_DBGPORT(name, probe, init, term, checkc, getc, putc) \
+#define GDB_DBGPORT(name, probe, init, term, getc, putc) \
static struct gdb_dbgport name##_gdb_dbgport = { \
.gdb_name = #name, \
- .gdb_checkc = checkc, \
- .gdb_getc = getc, \
- .gdb_init = init, \
.gdb_probe = probe, \
+ .gdb_init = init, \
+ .gdb_term = term, \
+ .gdb_getc = getc, \
.gdb_putc = putc, \
- .gdb_term = term \
}; \
DATA_SET(gdb_dbgport_set, name##_gdb_dbgport)
Index: gdb_int.h
===================================================================
RCS file: /home/cvs/src/sys/gdb/gdb_int.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/gdb/gdb_int.h -L sys/gdb/gdb_int.h -u -r1.1.1.1 -r1.2
--- sys/gdb/gdb_int.h
+++ sys/gdb/gdb_int.h
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/gdb/gdb_int.h,v 1.2 2005/01/06 18:27:29 imp Exp $
+ * $FreeBSD: src/sys/gdb/gdb_int.h,v 1.3 2006/03/23 23:06:14 sam Exp $
*/
#ifndef _GDB_GDB_INT_H_
@@ -31,6 +31,9 @@
extern struct gdb_dbgport *gdb_cur;
+extern int gdb_listening;
+void gdb_consinit(void);
+
extern char *gdb_rxp;
extern size_t gdb_rxsz;
extern char *gdb_txp;
Index: gdb_main.c
===================================================================
RCS file: /home/cvs/src/sys/gdb/gdb_main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/gdb/gdb_main.c -L sys/gdb/gdb_main.c -u -r1.1.1.1 -r1.2
--- sys/gdb/gdb_main.c
+++ sys/gdb/gdb_main.c
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/gdb/gdb_main.c,v 1.5 2005/03/28 18:31:18 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/gdb/gdb_main.c,v 1.7 2006/05/26 11:52:59 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,10 +46,12 @@
KDB_BACKEND(gdb, gdb_init, NULL, gdb_trap);
-GDB_DBGPORT(null, NULL, NULL, NULL, NULL, NULL, NULL);
+static struct gdb_dbgport null_gdb_dbgport;
+DATA_SET(gdb_dbgport_set, null_gdb_dbgport);
SET_DECLARE(gdb_dbgport_set, struct gdb_dbgport);
struct gdb_dbgport *gdb_cur = NULL;
+int gdb_listening = 0;
static int
gdb_init(void)
@@ -82,9 +84,10 @@
gdb_cur->gdb_init();
printf("GDB: current port: %s\n", gdb_cur->gdb_name);
}
- if (gdb_cur != NULL)
+ if (gdb_cur != NULL) {
cur_pri = (boothowto & RB_GDB) ? 2 : 0;
- else
+ gdb_consinit();
+ } else
cur_pri = -1;
return (cur_pri);
}
@@ -94,6 +97,7 @@
{
struct thread *thr_iter;
+ gdb_listening = 0;
/*
* Send a T packet. We currently do not support watchpoints (the
* awatch, rwatch or watch elements).
@@ -126,6 +130,7 @@
gdb_cpu_setreg(GDB_REG_PC, &pc);
}
kdb_cpu_clear_singlestep();
+ gdb_listening = 1;
return (1);
}
case 'C': { /* Continue with signal. */
@@ -137,6 +142,7 @@
gdb_cpu_setreg(GDB_REG_PC, &pc);
}
kdb_cpu_clear_singlestep();
+ gdb_listening = 1;
return (1);
}
case 'g': { /* Read registers. */
@@ -171,6 +177,7 @@
}
case 'k': /* Kill request. */
kdb_cpu_clear_singlestep();
+ gdb_listening = 1;
return (1);
case 'm': { /* Read memory. */
uintmax_t addr, size;
@@ -243,6 +250,7 @@
gdb_cpu_setreg(GDB_REG_PC, &pc);
}
kdb_cpu_set_singlestep();
+ gdb_listening = 1;
return (1);
}
case 'S': { /* Step with signal. */
@@ -254,6 +262,7 @@
gdb_cpu_setreg(GDB_REG_PC, &pc);
}
kdb_cpu_set_singlestep();
+ gdb_listening = 1;
return (1);
}
case 'T': { /* Thread alive. */
More information about the Midnightbsd-cvs
mailing list