[v6,14/15] x86: Remove X86_XSTATE_SIZE and related constants.

Message ID 20230714155151.21723-15-jhb@FreeBSD.org
State New
Headers
Series Handle variable XSAVE layouts |

Commit Message

John Baldwin July 14, 2023, 3:51 p.m. UTC
  ---
 gdbsupport/x86-xstate.h | 12 ------------
 1 file changed, 12 deletions(-)
  

Comments

Simon Marchi Aug. 28, 2023, 8:38 p.m. UTC | #1
On 7/14/23 11:51, John Baldwin wrote:
> ---
>  gdbsupport/x86-xstate.h | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/gdbsupport/x86-xstate.h b/gdbsupport/x86-xstate.h
> index 27fc0bd12f2..40963bda55b 100644
> --- a/gdbsupport/x86-xstate.h
> +++ b/gdbsupport/x86-xstate.h
> @@ -99,11 +99,6 @@ constexpr bool operator!= (const x86_xsave_layout &lhs,
>  
>  #define X86_XSTATE_SSE_SIZE	576
>  #define X86_XSTATE_AVX_SIZE	832
> -#define X86_XSTATE_BNDREGS_SIZE	1024
> -#define X86_XSTATE_BNDCFG_SIZE	1088
> -#define X86_XSTATE_AVX512_SIZE	2688
> -#define X86_XSTATE_PKRU_SIZE	2696
> -#define X86_XSTATE_MAX_SIZE	2696
>  
>  
>  /* In case one of the MPX XCR0 bits is set we consider we have MPX.  */
> @@ -112,13 +107,6 @@ constexpr bool operator!= (const x86_xsave_layout &lhs,
>  #define HAS_AVX512(XCR0) (((XCR0) & X86_XSTATE_AVX512) != 0)
>  #define HAS_PKRU(XCR0) (((XCR0) & X86_XSTATE_PKRU) != 0)
>  
> -/* Get I386 XSAVE extended state size.  */
> -#define X86_XSTATE_SIZE(XCR0) \
> -    (HAS_PKRU (XCR0) ? X86_XSTATE_PKRU_SIZE : \
> -     (HAS_AVX512 (XCR0) ? X86_XSTATE_AVX512_SIZE : \
> -      (HAS_MPX (XCR0) ? X86_XSTATE_BNDCFG_SIZE : \
> -       (HAS_AVX (XCR0) ? X86_XSTATE_AVX_SIZE : X86_XSTATE_SSE_SIZE))))
> -
>  /* Initial value for fctrl register, as defined in the X86 manual, and
>     confirmed in the (Linux) kernel source.  When the x87 floating point
>     feature is not enabled in an inferior we use this as the value of the
> -- 
> 2.40.0
> 

Approved-By: Simon Marchi <simon.marchi@efficios.com>

Simon
  

Patch

diff --git a/gdbsupport/x86-xstate.h b/gdbsupport/x86-xstate.h
index 27fc0bd12f2..40963bda55b 100644
--- a/gdbsupport/x86-xstate.h
+++ b/gdbsupport/x86-xstate.h
@@ -99,11 +99,6 @@  constexpr bool operator!= (const x86_xsave_layout &lhs,
 
 #define X86_XSTATE_SSE_SIZE	576
 #define X86_XSTATE_AVX_SIZE	832
-#define X86_XSTATE_BNDREGS_SIZE	1024
-#define X86_XSTATE_BNDCFG_SIZE	1088
-#define X86_XSTATE_AVX512_SIZE	2688
-#define X86_XSTATE_PKRU_SIZE	2696
-#define X86_XSTATE_MAX_SIZE	2696
 
 
 /* In case one of the MPX XCR0 bits is set we consider we have MPX.  */
@@ -112,13 +107,6 @@  constexpr bool operator!= (const x86_xsave_layout &lhs,
 #define HAS_AVX512(XCR0) (((XCR0) & X86_XSTATE_AVX512) != 0)
 #define HAS_PKRU(XCR0) (((XCR0) & X86_XSTATE_PKRU) != 0)
 
-/* Get I386 XSAVE extended state size.  */
-#define X86_XSTATE_SIZE(XCR0) \
-    (HAS_PKRU (XCR0) ? X86_XSTATE_PKRU_SIZE : \
-     (HAS_AVX512 (XCR0) ? X86_XSTATE_AVX512_SIZE : \
-      (HAS_MPX (XCR0) ? X86_XSTATE_BNDCFG_SIZE : \
-       (HAS_AVX (XCR0) ? X86_XSTATE_AVX_SIZE : X86_XSTATE_SSE_SIZE))))
-
 /* Initial value for fctrl register, as defined in the X86 manual, and
    confirmed in the (Linux) kernel source.  When the x87 floating point
    feature is not enabled in an inferior we use this as the value of the