d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot these files in previous commit to frame.h. Also add needed include

Browse Source 
of machine/emul.h.
This commit is contained in:
Jake Burkholder 2002-04-09 01:43:07 +00:00
parent d134a05e90
commit 22d67801e6
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/sparc64/sparc64/db_trace.c
View File

@ -148,8 +148,8 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count,
fp = (struct frame *)(addr + SPOFF);
while (count-- && !user) {
pc = (db_addr_t)db_get_value((db_addr_t)&fp->f_pc,
sizeof(fp->f_pc), FALSE);
pc = (db_addr_t)db_get_value((db_addr_t)&fp->fr_pc,
sizeof(fp->fr_pc), FALSE);
if (trap) {
pc = npc;
trap = 0;
@ -164,8 +164,8 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count,
db_symbol_values(sym, &name, &value);
if (name == NULL)
name = "(null)";
fp = (struct frame *)(db_get_value((db_addr_t)&fp->f_fp,
sizeof(fp->f_fp), FALSE) + SPOFF);
fp = (struct frame *)(db_get_value((db_addr_t)&fp->fr_fp,
sizeof(fp->fr_fp), FALSE) + SPOFF);
if (bcmp(name, "tl0_", 4) == 0 ||
bcmp(name, "tl1_", 4) == 0) {
tf = (struct trapframe *)(fp + 1);
@ -296,9 +296,9 @@ db_utrace(struct thread *td, struct trapframe *tf)
if (!found) {
rsp = sp + SPOFF;
sp = NULL;
if (copyin((void *)(rsp + offsetof(struct frame, f_fp)),
if (copyin((void *)(rsp + offsetof(struct frame, fr_fp)),
&sp, sizeof(sp)) != 0 ||
copyin((void *)(rsp + offsetof(struct frame, f_pc)),
copyin((void *)(rsp + offsetof(struct frame, fr_pc)),
&pc, sizeof(pc)) != 0)
break;
}

3
sys/sparc64/sparc64/trap.c
View File

@ -72,6 +72,7 @@
#include <vm/vm_page.h>
#include <machine/clock.h>
#include <machine/emul.h>
#include <machine/frame.h>
#include <machine/intr_machdep.h>
#include <machine/pcb.h>
@ -592,7 +593,7 @@ syscall(struct trapframe *tf)
argp = args;
bcopy(&tf->tf_out[reg], args, sizeof(args[0]) * regcnt);
error = copyin((void *)(tf->tf_out[6] + SPOFF +
offsetof(struct frame, f_pad[6])),
offsetof(struct frame, fr_pad[6])),
&args[regcnt], (narg - regcnt) * sizeof(args[0]));
if (error != 0)
goto bad;