diff options
| -rw-r--r-- | sys/sparc64/include/pcb.h | 2 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/db_trace.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/genassym.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/swtch.S | 8 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/vm_machdep.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sys/sparc64/include/pcb.h b/sys/sparc64/include/pcb.h index 348b4b1..2d847b9 100644 --- a/sys/sparc64/include/pcb.h +++ b/sys/sparc64/include/pcb.h @@ -37,7 +37,7 @@ /* NOTE: pcb_fpstate must be aligned on a 64 byte boundary. */ struct pcb { struct fpstate pcb_fpstate; - u_long pcb_fp; + u_long pcb_sp; u_long pcb_pc; u_long pcb_nsaved; u_long pcb_rwsp[MAXWIN]; diff --git a/sys/sparc64/sparc64/db_trace.c b/sys/sparc64/sparc64/db_trace.c index bd01490..d5abb6d 100644 --- a/sys/sparc64/sparc64/db_trace.c +++ b/sys/sparc64/sparc64/db_trace.c @@ -142,7 +142,7 @@ db_stack_trace_cmd(db_expr_t addr, boolean_t have_addr, db_expr_t count, return; } td = FIRST_THREAD_IN_PROC(p); /* XXXKSE */ - addr = td->td_pcb->pcb_fp; + addr = td->td_pcb->pcb_sp; } } fp = (struct frame *)(addr + SPOFF); diff --git a/sys/sparc64/sparc64/genassym.c b/sys/sparc64/sparc64/genassym.c index 2032cd8..5a5d626 100644 --- a/sys/sparc64/sparc64/genassym.c +++ b/sys/sparc64/sparc64/genassym.c @@ -244,7 +244,7 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(PCB_SIZEOF, sizeof(struct pcb)); ASSYM(PCB_FPSTATE, offsetof(struct pcb, pcb_fpstate)); -ASSYM(PCB_FP, offsetof(struct pcb, pcb_fp)); +ASSYM(PCB_SP, offsetof(struct pcb, pcb_sp)); ASSYM(PCB_PC, offsetof(struct pcb, pcb_pc)); ASSYM(PCB_NSAVED, offsetof(struct pcb, pcb_nsaved)); ASSYM(PCB_RWSP, offsetof(struct pcb, pcb_rwsp)); diff --git a/sys/sparc64/sparc64/swtch.S b/sys/sparc64/sparc64/swtch.S index 289bdb4..03203e2 100644 --- a/sys/sparc64/sparc64/swtch.S +++ b/sys/sparc64/sparc64/swtch.S @@ -83,7 +83,7 @@ ENTRY(cpu_switch) */ 1: flushw wrpr %g0, 0, %cleanwin - stx %fp, [%l1 + PCB_FP] + stx %fp, [%l1 + PCB_SP] stx %i7, [%l1 + PCB_PC] /* @@ -98,12 +98,12 @@ ENTRY(cpu_switch) ldx [%o0 + TD_PCB], %g2 ldx [%g2 + PCB_PC], %g3 stx %g3, [%g1 + KTR_PARM2] - ldx [%g2 + PCB_FP], %g3 + ldx [%g2 + PCB_SP], %g3 stx %g3, [%g1 + KTR_PARM3] 9: #endif ldx [%o0 + TD_PCB], %o1 - ldx [%o1 + PCB_FP], %fp + ldx [%o1 + PCB_SP], %fp ldx [%o1 + PCB_PC], %i7 sub %fp, CCFSZ, %sp stx %o0, [PCPU(CURTHREAD)] @@ -271,7 +271,7 @@ ENTRY(savectx) flushw call savefpctx mov %i0, %o0 - stx %fp, [%i0 + PCB_FP] + stx %fp, [%i0 + PCB_SP] stx %i7, [%i0 + PCB_PC] ret restore %g0, 0, %o0 diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c index 7258727..510765e 100644 --- a/sys/sparc64/sparc64/vm_machdep.c +++ b/sys/sparc64/sparc64/vm_machdep.c @@ -240,7 +240,7 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags) fp->fr_local[0] = (u_long)fork_return; fp->fr_local[1] = (u_long)td2; fp->fr_local[2] = (u_long)tf; - pcb2->pcb_fp = (u_long)fp - SPOFF; + pcb2->pcb_sp = (u_long)fp - SPOFF; pcb2->pcb_pc = (u_long)fork_trampoline - 8; /* @@ -286,7 +286,7 @@ cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg) struct pcb *pcb; pcb = td->td_pcb; - fp = (struct frame *)(pcb->pcb_fp + SPOFF); + fp = (struct frame *)(pcb->pcb_sp + SPOFF); fp->fr_local[0] = (u_long)func; fp->fr_local[1] = (u_long)arg; } |
