Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that we can deal with debug exceptions, use a BRK instruction for 

ddb breakpoints instead of TRAPA in order to simplify the trapa (syscall)
handler.
This commit is contained in:
scw 2003-03-19 11:37:57 +00:00
parent 9be8ac5294
commit 5d74e4ddb2
5 changed files with 25 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sh5/include/db_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_machdep.h,v 1.6 2002/11/23 09:25:54 scw Exp $ */
/* $NetBSD: db_machdep.h,v 1.7 2003/03/19 11:37:57 scw Exp $ */
/*
* This is still very much experimental. There is as yet no DB support
@ -54,7 +54,7 @@ db_regs_t ddb_regs; /* register state */
#define PC_REGS(r) ((db_addr_t)(r)->tf_state.sf_spc & ~1)
#define PC_ADVANCE(r) ((r)->tf_state.sf_spc += BKPT_SIZE)
#define BKPT_INST 0x6ff1fff0 /* breakpoint instruction (trapa r63) */
#define BKPT_INST 0x6ff5fff0 /* breakpoint instruction (BRK) */
#define BKPT_SIZE 4 /* size of breakpoint inst */
#define BKPT_SET(inst) BKPT_INST

5
sys/arch/sh5/sh5/db_interface.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.10 2003/01/19 19:49:52 scw Exp $ */
/* $NetBSD: db_interface.c,v 1.11 2003/03/19 11:37:57 scw Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -226,7 +226,8 @@ int already_in_db;
void
cpu_Debugger(void)
{
asm volatile("trapa r63");
asm volatile("brk");
}
int

4
sys/arch/sh5/sh5/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.28 2003/03/13 13:44:19 scw Exp $ */
/* $NetBSD: pmap.c,v 1.29 2003/03/19 11:37:58 scw Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -130,7 +130,7 @@
#define pmap_debugger() panic("")
#else
#include <machine/db_machdep.h>
#define pmap_debugger() asm volatile("trapa r63");
#define pmap_debugger() asm volatile("brk");
int validate_kipt(int);
#endif
#endif

6
sys/arch/sh5/sh5/syscall.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: syscall.c,v 1.7 2003/01/19 19:49:56 scw Exp $ */
/* $NetBSD: syscall.c,v 1.8 2003/03/19 11:37:58 scw Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -189,6 +189,8 @@ syscall_plain(struct lwp *l, struct trapframe *tf)
uvmexp.syscalls++;
tf->tf_state.sf_spc += 4; /* Step over the trapa insn */
code = tf->tf_caller.r0; /* System call number passed in r0 */
callp = p->p_emul->e_sysent;
@ -288,6 +290,8 @@ syscall_fancy(struct lwp *l, struct trapframe *tf)
uvmexp.syscalls++;
tf->tf_state.sf_spc += 4; /* Step over the trapa insn */
code = tf->tf_caller.r0; /* System call number passed in r0 */
callp = p->p_emul->e_sysent;

95
sys/arch/sh5/sh5/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.19 2003/03/13 13:44:20 scw Exp $ */
/* $NetBSD: trap.c,v 1.20 2003/03/19 11:37:57 scw Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@ -102,7 +102,6 @@ label_t *onfault;
#ifdef DEBUG
int sh5_syscall_debug;
int sh5_trap_debug;
#endif
@ -140,11 +139,6 @@ trap(struct lwp *l, struct trapframe *tf)
int sig = 0;
u_long ucode = 0;
#ifdef DEBUG
static register_t last_tea, last_expevt;
static int last_count;
#endif
uvmexp.traps++;
traptype = tf->tf_state.sf_expevt;
@ -159,33 +153,6 @@ trap(struct lwp *l, struct trapframe *tf)
p = l->l_proc;
vaddr = (vaddr_t) tf->tf_state.sf_tea;
#ifdef DEBUG
if (sh5_trap_debug) {
if (last_tea == tf->tf_state.sf_tea &&
last_expevt == tf->tf_state.sf_expevt) {
if (last_count++ == 10) {
printf("Repetitive fault. curvsid = 0x%x\n",
curcpu()->ci_curvsid);
printf("\ntrap: %s in %s mode\n",
trap_type(traptype),
USERMODE(tf) ? "user" : "kernel");
printf(
"SSR=0x%x, SPC=0x%lx, TEA=0x%lx, TRA=0x%x\n",
(u_int)tf->tf_state.sf_ssr,
(uintptr_t)tf->tf_state.sf_spc,
(uintptr_t)tf->tf_state.sf_tea,
(u_int)tf->tf_state.sf_tra);
kdb_trap(traptype, tf);
last_count = 0;
}
} else
last_count = 0;
last_tea = tf->tf_state.sf_tea;
last_expevt = tf->tf_state.sf_expevt;
}
#endif
switch (traptype) {
default:
dopanic:
@ -388,10 +355,12 @@ trap(struct lwp *l, struct trapframe *tf)
case T_NMI|T_USER:
printf("trap: NMI detected\n");
sh5_nmi_clear();
/*FALLTHROUGH*/
#ifdef DDB
if (kdb_trap(traptype, tf)) {
case T_BREAK:
if (kdb_trap(traptype, tf))
return;
}
#endif
goto dopanic;
}
@ -406,45 +375,16 @@ trap(struct lwp *l, struct trapframe *tf)
void
trapa(struct lwp *l, struct trapframe *tf)
{
struct proc *p;
u_int trapcode;
#ifdef DIAGNOSTIC
const char *pstr;
#endif
if (!USERMODE(tf) || l == NULL) {
const char *pstr;
#ifdef DDB
/*
* Kernel breakpoints use "trapa r63".
*
* XXX: May want to change this to "illegal" in order to avoid
* polluting the syscall() path.
*/
if (!USERMODE(tf) && tf->tf_state.sf_tra == 0) {
if (kdb_trap(T_BREAK, tf))
return;
}
#endif
#ifdef DEBUG
if (sh5_syscall_debug) {
printf("trapa: TRAPA in %s mode ",
USERMODE(tf) ? "user" : "kernel");
if (l != NULL)
printf("pid=%d cmd=%s, usp=0x%lx\n",
l->l_proc->p_pid, l->l_proc->p_comm,
(uintptr_t)tf->tf_caller.r15);
if (l == NULL)
pstr = "trapa: NULL lwp!";
else
printf("curlwp == NULL ");
printf("trapa: SPC=0x%lx, SSR=0x%x, TRA=0x%x, R0=%d\n",
(uintptr_t)tf->tf_state.sf_spc, (u_int)tf->tf_state.sf_ssr,
(u_int)tf->tf_state.sf_tra, (u_int)tf->tf_caller.r0);
}
#endif
pstr = "trapa: TRAPA in kernel mode!";
#ifdef DIAGNOSTIC
if (!USERMODE(tf)) {
pstr = "trapa: TRAPA in kernel mode!";
trapa_panic:
if (l != NULL)
printf("pid=%d cmd=%s, usp=0x%lx ",
l->l_proc->p_pid, l->l_proc->p_comm,
@ -458,23 +398,14 @@ trapa_panic:
panic(pstr);
/*NOTREACHED*/
}
if (l == NULL) {
pstr = "trapa: NULL lwp!";
goto trapa_panic;
}
#endif
uvmexp.traps++;
p = l->l_proc;
l->l_md.md_regs = tf;
trapcode = tf->tf_state.sf_tra;
switch (trapcode) {
switch (tf->tf_state.sf_tra) {
case TRAPA_SYSCALL:
tf->tf_state.sf_spc += 4; /* Skip over the trapa */
(p->p_md.md_syscall)(l, tf);
(l->l_proc->p_md.md_syscall)(l, tf);
break;
default: