I am going to add ATF tests for these two functions, and having them
in a separate file will make it more convenient to build and run them
in userspace.
---
sys/arch/amd64/conf/files.amd64 | 1 +
sys/arch/i386/conf/files.i386 | 1 +
sys/arch/x86/include/fpu.h | 3 +
sys/arch/x86/x86/convert_xmm_s87.c | 156 +++++++++++++++++++++++++++++
sys/arch/x86/x86/fpu.c | 120 ----------------------
5 files changed, 161 insertions(+), 120 deletions(-)
create mode 100644 sys/arch/x86/x86/convert_xmm_s87.c
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index 1ebf70169dc5..c7a12226af9a 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -51,6 +51,7 @@ file arch/amd64/amd64/process_machdep.c machdep
file arch/amd64/amd64/trap.c machdep
file arch/x86/x86/fpu.c machdep
file arch/x86/x86/dbregs.c machdep
+file arch/x86/x86/convert_xmm_s87.c machdep
file arch/x86/x86/spectre.c machdep & !xenpv
file arch/amd64/amd64/lock_stubs.S machdep
file dev/cons.c machdep
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 5b9d3ef3017a..1cff33234412 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -69,6 +69,7 @@ file arch/i386/i386/machdep.c
file arch/i386/i386/longrun.c
file arch/i386/i386/mtrr_k6.c mtrr
file arch/i386/i386/process_machdep.c
+file arch/x86/x86/convert_xmm_s87.c
file arch/i386/i386/trap.c
file dev/cons.c
file arch/x86/x86/fpu.c
diff --git a/sys/arch/x86/include/fpu.h b/sys/arch/x86/include/fpu.h
index fe73037001f6..80ae18cb793b 100644
--- a/sys/arch/x86/include/fpu.h
+++ b/sys/arch/x86/include/fpu.h
@@ -24,6 +24,9 @@ void fpu_set_default_cw(struct lwp *, unsigned int);
void fputrap(struct trapframe *);
void fpudna(struct trapframe *);
+void process_xmm_to_s87(const struct fxsave *, struct save87 *);
+void process_s87_to_xmm(const struct save87 *, struct fxsave *);
+
void fpu_clear(struct lwp *, unsigned int);
void fpu_sigreset(struct lwp *);
diff --git a/sys/arch/x86/x86/convert_xmm_s87.c
b/sys/arch/x86/x86/convert_xmm_s87.c
new file mode 100644
index 000000000000..53116545769e
--- /dev/null
+++ b/sys/arch/x86/x86/convert_xmm_s87.c
@@ -0,0 +1,156 @@
+/* $NetBSD: convert_xmm_s87.c,v 1.3 2014/02/15 22:20:42 dsl Exp $ */
+
+/*-
+ * Copyright (c) 1998, 2000, 2001, 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum; by Jason R. Thorpe of Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: convert_xmm_s87.c,v 1.3 2014/02/15 22:20:42 dsl
Exp $");
+
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <x86/fpu.h>
+
+void
+process_xmm_to_s87(const struct fxsave *sxmm, struct save87 *s87)
+{
+ unsigned int tag, ab_tag;
+ const struct fpaccfx *fx_reg;
+ struct fpacc87 *s87_reg;
+ int i;
+
+ /*
+ * For historic reasons core dumps and ptrace all use the old save87
+ * layout. Convert the important parts.
+ * getucontext gets what we give it.
+ * setucontext should return something given by getucontext, but
+ * we are (at the moment) willing to change it.
+ *
+ * It really isn't worth setting the 'tag' bits to 01 (zero) or
+ * 10 (NaN etc) since the processor will set any internal bits
+ * correctly when the value is loaded (the 287 believed them).
+ *
+ * Additionally the s87_tw and s87_tw are 'indexed' by the actual
+ * register numbers, whereas the registers themselves have ST(0)
+ * first. Pairing the values and tags can only be done with
+ * reference to the 'top of stack'.
+ *
+ * If any x87 registers are used, they will typically be from
+ * r7 downwards - so the high bits of the tag register indicate
+ * used registers. The conversions are not optimised for this.
+ *
+ * The ABI we use requires the FP stack to be empty on every
+ * function call. I think this means that the stack isn't expected
+ * to overflow - overflow doesn't drop a core in my testing.
+ *
+ * Note that this code writes to all of the 's87' structure that
+ * actually gets written to userspace.
+ */
+
+ /* FPU control/status */
+ s87->s87_cw = sxmm->fx_cw;
+ s87->s87_sw = sxmm->fx_sw;
+ /* tag word handled below */
+ s87->s87_ip = sxmm->fx_ip;
+ s87->s87_opcode = sxmm->fx_opcode;
+ s87->s87_dp = sxmm->fx_dp;
+
+ /* FP registers (in stack order) */
+ fx_reg = sxmm->fx_87_ac;
+ s87_reg = s87->s87_ac;
+ for (i = 0; i < 8; fx_reg++, s87_reg++, i++)
+ *s87_reg = fx_reg->r;
+
+ /* Tag word and registers. */
+ ab_tag = sxmm->fx_tw & 0xff; /* Bits set if valid */
+ if (ab_tag == 0) {
+ /* none used */
+ s87->s87_tw = 0xffff;
+ return;
+ }
+
+ tag = 0;
+ /* Separate bits of abridged tag word with zeros */
+ for (i = 0x80; i != 0; tag <<= 1, i >>= 1)
+ tag |= ab_tag & i;
+ /* Replicate and invert so that 0 => 0b11 and 1 => 0b00 */
+ s87->s87_tw = (tag | tag >> 1) ^ 0xffff;
+}
+
+void
+process_s87_to_xmm(const struct save87 *s87, struct fxsave *sxmm)
+{
+ unsigned int tag, ab_tag;
+ struct fpaccfx *fx_reg;
+ const struct fpacc87 *s87_reg;
+ int i;
+
+ /*
+ * ptrace gives us registers in the save87 format and
+ * we must convert them to the correct format.
+ *
+ * This code is normally used when overwriting the processes
+ * registers (in the pcb), so it musn't change any other fields.
+ *
+ * There is a lot of pad in 'struct fxsave', if the destination
+ * is written to userspace, it must be zeroed first.
+ */
+
+ /* FPU control/status */
+ sxmm->fx_cw = s87->s87_cw;
+ sxmm->fx_sw = s87->s87_sw;
+ /* tag word handled below */
+ sxmm->fx_ip = s87->s87_ip;
+ sxmm->fx_opcode = s87->s87_opcode;
+ sxmm->fx_dp = s87->s87_dp;
+
+ /* Tag word */
+ tag = s87->s87_tw; /* 0b11 => unused */
+ if (tag == 0xffff) {
+ /* All unused - values don't matter, zero for safety */
+ sxmm->fx_tw = 0;
+ memset(&sxmm->fx_87_ac, 0, sizeof sxmm->fx_87_ac);
+ return;
+ }
+
+ tag ^= 0xffff; /* So 0b00 is unused */
+ tag |= tag >> 1; /* Look at even bits */
+ ab_tag = 0;
+ i = 1;
+ do
+ ab_tag |= tag & i;
+ while ((tag >>= 1) >= (i <<= 1));
+ sxmm->fx_tw = ab_tag;
+
+ /* FP registers (in stack order) */
+ fx_reg = sxmm->fx_87_ac;
+ s87_reg = s87->s87_ac;
+ for (i = 0; i < 8; fx_reg++, s87_reg++, i++)
+ fx_reg->r = *s87_reg;
+}
diff --git a/sys/arch/x86/x86/fpu.c b/sys/arch/x86/x86/fpu.c
index d89c78dcef47..74218d64ef1f 100644
--- a/sys/arch/x86/x86/fpu.c
+++ b/sys/arch/x86/x86/fpu.c
@@ -663,126 +663,6 @@ fpu_sigreset(struct lwp *l)
}
}
-/* --------------------------------------------------------------------------
*/
-
-static void
-process_xmm_to_s87(const struct fxsave *sxmm, struct save87 *s87)
-{
- unsigned int tag, ab_tag;
- const struct fpaccfx *fx_reg;
- struct fpacc87 *s87_reg;
- int i;
-
- /*
- * For historic reasons core dumps and ptrace all use the old save87
- * layout. Convert the important parts.
- * getucontext gets what we give it.
- * setucontext should return something given by getucontext, but
- * we are (at the moment) willing to change it.
- *
- * It really isn't worth setting the 'tag' bits to 01 (zero) or
- * 10 (NaN etc) since the processor will set any internal bits
- * correctly when the value is loaded (the 287 believed them).
- *
- * Additionally the s87_tw and s87_tw are 'indexed' by the actual
- * register numbers, whereas the registers themselves have ST(0)
- * first. Pairing the values and tags can only be done with
- * reference to the 'top of stack'.
- *
- * If any x87 registers are used, they will typically be from
- * r7 downwards - so the high bits of the tag register indicate
- * used registers. The conversions are not optimised for this.
- *
- * The ABI we use requires the FP stack to be empty on every
- * function call. I think this means that the stack isn't expected
- * to overflow - overflow doesn't drop a core in my testing.
- *
- * Note that this code writes to all of the 's87' structure that
- * actually gets written to userspace.
- */
-
- /* FPU control/status */
- s87->s87_cw = sxmm->fx_cw;
- s87->s87_sw = sxmm->fx_sw;
- /* tag word handled below */
- s87->s87_ip = sxmm->fx_ip;
- s87->s87_opcode = sxmm->fx_opcode;
- s87->s87_dp = sxmm->fx_dp;
-
- /* FP registers (in stack order) */
- fx_reg = sxmm->fx_87_ac;
- s87_reg = s87->s87_ac;
- for (i = 0; i < 8; fx_reg++, s87_reg++, i++)
- *s87_reg = fx_reg->r;
-
- /* Tag word and registers. */
- ab_tag = sxmm->fx_tw & 0xff; /* Bits set if valid */
- if (ab_tag == 0) {
- /* none used */
- s87->s87_tw = 0xffff;
- return;
- }
-
- tag = 0;
- /* Separate bits of abridged tag word with zeros */
- for (i = 0x80; i != 0; tag <<= 1, i >>= 1)
- tag |= ab_tag & i;
- /* Replicate and invert so that 0 => 0b11 and 1 => 0b00 */
- s87->s87_tw = (tag | tag >> 1) ^ 0xffff;
-}
-
-static void
-process_s87_to_xmm(const struct save87 *s87, struct fxsave *sxmm)
-{
- unsigned int tag, ab_tag;
- struct fpaccfx *fx_reg;
- const struct fpacc87 *s87_reg;
- int i;
-
- /*
- * ptrace gives us registers in the save87 format and
- * we must convert them to the correct format.
- *
- * This code is normally used when overwriting the processes
- * registers (in the pcb), so it musn't change any other fields.
- *
- * There is a lot of pad in 'struct fxsave', if the destination
- * is written to userspace, it must be zeroed first.
- */
-
- /* FPU control/status */
- sxmm->fx_cw = s87->s87_cw;
- sxmm->fx_sw = s87->s87_sw;
- /* tag word handled below */
- sxmm->fx_ip = s87->s87_ip;
- sxmm->fx_opcode = s87->s87_opcode;
- sxmm->fx_dp = s87->s87_dp;
-
- /* Tag word */
- tag = s87->s87_tw; /* 0b11 => unused */
- if (tag == 0xffff) {
- /* All unused - values don't matter, zero for safety */
- sxmm->fx_tw = 0;
- memset(&sxmm->fx_87_ac, 0, sizeof sxmm->fx_87_ac);
- return;
- }
-
- tag ^= 0xffff; /* So 0b00 is unused */
- tag |= tag >> 1; /* Look at even bits */
- ab_tag = 0;
- i = 1;
- do
- ab_tag |= tag & i;
- while ((tag >>= 1) >= (i <<= 1));
- sxmm->fx_tw = ab_tag;
-
- /* FP registers (in stack order) */
- fx_reg = sxmm->fx_87_ac;
- s87_reg = s87->s87_ac;
- for (i = 0; i < 8; fx_reg++, s87_reg++, i++)
- fx_reg->r = *s87_reg;
-}
-
void
process_write_fpregs_xmm(struct lwp *l, const struct fxsave *fpregs)
{
--
2.28.0
