Module Name: src
Committed By: christos
Date: Tue Mar 10 15:54:52 UTC 2020
Modified Files:
src/sys/arch/sparc64/include: db_machdep.h
src/sys/arch/sparc64/sparc64: db_machdep.c db_trace.c
Log Message:
Don't provide things that don't make sense in userland. We don't provide
access to registers crash(8)...
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sparc64/include/db_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/sparc64/db_machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc64/sparc64/db_trace.c
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/sparc64/include/db_machdep.h
diff -u src/sys/arch/sparc64/include/db_machdep.h:1.35 src/sys/arch/sparc64/include/db_machdep.h:1.36
--- src/sys/arch/sparc64/include/db_machdep.h:1.35 Sun Nov 5 22:47:48 2017
+++ src/sys/arch/sparc64/include/db_machdep.h Tue Mar 10 11:54:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.35 2017/11/06 03:47:48 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.36 2020/03/10 15:54:52 christos Exp $ */
/*
* Mach Operating System
@@ -69,9 +69,11 @@ typedef struct {
} db_regs_t;
/* Current CPU register state */
+#ifdef _KERNEL
#define DDB_REGS ((db_regs_t*)__UNVOLATILE(curcpu()->ci_ddb_regs))
#define DDB_TF (&DDB_REGS->db_tf)
#define DDB_FP (&DDB_REGS->db_fpstate)
+#endif
/* DDB commands not in db_interface.c */
void db_dump_ts(db_expr_t, bool, db_expr_t, const char *);
Index: src/sys/arch/sparc64/sparc64/db_machdep.c
diff -u src/sys/arch/sparc64/sparc64/db_machdep.c:1.1 src/sys/arch/sparc64/sparc64/db_machdep.c:1.2
--- src/sys/arch/sparc64/sparc64/db_machdep.c:1.1 Sat Feb 18 10:56:31 2012
+++ src/sys/arch/sparc64/sparc64/db_machdep.c Tue Mar 10 11:54:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.1 2012/02/18 15:56:31 christos Exp $ */
+/* $NetBSD: db_machdep.c,v 1.2 2020/03/10 15:54:52 christos Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.1 2012/02/18 15:56:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.2 2020/03/10 15:54:52 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: db_machdep.c
#include <sys/cpu.h>
#include <ddb/ddb.h>
+#ifdef _KERNEL
static int
db_sparc_charop(const struct db_variable *vp, db_expr_t *val, int opcode)
{
@@ -220,6 +221,7 @@ const struct db_variable db_regs[] = {
{ "gsr", dbregfp(gsr), db_sparc_intop, 0 },
};
const struct db_variable * const db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
+#endif
#ifndef DDB
const struct db_command db_machine_command_table[] = {
Index: src/sys/arch/sparc64/sparc64/db_trace.c
diff -u src/sys/arch/sparc64/sparc64/db_trace.c:1.53 src/sys/arch/sparc64/sparc64/db_trace.c:1.54
--- src/sys/arch/sparc64/sparc64/db_trace.c:1.53 Wed May 22 11:10:13 2019
+++ src/sys/arch/sparc64/sparc64/db_trace.c Tue Mar 10 11:54:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.53 2019/05/22 15:10:13 martin Exp $ */
+/* $NetBSD: db_trace.c,v 1.54 2020/03/10 15:54:52 christos Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.53 2019/05/22 15:10:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.54 2020/03/10 15:54:52 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -202,6 +202,7 @@ db_stack_trace_print(db_expr_t addr, boo
}
+#ifdef _KERNEL
void
db_dump_window(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
@@ -222,6 +223,7 @@ db_dump_window(db_expr_t addr, bool have
db_printf("Window %lx ", (long)addr);
db_print_window(frame);
}
+#endif
void
db_print_window(uint64_t frame)
@@ -307,6 +309,7 @@ db_print_window(uint64_t frame)
}
}
+#ifdef _KERNEL
void
db_dump_stack(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
@@ -549,3 +552,4 @@ db_dump_ts(db_expr_t addr, bool have_add
}
}
+#endif
