Update to kdb.
This commit is contained in:
Olivier Houchard
parent
219f08214b
commit
2f6d0d8fde
@ -62,36 +62,33 @@ __FBSDID("$FreeBSD$");
|
||||
#include <ddb/db_sym.h>
|
||||
#include <sys/cons.h>
|
||||
|
||||
static int nil;
|
||||
static int nil = 0;
|
||||
|
||||
db_regs_t ddb_regs;
|
||||
int db_access_und_sp (struct db_variable *, db_expr_t *, int);
|
||||
int db_access_abt_sp (struct db_variable *, db_expr_t *, int);
|
||||
int db_access_irq_sp (struct db_variable *, db_expr_t *, int);
|
||||
u_int db_fetch_reg (int, db_regs_t *);
|
||||
|
||||
int db_trapper __P((u_int, u_int, trapframe_t *, int));
|
||||
|
||||
#define DB_OFFSET(x) (db_expr_t *)offsetof(struct trapframe, x)
|
||||
struct db_variable db_regs[] = {
|
||||
{ "spsr", (int *)&DDB_REGS->tf_spsr, FCN_NULL, },
|
||||
{ "r0", (int *)&DDB_REGS->tf_r0, FCN_NULL, },
|
||||
{ "r1", (int *)&DDB_REGS->tf_r1, FCN_NULL, },
|
||||
{ "r2", (int *)&DDB_REGS->tf_r2, FCN_NULL, },
|
||||
{ "r3", (int *)&DDB_REGS->tf_r3, FCN_NULL, },
|
||||
{ "r4", (int *)&DDB_REGS->tf_r4, FCN_NULL, },
|
||||
{ "r5", (int *)&DDB_REGS->tf_r5, FCN_NULL, },
|
||||
{ "r6", (int *)&DDB_REGS->tf_r6, FCN_NULL, },
|
||||
{ "r7", (int *)&DDB_REGS->tf_r7, FCN_NULL, },
|
||||
{ "r8", (int *)&DDB_REGS->tf_r8, FCN_NULL, },
|
||||
{ "r9", (int *)&DDB_REGS->tf_r9, FCN_NULL, },
|
||||
{ "r10", (int *)&DDB_REGS->tf_r10, FCN_NULL, },
|
||||
{ "r11", (int *)&DDB_REGS->tf_r11, FCN_NULL, },
|
||||
{ "r12", (int *)&DDB_REGS->tf_r12, FCN_NULL, },
|
||||
{ "usr_sp", (int *)&DDB_REGS->tf_usr_sp, FCN_NULL, },
|
||||
{ "usr_lr", (int *)&DDB_REGS->tf_usr_lr, FCN_NULL, },
|
||||
{ "svc_sp", (int *)&DDB_REGS->tf_svc_sp, FCN_NULL, },
|
||||
{ "svc_lr", (int *)&DDB_REGS->tf_svc_lr, FCN_NULL, },
|
||||
{ "pc", (int *)&DDB_REGS->tf_pc, FCN_NULL, },
|
||||
{ "spsr", DB_OFFSET(tf_spsr), FCN_NULL, },
|
||||
{ "r0", DB_OFFSET(tf_r0), FCN_NULL, },
|
||||
{ "r1", DB_OFFSET(tf_r1), FCN_NULL, },
|
||||
{ "r2", DB_OFFSET(tf_r2), FCN_NULL, },
|
||||
{ "r3", DB_OFFSET(tf_r3), FCN_NULL, },
|
||||
{ "r4", DB_OFFSET(tf_r4), FCN_NULL, },
|
||||
{ "r5", DB_OFFSET(tf_r5), FCN_NULL, },
|
||||
{ "r6", DB_OFFSET(tf_r6), FCN_NULL, },
|
||||
{ "r7", DB_OFFSET(tf_r7), FCN_NULL, },
|
||||
{ "r8", DB_OFFSET(tf_r8), FCN_NULL, },
|
||||
{ "r9", DB_OFFSET(tf_r9), FCN_NULL, },
|
||||
{ "r10", DB_OFFSET(tf_r10), FCN_NULL, },
|
||||
{ "r11", DB_OFFSET(tf_r11), FCN_NULL, },
|
||||
{ "r12", DB_OFFSET(tf_r12), FCN_NULL, },
|
||||
{ "usr_sp", DB_OFFSET(tf_usr_sp), FCN_NULL, },
|
||||
{ "usr_lr", DB_OFFSET(tf_usr_lr), FCN_NULL, },
|
||||
{ "svc_sp", DB_OFFSET(tf_svc_sp), FCN_NULL, },
|
||||
{ "svc_lr", DB_OFFSET(tf_svc_lr), FCN_NULL, },
|
||||
{ "pc", DB_OFFSET(tf_pc), FCN_NULL, },
|
||||
{ "und_sp", &nil, db_access_und_sp, },
|
||||
{ "abt_sp", &nil, db_access_abt_sp, },
|
||||
{ "irq_sp", &nil, db_access_irq_sp, },
|
||||
@ -99,8 +96,6 @@ struct db_variable db_regs[] = {
|
||||
|
||||
struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
|
||||
|
||||
int db_active = 0;
|
||||
|
||||
int
|
||||
db_access_und_sp(struct db_variable *vp, db_expr_t *valp, int rw)
|
||||
{
|
||||
@ -128,39 +123,6 @@ db_access_irq_sp(struct db_variable *vp, db_expr_t *valp, int rw)
|
||||
return(0);
|
||||
}
|
||||
|
||||
#ifdef DDB
|
||||
/*
|
||||
* kdb_trap - field a TRACE or BPT trap
|
||||
*/
|
||||
int
|
||||
kdb_trap(int type, db_regs_t *regs)
|
||||
{
|
||||
int s;
|
||||
|
||||
switch (type) {
|
||||
case T_BREAKPOINT: /* breakpoint */
|
||||
case -1: /* keyboard interrupt */
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Should switch to kdb`s own stack here. */
|
||||
|
||||
ddb_regs = *regs;
|
||||
|
||||
s = splhigh();
|
||||
db_active++;
|
||||
db_trap(type, 0/*code*/);
|
||||
db_active--;
|
||||
splx(s);
|
||||
|
||||
*regs = ddb_regs;
|
||||
|
||||
return (1);
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
db_show_mdpcpu(struct pcpu *pc)
|
||||
{
|
||||
@ -188,7 +150,7 @@ db_validate_address(vm_offset_t addr)
|
||||
/*
|
||||
* Read bytes from kernel address space for debugger.
|
||||
*/
|
||||
void
|
||||
int
|
||||
db_read_bytes(addr, size, data)
|
||||
vm_offset_t addr;
|
||||
size_t size;
|
||||
@ -198,32 +160,33 @@ db_read_bytes(addr, size, data)
|
||||
|
||||
if (db_validate_address((u_int)src)) {
|
||||
db_printf("address %p is invalid\n", src);
|
||||
return;
|
||||
return (-1);
|
||||
}
|
||||
|
||||
if (size == 4 && (addr & 3) == 0 && ((uintptr_t)data & 3) == 0) {
|
||||
*((int*)data) = *((int*)src);
|
||||
return;
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (size == 2 && (addr & 1) == 0 && ((uintptr_t)data & 1) == 0) {
|
||||
*((short*)data) = *((short*)src);
|
||||
return;
|
||||
return (0);
|
||||
}
|
||||
|
||||
while (size-- > 0) {
|
||||
if (db_validate_address((u_int)src)) {
|
||||
db_printf("address %p is invalid\n", src);
|
||||
return;
|
||||
return (-1);
|
||||
}
|
||||
*data++ = *src++;
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write bytes to kernel address space for debugger.
|
||||
*/
|
||||
void
|
||||
int
|
||||
db_write_bytes(vm_offset_t addr, size_t size, char *data)
|
||||
{
|
||||
char *dst;
|
||||
@ -231,13 +194,13 @@ db_write_bytes(vm_offset_t addr, size_t size, char *data)
|
||||
|
||||
/* If any part is in kernel text, use db_write_text() */
|
||||
if (addr >= (vm_offset_t) btext && addr < (vm_offset_t) etext) {
|
||||
return;
|
||||
return (-1);
|
||||
}
|
||||
|
||||
dst = (char *)addr;
|
||||
if (db_validate_address((u_int)dst)) {
|
||||
db_printf("address %p is invalid\n", dst);
|
||||
return;
|
||||
return (0);
|
||||
}
|
||||
|
||||
if (size == 4 && (addr & 3) == 0 && ((uintptr_t)data & 3) == 0)
|
||||
@ -250,7 +213,7 @@ db_write_bytes(vm_offset_t addr, size_t size, char *data)
|
||||
while (loop-- > 0) {
|
||||
if (db_validate_address((u_int)dst)) {
|
||||
db_printf("address %p is invalid\n", dst);
|
||||
return;
|
||||
return (-1);
|
||||
}
|
||||
*dst++ = *data++;
|
||||
}
|
||||
@ -262,73 +225,8 @@ db_write_bytes(vm_offset_t addr, size_t size, char *data)
|
||||
/* In case the current page tables have been modified ... */
|
||||
cpu_tlb_flushID();
|
||||
cpu_cpwait();
|
||||
}
|
||||
|
||||
#ifdef DDB
|
||||
void
|
||||
Debugger(const char *msg)
|
||||
{
|
||||
db_printf("Debugger(\"%s\")\n", msg);
|
||||
__asm(".word 0xe7ffffff");
|
||||
}
|
||||
|
||||
int
|
||||
db_trapper(u_int addr, u_int inst, trapframe_t *frame, int fault_code)
|
||||
{
|
||||
|
||||
if (fault_code == 0) {
|
||||
if ((inst & ~INSN_COND_MASK) == (BKPT_INST & ~INSN_COND_MASK))
|
||||
kdb_trap(T_BREAKPOINT, frame);
|
||||
else
|
||||
kdb_trap(-1, frame);
|
||||
} else
|
||||
return (1);
|
||||
return (0);
|
||||
}
|
||||
|
||||
extern u_int end;
|
||||
|
||||
#endif
|
||||
|
||||
u_int
|
||||
db_fetch_reg(int reg, db_regs_t *db_regs)
|
||||
{
|
||||
|
||||
switch (reg) {
|
||||
case 0:
|
||||
return (db_regs->tf_r0);
|
||||
case 1:
|
||||
return (db_regs->tf_r1);
|
||||
case 2:
|
||||
return (db_regs->tf_r2);
|
||||
case 3:
|
||||
return (db_regs->tf_r3);
|
||||
case 4:
|
||||
return (db_regs->tf_r4);
|
||||
case 5:
|
||||
return (db_regs->tf_r5);
|
||||
case 6:
|
||||
return (db_regs->tf_r6);
|
||||
case 7:
|
||||
return (db_regs->tf_r7);
|
||||
case 8:
|
||||
return (db_regs->tf_r8);
|
||||
case 9:
|
||||
return (db_regs->tf_r9);
|
||||
case 10:
|
||||
return (db_regs->tf_r10);
|
||||
case 11:
|
||||
return (db_regs->tf_r11);
|
||||
case 12:
|
||||
return (db_regs->tf_r12);
|
||||
case 13:
|
||||
return (db_regs->tf_svc_sp);
|
||||
case 14:
|
||||
return (db_regs->tf_svc_lr);
|
||||
case 15:
|
||||
return (db_regs->tf_pc);
|
||||
default:
|
||||
panic("db_fetch_reg: botch");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/proc.h>
|
||||
#include <sys/user.h>
|
||||
#include <sys/kdb.h>
|
||||
#include <machine/armreg.h>
|
||||
#include <machine/asm.h>
|
||||
#include <machine/cpufunc.h>
|
||||
@ -102,6 +103,8 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
|
||||
boolean_t trace_thread = FALSE;
|
||||
int scp_offset;
|
||||
|
||||
if (kdb_frame == NULL)
|
||||
return;
|
||||
while ((c = *cp++) != 0) {
|
||||
if (c == 'u')
|
||||
kernel_only = FALSE;
|
||||
@ -110,7 +113,7 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
|
||||
}
|
||||
|
||||
if (!have_addr)
|
||||
frame = (u_int32_t *)(DDB_REGS->tf_r11);
|
||||
frame = (u_int32_t *)(kdb_frame->tf_r11);
|
||||
else {
|
||||
if (trace_thread) {
|
||||
struct proc *p;
|
||||
@ -157,7 +160,7 @@ db_stack_trace_cmd(addr, have_addr, count, modif)
|
||||
|
||||
db_printsym(scp, DB_STGY_PROC);
|
||||
db_printf("\n\t");
|
||||
pc = ddb_regs.tf_pc;
|
||||
pc = kdb_frame->tf_pc;
|
||||
sym = db_search_symbol(pc, DB_STGY_ANY, &offset);
|
||||
if (sym == C_DB_SYM_NULL) {
|
||||
value = 0;
|
||||
@ -242,9 +245,15 @@ db_md_set_watchpoint(db_expr_t addr, db_expr_t size)
|
||||
{
|
||||
return (0);
|
||||
}
|
||||
void
|
||||
db_print_backtrace(void)
|
||||
int
|
||||
db_trace_thread(struct thread *thr, int count)
|
||||
{
|
||||
|
||||
db_stack_trace_cmd((db_expr_t)__builtin_frame_address(0), 1, -1, NULL);
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
db_trace_self(void)
|
||||
{
|
||||
}
|
||||
|
||||
@ -40,18 +40,14 @@
|
||||
typedef vm_offset_t db_addr_t;
|
||||
typedef int db_expr_t;
|
||||
|
||||
typedef struct trapframe db_regs_t;
|
||||
extern db_regs_t ddb_regs;
|
||||
#define DDB_REGS (&ddb_regs)
|
||||
|
||||
#define PC_REGS(regs) ((db_addr_t)(regs)->tf_pc)
|
||||
#define PC_REGS() ((db_addr_t)kdb_thrctx->un_32.pcb32_pc)
|
||||
|
||||
#define BKPT_INST (KERNEL_BREAKPOINT)
|
||||
#define BKPT_SIZE (INSN_SIZE)
|
||||
#define BKPT_SET(inst) (BKPT_INST)
|
||||
|
||||
#define BKPT_SKIP do { \
|
||||
ddb_regs.tf_pc -= BKPT_SIZE; \
|
||||
kdb_frame->tf_pc -= BKPT_SIZE; \
|
||||
} while (0)
|
||||
|
||||
#define db_clear_single_step(regs)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user