diff options
| author | jake <jake@FreeBSD.org> | 2002-04-09 01:43:07 +0000 |
|---|---|---|
| committer | jake <jake@FreeBSD.org> | 2002-04-09 01:43:07 +0000 |
| commit | 3a976de1b56c58e2695b1f1c26f43af30f14782f (patch) | |
| tree | d226b47c6e44705083e99114ff0a3936467c892b /sys/sparc64 | |
| parent | 85bbc7c150aacc439ef3132aa9e57589fe548289 (diff) | |
| download | FreeBSD-src-3a976de1b56c58e2695b1f1c26f43af30f14782f.zip FreeBSD-src-3a976de1b56c58e2695b1f1c26f43af30f14782f.tar.gz | |
Forgot these files in previous commit to frame.h. Also add needed include
of machine/emul.h.
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/sparc64/db_trace.c | 12 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/trap.c | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/sparc64/sparc64/db_trace.c b/sys/sparc64/sparc64/db_trace.c index 7674ffa..417cb80 100644 --- a/sys/sparc64/sparc64/db_trace.c +++ b/sys/sparc64/sparc64/db_trace.c @@ -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; } diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c index b677407..ff974a6 100644 --- a/sys/sparc64/sparc64/trap.c +++ b/sys/sparc64/sparc64/trap.c @@ -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; |
