Module Name: src
Committed By: maxv
Date: Wed Oct 30 16:32:04 UTC 2019
Modified Files:
src/sys/arch/x86/x86: fpu.c
Log Message:
Style.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x86/x86/fpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.58 src/sys/arch/x86/x86/fpu.c:1.59
--- src/sys/arch/x86/x86/fpu.c:1.58 Sat Oct 12 06:31:04 2019
+++ src/sys/arch/x86/x86/fpu.c Wed Oct 30 16:32:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.58 2019/10/12 06:31:04 maxv Exp $ */
+/* $NetBSD: fpu.c,v 1.59 2019/10/30 16:32:04 maxv Exp $ */
/*
* Copyright (c) 2008, 2019 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.58 2019/10/12 06:31:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.59 2019/10/30 16:32:04 maxv Exp $");
#include "opt_multiprocessor.h"
@@ -784,16 +784,15 @@ process_read_xstate(struct lwp *l, struc
xstate->xs_xstate_bv = fpu_save->sv_xsave_hdr.xsh_xstate_bv;
KASSERT(!(xstate->xs_xstate_bv & ~xstate->xs_rfbm));
-#define COPY_COMPONENT(xcr0_val, xsave_val, field) \
- if (xstate->xs_xstate_bv & xcr0_val) { \
- KASSERT(x86_xsave_offsets[xsave_val] \
- >= sizeof(struct xsave_header)); \
- KASSERT(x86_xsave_sizes[xsave_val] \
- >= sizeof(xstate -> field)); \
- \
- memcpy(&xstate -> field, \
- (char*)fpu_save + x86_xsave_offsets[xsave_val], \
- sizeof(xstate -> field)); \
+#define COPY_COMPONENT(xcr0_val, xsave_val, field) \
+ if (xstate->xs_xstate_bv & xcr0_val) { \
+ KASSERT(x86_xsave_offsets[xsave_val] \
+ >= sizeof(struct xsave_header)); \
+ KASSERT(x86_xsave_sizes[xsave_val] \
+ >= sizeof(xstate->field)); \
+ memcpy(&xstate->field, \
+ (char*)fpu_save + x86_xsave_offsets[xsave_val], \
+ sizeof(xstate->field)); \
}
COPY_COMPONENT(XCR0_YMM_Hi128, XSAVE_YMM_Hi128, xs_ymm_hi128);
@@ -846,8 +845,8 @@ process_write_xstate(struct lwp *l, cons
/* If XSAVE is supported, make sure that xstate_bv is set correctly. */
if (x86_fpu_save >= FPU_SAVE_XSAVE) {
/*
- * Bit-wise xstate->xs_rfbm ? xstate->xs_xstate_bv
- * : fpu_save->sv_xsave_hdr.xsh_xstate_bv
+ * Bit-wise "xstate->xs_rfbm ? xstate->xs_xstate_bv :
+ * fpu_save->sv_xsave_hdr.xsh_xstate_bv"
*/
fpu_save->sv_xsave_hdr.xsh_xstate_bv =
(fpu_save->sv_xsave_hdr.xsh_xstate_bv & ~xstate->xs_rfbm) |
@@ -865,8 +864,8 @@ process_write_xstate(struct lwp *l, cons
}
/*
- * Copy MXCSR if either SSE or AVX state is requested, to match the XSAVE
- * behavior for those flags.
+ * Copy MXCSR if either SSE or AVX state is requested, to match the
+ * XSAVE behavior for those flags.
*/
if (xstate->xs_xstate_bv & (XCR0_SSE|XCR0_YMM_Hi128)) {
/*
@@ -880,19 +879,17 @@ process_write_xstate(struct lwp *l, cons
if (xstate->xs_xstate_bv & XCR0_SSE) {
memcpy(&fpu_save->sv_xsave_hdr.xsh_fxsave[160],
- xstate->xs_fxsave.fx_xmm,
- sizeof(xstate->xs_fxsave.fx_xmm));
+ xstate->xs_fxsave.fx_xmm, sizeof(xstate->xs_fxsave.fx_xmm));
}
-#define COPY_COMPONENT(xcr0_val, xsave_val, field) \
- if (xstate->xs_xstate_bv & xcr0_val) { \
- KASSERT(x86_xsave_offsets[xsave_val] \
- >= sizeof(struct xsave_header)); \
- KASSERT(x86_xsave_sizes[xsave_val] \
- >= sizeof(xstate -> field)); \
- \
- memcpy((char*)fpu_save + x86_xsave_offsets[xsave_val], \
- &xstate -> field, sizeof(xstate -> field)); \
+#define COPY_COMPONENT(xcr0_val, xsave_val, field) \
+ if (xstate->xs_xstate_bv & xcr0_val) { \
+ KASSERT(x86_xsave_offsets[xsave_val] \
+ >= sizeof(struct xsave_header)); \
+ KASSERT(x86_xsave_sizes[xsave_val] \
+ >= sizeof(xstate->field)); \
+ memcpy((char *)fpu_save + x86_xsave_offsets[xsave_val], \
+ &xstate->field, sizeof(xstate->field)); \
}
COPY_COMPONENT(XCR0_YMM_Hi128, XSAVE_YMM_Hi128, xs_ymm_hi128);
