diff options
| author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2020-11-06 19:19:51 +0000 |
|---|---|---|
| committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2020-11-06 19:19:51 +0000 |
| commit | 24adaab477dca6fe334057a5f75c7a6b372b244a (patch) | |
| tree | ec8f77911fe3cc3573bf476a2ddbab1360c9370a /sys/mips | |
| parent | 890efa1ab946ce5b47ba8d5cd961dbaea615e2e6 (diff) | |
Notes
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/include/proc.h | 4 | ||||
| -rw-r--r-- | sys/mips/mips/trap.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/mips/include/proc.h b/sys/mips/include/proc.h index d0acf5e46c76..0cb1d433387c 100644 --- a/sys/mips/include/proc.h +++ b/sys/mips/include/proc.h @@ -81,11 +81,11 @@ struct mdproc { size_t md_tls_tcb_offset; /* TCB offset */ }; +#define MAXARGS 8 struct syscall_args { u_int code; struct sysent *callp; - register_t args[8]; - struct trapframe *trapframe; + register_t args[MAXARGS]; }; #ifdef __mips_n64 diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c index 0fdd8f77c502..78e7c0ed8113 100644 --- a/sys/mips/mips/trap.c +++ b/sys/mips/mips/trap.c @@ -349,9 +349,9 @@ cpu_fetch_syscall_args(struct thread *td) bzero(sa->args, sizeof(sa->args)); /* compute next PC after syscall instruction */ - td->td_pcb->pcb_tpc = sa->trapframe->pc; /* Remember if restart */ - if (DELAYBRANCH(sa->trapframe->cause)) /* Check BD bit */ - locr0->pc = MipsEmulateBranch(locr0, sa->trapframe->pc, 0, 0); + td->td_pcb->pcb_tpc = locr0->pc; /* Remember if restart */ + if (DELAYBRANCH(locr0->cause)) /* Check BD bit */ + locr0->pc = MipsEmulateBranch(locr0, locr0->pc, 0, 0); else locr0->pc += sizeof(int); sa->code = locr0->v0; @@ -781,7 +781,6 @@ dofault: case T_SYSCALL + T_USER: { - td->td_sa.trapframe = trapframe; syscallenter(td); #if !defined(SMP) && (defined(DDB) || defined(DEBUG)) |