Remove the "machine dependent" KTR trace buffer ddb commands. The code was

exactly the same on all platforms.

4 files changed, 0 insertions, 378 deletions

diff --git a/sys/alpha/alpha/db_interface.c b/sys/alpha/alpha/db_interface.c
index 4ed58ca..f04cbe1 100644
--- a/sys/alpha/alpha/db_interface.c
+++ b/sys/alpha/alpha/db_interface.c
@@ -562,104 +562,3 @@ db_branch_taken(ins, pc, regs)
 
 	return (newpc);
 }
-
-#if defined(KTR)
-
-struct tstate {
-	int	cur;
-	int	first;
-};
-static struct tstate tstate;
-static struct timespec lastt;
-static int db_mach_vtrace(void);
-
-DB_COMMAND(tbuf, db_mach_tbuf)
-{
-	struct ktr_entry	*k1, *ck, *kend;
-	struct timespec		newk;
-
-	k1 = ktr_buf;
-	ck = k1;
-	timespecclear(&newk);
-	kend = ktr_buf + KTR_ENTRIES;
-	while (k1 != kend) {
-		if (timespecisset(&k1->ktr_tv) &&
-		    timespeccmp(&k1->ktr_tv, &newk, >)) {
-			newk = k1->ktr_tv;
-			ck = k1;
-		}
-		k1++;
-	}
-	tstate.cur = ck - ktr_buf;
-	tstate.first = tstate.cur | 0x80000000;
-	timespecclear(&lastt);
-	db_mach_vtrace();
-
-	return;
-}
-
-DB_COMMAND(tall, db_mach_tall)
-{
-	int	c;
-
-	db_mach_tbuf(addr, have_addr, count, modif);
-	while (db_mach_vtrace()) {
-		c = cncheckc();
-		if (c != -1)
-			break;
-	}
-
-	return;
-}
-
-DB_COMMAND(tnext, db_mach_tnext)
-{
-	db_mach_vtrace();
-}
-
-static int
-db_mach_vtrace(void)
-{
-	struct ktr_entry	*kp;
-	struct timespec		ts;
-	char			*d;
-
-	kp = NULL;
-	if (tstate.cur != tstate.first)
-		kp = ktr_buf + tstate.cur;
-	else
-		kp = NULL;
-
-	if (!kp) {
-		db_printf("--- End of trace buffer ---\n");
-		return (0);
-	}
-
-	d = kp->ktr_desc;
-	if (d == NULL) 
-		d = "*** Empty ***";
-	else if (lastt.tv_sec == 0) {
-		db_printf("Newest entry at clock %d.%06ld\n",
-			  kp->ktr_tv.tv_sec,
-			  kp->ktr_tv.tv_nsec / 1000);
-		lastt = kp->ktr_tv;
-	}
-	ts = lastt;
-	db_printf("%4d.%06ld: ", ts.tv_sec, ts.tv_nsec / 1000);
-	lastt = kp->ktr_tv;
-#ifdef KTR_EXTEND
-	db_printf("cpu%d %s.%d\t%s", kp->ktr_cpu, kp->ktr_filename,
-		  kp->ktr_line, kp->ktr_desc);
-#else
-	db_printf(d, kp->ktr_parm1, kp->ktr_parm2, kp->ktr_parm3,
-		    kp->ktr_parm4, kp->ktr_parm5);
-#endif
-	db_printf("\n");
-	tstate.first &= ~0x80000000;
-	if (--tstate.cur < 0)
-		tstate.cur = KTR_ENTRIES - 1;
-
-	return (1);
-}
-
-#endif
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index a2d07cb..fe94264 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -326,104 +326,3 @@ Debugger(msg)
 	    in_Debugger = 0;
 	}
 }
-
-#if defined(KTR)
-
-struct tstate {
-	int	cur;
-	int	first;
-};
-static struct tstate tstate;
-static struct timespec lastt;
-static int db_mach_vtrace(void);
-
-DB_COMMAND(tbuf, db_mach_tbuf)
-{
-	struct ktr_entry	*k1, *ck, *kend;
-	struct timespec		newk;
-
-	k1 = ktr_buf;
-	ck = k1;
-	timespecclear(&newk);
-	kend = ktr_buf + KTR_ENTRIES;
-	while (k1 != kend) {
-		if (timespecisset(&k1->ktr_tv) &&
-		    timespeccmp(&k1->ktr_tv, &newk, >)) {
-			newk = k1->ktr_tv;
-			ck = k1;
-		}
-		k1++;
-	}
-	tstate.cur = ck - ktr_buf;
-	tstate.first = tstate.cur | 0x80000000;
-	timespecclear(&lastt);
-	db_mach_vtrace();
-
-	return;
-}
-
-DB_COMMAND(tall, db_mach_tall)
-{
-	int	c;
-
-	db_mach_tbuf(addr, have_addr, count, modif);
-	while (db_mach_vtrace()) {
-		c = cncheckc();
-		if (c != -1)
-			break;
-	}
-
-	return;
-}
-
-DB_COMMAND(tnext, db_mach_tnext)
-{
-	db_mach_vtrace();
-}
-
-static int
-db_mach_vtrace(void)
-{
-	struct ktr_entry	*kp;
-	struct timespec		ts;
-	char			*d;
-
-	kp = NULL;
-	if (tstate.cur != tstate.first)
-		kp = ktr_buf + tstate.cur;
-	else
-		kp = NULL;
-
-	if (!kp) {
-		db_printf("--- End of trace buffer ---\n");
-		return (0);
-	}
-
-	d = kp->ktr_desc;
-	if (d == NULL) 
-		d = "*** Empty ***";
-	else if (lastt.tv_sec == 0) {
-		db_printf("Newest entry at clock %ld.%06ld\n",
-			  kp->ktr_tv.tv_sec,
-			  kp->ktr_tv.tv_nsec / 1000);
-		lastt = kp->ktr_tv;
-	}
-	ts = lastt;
-	db_printf("%4ld.%06ld: ", ts.tv_sec, ts.tv_nsec / 1000);
-	lastt = kp->ktr_tv;
-#ifdef KTR_EXTEND
-	db_printf("cpu%d %s.%d\t%s", kp->ktr_cpu, kp->ktr_filename,
-		  kp->ktr_line, kp->ktr_desc);
-#else
-	db_printf(d, kp->ktr_parm1, kp->ktr_parm2, kp->ktr_parm3,
-		    kp->ktr_parm4, kp->ktr_parm5);
-#endif
-	db_printf("\n");
-	tstate.first &= ~0x80000000;
-	if (--tstate.cur < 0)
-		tstate.cur = KTR_ENTRIES - 1;
-
-	return (1);
-}
-
-#endif
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index a2d07cb..fe94264 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -326,104 +326,3 @@ Debugger(msg)
 	    in_Debugger = 0;
 	}
 }
-
-#if defined(KTR)
-
-struct tstate {
-	int	cur;
-	int	first;
-};
-static struct tstate tstate;
-static struct timespec lastt;
-static int db_mach_vtrace(void);
-
-DB_COMMAND(tbuf, db_mach_tbuf)
-{
-	struct ktr_entry	*k1, *ck, *kend;
-	struct timespec		newk;
-
-	k1 = ktr_buf;
-	ck = k1;
-	timespecclear(&newk);
-	kend = ktr_buf + KTR_ENTRIES;
-	while (k1 != kend) {
-		if (timespecisset(&k1->ktr_tv) &&
-		    timespeccmp(&k1->ktr_tv, &newk, >)) {
-			newk = k1->ktr_tv;
-			ck = k1;
-		}
-		k1++;
-	}
-	tstate.cur = ck - ktr_buf;
-	tstate.first = tstate.cur | 0x80000000;
-	timespecclear(&lastt);
-	db_mach_vtrace();
-
-	return;
-}
-
-DB_COMMAND(tall, db_mach_tall)
-{
-	int	c;
-
-	db_mach_tbuf(addr, have_addr, count, modif);
-	while (db_mach_vtrace()) {
-		c = cncheckc();
-		if (c != -1)
-			break;
-	}
-
-	return;
-}
-
-DB_COMMAND(tnext, db_mach_tnext)
-{
-	db_mach_vtrace();
-}
-
-static int
-db_mach_vtrace(void)
-{
-	struct ktr_entry	*kp;
-	struct timespec		ts;
-	char			*d;
-
-	kp = NULL;
-	if (tstate.cur != tstate.first)
-		kp = ktr_buf + tstate.cur;
-	else
-		kp = NULL;
-
-	if (!kp) {
-		db_printf("--- End of trace buffer ---\n");
-		return (0);
-	}
-
-	d = kp->ktr_desc;
-	if (d == NULL) 
-		d = "*** Empty ***";
-	else if (lastt.tv_sec == 0) {
-		db_printf("Newest entry at clock %ld.%06ld\n",
-			  kp->ktr_tv.tv_sec,
-			  kp->ktr_tv.tv_nsec / 1000);
-		lastt = kp->ktr_tv;
-	}
-	ts = lastt;
-	db_printf("%4ld.%06ld: ", ts.tv_sec, ts.tv_nsec / 1000);
-	lastt = kp->ktr_tv;
-#ifdef KTR_EXTEND
-	db_printf("cpu%d %s.%d\t%s", kp->ktr_cpu, kp->ktr_filename,
-		  kp->ktr_line, kp->ktr_desc);
-#else
-	db_printf(d, kp->ktr_parm1, kp->ktr_parm2, kp->ktr_parm3,
-		    kp->ktr_parm4, kp->ktr_parm5);
-#endif
-	db_printf("\n");
-	tstate.first &= ~0x80000000;
-	if (--tstate.cur < 0)
-		tstate.cur = KTR_ENTRIES - 1;
-
-	return (1);
-}
-
-#endif
diff --git a/sys/ia64/ia64/db_interface.c b/sys/ia64/ia64/db_interface.c
index 5add37a..36e6e17 100644
--- a/sys/ia64/ia64/db_interface.c
+++ b/sys/ia64/ia64/db_interface.c
@@ -457,78 +457,3 @@ db_register_value(regs, regno)
 		}
 	}
 }
-
-#if defined(KTR)
-
-struct tstate {
-	int	cur;
-	int	first;
-};
-static struct tstate tstate;
-static int db_mach_vtrace(void);
-
-DB_COMMAND(tbuf, db_mach_tbuf)
-{
-
-	/*
-	 * We know that ktr_idx is the oldest entry, so don't go futzing
-	 * around with timespecs unnecessarily.
-	 */
-	tstate.first = ktr_idx;
-	if ((tstate.cur = ktr_idx - 1) < 0)
-		tstate.cur = KTR_ENTRIES - 1;
-	
-	db_mach_vtrace();
-
-	return;
-}
-
-DB_COMMAND(tall, db_mach_tall)
-{
-	int	c;
-
-	db_mach_tbuf(addr, have_addr, count, modif);
-	while (db_mach_vtrace()) {
-		c = cncheckc();
-		if (c != -1)
-			break;
-	}
-
-	return;
-}
-
-DB_COMMAND(tnext, db_mach_tnext)
-{
-	db_mach_vtrace();
-}
-
-static int
-db_mach_vtrace(void)
-{
-	struct ktr_entry	*kp;
-
-	if (tstate.cur == tstate.first) {
-		db_printf("--- End of trace buffer ---\n");
-		return (0);
-	}
-
-	kp = &ktr_buf[tstate.cur];
-
-	db_printf("%d: %4d.%06ld: ", tstate.cur, kp->ktr_tv.tv_sec,
-	    kp->ktr_tv.tv_nsec / 1000);
-#ifdef KTR_EXTEND
-	db_printf("cpu%d %s.%d\t%s", kp->ktr_cpu, kp->ktr_filename,
-	    kp->ktr_line, kp->ktr_desc);
-#else
-	db_printf(kp->ktr_desc, kp->ktr_parm1, kp->ktr_parm2, kp->ktr_parm3,
-	    kp->ktr_parm4, kp->ktr_parm5);
-#endif
-	db_printf("\n");
-	tstate.first &= ~0x80000000;
-	if (--tstate.cur < 0)
-		tstate.cur = KTR_ENTRIES - 1;
-
-	return (1);
-}
-
-#endif