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

MFi386:

Browse Source 
Use the method described in IA-32 Intel Architecture Software
	Developer's Manual chapter 11.6.6 to get valid mxcsr bits,
	use the mxcsr mask to clear invalid bits passed by user code.
This commit is contained in:
David Xu 2006-06-19 22:36:01 +00:00
parent 0dad3f0e15
commit 4d70df3fee
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/fpu.c
View File

@ -125,6 +125,10 @@ fpuinit(void)
mxcsr = __INITIAL_MXCSR__; mxcsr = __INITIAL_MXCSR__;
ldmxcsr(mxcsr); ldmxcsr(mxcsr);
fxsave(&fpu_cleanstate); fxsave(&fpu_cleanstate);
if (fpu_cleanstate.sv_env.en_mxcsr_mask)
cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask;
else
cpu_mxcsr_mask = 0xFFBF;
start_emulating(); start_emulating();
bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp));
bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm));

7
sys/amd64/amd64/machdep.c
View File

@ -1507,7 +1507,7 @@ set_fpregs_xmm(struct fpreg *fpregs, struct savefpu *sv_xmm)
penv_xmm->en_rip = penv_fpreg->en_rip; penv_xmm->en_rip = penv_fpreg->en_rip;
penv_xmm->en_rdp = penv_fpreg->en_rdp; penv_xmm->en_rdp = penv_fpreg->en_rdp;
penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr; penv_xmm->en_mxcsr = penv_fpreg->en_mxcsr;
penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask; penv_xmm->en_mxcsr_mask = penv_fpreg->en_mxcsr_mask & cpu_mxcsr_mask;
/* FPU registers */ /* FPU registers */
for (i = 0; i < 8; ++i) for (i = 0; i < 8; ++i)
@ -1634,6 +1634,7 @@ get_fpcontext(struct thread *td, mcontext_t *mcp)
static int static int
set_fpcontext(struct thread *td, const mcontext_t *mcp) set_fpcontext(struct thread *td, const mcontext_t *mcp)
{ {
struct savefpu *fpstate;
if (mcp->mc_fpformat == _MC_FPFMT_NODEV) if (mcp->mc_fpformat == _MC_FPFMT_NODEV)
return (0); return (0);
@ -1649,7 +1650,9 @@ set_fpcontext(struct thread *td, const mcontext_t *mcp)
* be called with interrupts disabled. * be called with interrupts disabled.
* XXX obsolete on trap-16 systems? * XXX obsolete on trap-16 systems?
*/ */
fpusetregs(td, (struct savefpu *)&mcp->mc_fpstate); fpstate = (struct savefpu *)&mcp->mc_fpstate;
fpstate->sv_env.en_mxcsr &= cpu_mxcsr_mask;
fpusetregs(td, fpstate);
} else } else
return (EINVAL); return (EINVAL);
return (0); return (0);

1
sys/amd64/include/md_var.h
View File

@ -47,6 +47,7 @@ extern u_int amd_feature2;
extern u_int cpu_fxsr; extern u_int cpu_fxsr;
extern u_int cpu_high; extern u_int cpu_high;
extern u_int cpu_id; extern u_int cpu_id;
extern u_int cpu_mxcsr_mask;
extern u_int cpu_procinfo; extern u_int cpu_procinfo;
extern u_int cpu_procinfo2; extern u_int cpu_procinfo2;
extern char cpu_vendor[]; extern char cpu_vendor[];