diff options
| author | luoqi <luoqi@FreeBSD.org> | 1999-05-11 16:29:21 +0000 |
|---|---|---|
| committer | luoqi <luoqi@FreeBSD.org> | 1999-05-11 16:29:21 +0000 |
| commit | 05e390eef7e448a3fea840716766502700cf0359 (patch) | |
| tree | 1a5d42c282dd04a4ede62ad095aa700b65512a71 /sys/amd64 | |
| parent | b661ab30e39917846b890dde659939e783fc490b (diff) | |
| download | FreeBSD-src-05e390eef7e448a3fea840716766502700cf0359.zip FreeBSD-src-05e390eef7e448a3fea840716766502700cf0359.tar.gz | |
Yet another place I missed when increasing trapframe size, which causes problem
to SIGFPE handling.
Reviewed by: Bruce Evans <bde@zeta.org.au>
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/fpu.c | 4 | ||||
| -rw-r--r-- | sys/amd64/include/frame.h | 4 | ||||
| -rw-r--r-- | sys/amd64/isa/npx.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 063f7ce..e18a08e 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.70 1999/05/08 18:14:09 peter Exp $ + * $Id: npx.c,v 1.71 1999/05/08 21:59:27 dfr Exp $ */ #include "npx.h" @@ -548,7 +548,7 @@ npx_intr(dummy) * in doreti, and the frame for that could easily be set up * just before it is used). */ - curproc->p_md.md_regs = (struct trapframe *)&frame->if_es; + curproc->p_md.md_regs = INTR_TO_TRAPFRAME(frame); #ifdef notyet /* * Encode the appropriate code for detailed information on diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h index 7d70c14..5c0dcda 100644 --- a/sys/amd64/include/frame.h +++ b/sys/amd64/include/frame.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $Id: frame.h,v 1.15 1997/08/09 00:03:12 dyson Exp $ + * $Id: frame.h,v 1.16 1999/04/28 01:03:59 luoqi Exp $ */ #ifndef _MACHINE_FRAME_H_ @@ -172,4 +172,6 @@ struct sigframe { int kdb_trap __P((int, int, struct trapframe *)); extern int (*pmath_emulate) __P((struct trapframe *)); +#define INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs) + #endif /* _MACHINE_FRAME_H_ */ diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index 063f7ce..e18a08e 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.70 1999/05/08 18:14:09 peter Exp $ + * $Id: npx.c,v 1.71 1999/05/08 21:59:27 dfr Exp $ */ #include "npx.h" @@ -548,7 +548,7 @@ npx_intr(dummy) * in doreti, and the frame for that could easily be set up * just before it is used). */ - curproc->p_md.md_regs = (struct trapframe *)&frame->if_es; + curproc->p_md.md_regs = INTR_TO_TRAPFRAME(frame); #ifdef notyet /* * Encode the appropriate code for detailed information on |
