From 756bbf6355e0781492e4d9e84a42e724369e16d4 Mon Sep 17 00:00:00 2001 From: guenther Date: Mon, 22 May 2023 00:39:57 +0000 Subject: [PATCH] The fp_ex_[st]w struct savefpu members were inherited from NetBSD where they're used in the 32bit-compat support, which we dropped years ago. Bye bye! ok deraadt@ --- sys/arch/amd64/amd64/fpu.c | 4 +--- sys/arch/amd64/include/fpu.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/arch/amd64/amd64/fpu.c b/sys/arch/amd64/amd64/fpu.c index 438de255bd6..b1a7192ba59 100644 --- a/sys/arch/amd64/amd64/fpu.c +++ b/sys/arch/amd64/amd64/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.43 2022/08/07 23:56:06 guenther Exp $ */ +/* $OpenBSD: fpu.c,v 1.44 2023/05/22 00:39:57 guenther Exp $ */ /* $NetBSD: fpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -116,8 +116,6 @@ fputrap(int type) fwait(); statbits = sfp->fp_fxsave.fx_fsw; } - sfp->fp_ex_tw = sfp->fp_fxsave.fx_ftw; - sfp->fp_ex_sw = sfp->fp_fxsave.fx_fsw; return x86fpflags_to_siginfo(statbits); } diff --git a/sys/arch/amd64/include/fpu.h b/sys/arch/amd64/include/fpu.h index 7ed0a73b619..6f05c9e6ac9 100644 --- a/sys/arch/amd64/include/fpu.h +++ b/sys/arch/amd64/include/fpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.h,v 1.17 2019/11/29 22:34:09 mortimer Exp $ */ +/* $OpenBSD: fpu.h,v 1.18 2023/05/22 00:39:57 guenther Exp $ */ /* $NetBSD: fpu.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $ */ #ifndef _MACHINE_FPU_H_ @@ -40,8 +40,6 @@ struct savefpu { struct fxsave64 fp_fxsave; /* see above */ struct xstate_hdr fp_xstate; u_int64_t fp_ymm[16][2]; - u_int16_t fp_ex_sw; /* saved status from last exception */ - u_int16_t fp_ex_tw; /* saved tag from last exception */ }; /* -- 2.20.1