From f42bf748e417cf9120fc57d144b6eaaf3adda247 Mon Sep 17 00:00:00 2001 From: Walfred Tedeschi Date: Tue, 19 Apr 2016 15:45:50 +0200 Subject: [PATCH] Re-factor (i386|amd64)mpx target descriptions. In the previous patch a new set of target descriptions (i386|amd64)-avx-mpx were added being same as the (i386|amd64)-mpx. This patch removes AVX feature from (i386|amd64)-mpx target description set. This way the (i386|amd64)avx_mpx(_linux|) set has AVX and MPX features and (i386|amd64)mpx(_linux|) only MPX. 2016-04-14 Walfred Tedeschi * features/i386/amd64-mpx-linux.xml: Remove AVX feature. * features/i386/amd64-mpx.xml: Remove AVX feature. * features/i386/i386-mpx-linux.xml: Remove AVX feature. * features/i386/i386-mpx.xml: Remove AVX feature. * features/i386/amd64-mpx-linux.c: Regenerate. * features/i386/amd64-mpx.c: Regenerate. * features/i386/i386-mpx-linux.c: Regenerate. * features/i386/i386-mpx.c: Regenerate. * regformats/i386/amd64-mpx-linux.dat: Regenerate. * regformats/i386/amd64-mpx.dat: Regenerate. * regformats/i386/i386-mpx-linux.dat: Regenerate. * regformats/i386/i386-mpx.dat: Regenerate. --- gdb/ChangeLog | 15 +++++++++++++ gdb/features/i386/amd64-mpx-linux.c | 30 +++++-------------------- gdb/features/i386/amd64-mpx-linux.xml | 1 - gdb/features/i386/amd64-mpx.c | 30 +++++-------------------- gdb/features/i386/amd64-mpx.xml | 1 - gdb/features/i386/i386-mpx-linux.c | 22 +++++------------- gdb/features/i386/i386-mpx-linux.xml | 1 - gdb/features/i386/i386-mpx.c | 22 +++++------------- gdb/features/i386/i386-mpx.xml | 1 - gdb/regformats/i386/amd64-mpx-linux.dat | 16 ------------- gdb/regformats/i386/amd64-mpx.dat | 16 ------------- gdb/regformats/i386/i386-mpx-linux.dat | 8 ------- gdb/regformats/i386/i386-mpx.dat | 8 ------- 13 files changed, 39 insertions(+), 132 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 77d26ae39a3..1b12330f28b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2016-04-14 Walfred Tedeschi + + * features/i386/amd64-mpx-linux.xml: Remove AVX feature. + * features/i386/amd64-mpx.xml: Remove AVX feature. + * features/i386/i386-mpx-linux.xml: Remove AVX feature. + * features/i386/i386-mpx.xml: Remove AVX feature. + * features/i386/amd64-mpx-linux.c: Regenerate. + * features/i386/amd64-mpx.c: Regenerate. + * features/i386/i386-mpx-linux.c: Regenerate. + * features/i386/i386-mpx.c: Regenerate. + * regformats/i386/amd64-mpx-linux.dat: Regenerate. + * regformats/i386/amd64-mpx.dat: Regenerate. + * regformats/i386/i386-mpx-linux.dat: Regenerate. + * regformats/i386/i386-mpx.dat: Regenerate. + 2016-04-16 Walfred Tedeschi * amd64-linux-tdep.c (features/i386/amd64-avx-mpx-linux.c): diff --git a/gdb/features/i386/amd64-mpx-linux.c b/gdb/features/i386/amd64-mpx-linux.c index ed5c5a2e4ae..a20ca4fbd9f 100644 --- a/gdb/features/i386/amd64-mpx-linux.c +++ b/gdb/features/i386/amd64-mpx-linux.c @@ -151,24 +151,6 @@ initialize_tdesc_amd64_mpx_linux (void) feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux"); tdesc_create_reg (feature, "orig_rax", 57, 1, NULL, 64, "int"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx"); - tdesc_create_reg (feature, "ymm0h", 58, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm1h", 59, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm2h", 60, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm3h", 61, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm4h", 62, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm5h", 63, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm6h", 64, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm7h", 65, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm8h", 66, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm9h", 67, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm10h", 68, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm11h", 69, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm12h", 70, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm13h", 71, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm14h", 72, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm15h", 73, 1, NULL, 128, "uint128"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx"); type = tdesc_create_struct (feature, "br128"); field_type = tdesc_named_type (feature, "uint64"); @@ -200,12 +182,12 @@ initialize_tdesc_amd64_mpx_linux (void) field_type = tdesc_named_type (feature, "_bndcfgu"); tdesc_add_field (type, "config", field_type); - tdesc_create_reg (feature, "bnd0raw", 74, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd1raw", 75, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd2raw", 76, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd3raw", 77, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bndcfgu", 78, 1, NULL, 64, "cfgu"); - tdesc_create_reg (feature, "bndstatus", 79, 1, NULL, 64, "status"); + tdesc_create_reg (feature, "bnd0raw", 58, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd1raw", 59, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd2raw", 60, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd3raw", 61, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bndcfgu", 62, 1, NULL, 64, "cfgu"); + tdesc_create_reg (feature, "bndstatus", 63, 1, NULL, 64, "status"); tdesc_amd64_mpx_linux = result; } diff --git a/gdb/features/i386/amd64-mpx-linux.xml b/gdb/features/i386/amd64-mpx-linux.xml index 15e87b44a17..835126b05a9 100644 --- a/gdb/features/i386/amd64-mpx-linux.xml +++ b/gdb/features/i386/amd64-mpx-linux.xml @@ -14,6 +14,5 @@ - diff --git a/gdb/features/i386/amd64-mpx.c b/gdb/features/i386/amd64-mpx.c index af1c20592fe..41f0e7834b7 100644 --- a/gdb/features/i386/amd64-mpx.c +++ b/gdb/features/i386/amd64-mpx.c @@ -146,24 +146,6 @@ initialize_tdesc_amd64_mpx (void) tdesc_create_reg (feature, "xmm15", 55, 1, NULL, 128, "vec128"); tdesc_create_reg (feature, "mxcsr", 56, 1, "vector", 32, "i386_mxcsr"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx"); - tdesc_create_reg (feature, "ymm0h", 57, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm1h", 58, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm2h", 59, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm3h", 60, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm4h", 61, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm5h", 62, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm6h", 63, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm7h", 64, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm8h", 65, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm9h", 66, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm10h", 67, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm11h", 68, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm12h", 69, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm13h", 70, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm14h", 71, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm15h", 72, 1, NULL, 128, "uint128"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx"); type = tdesc_create_struct (feature, "br128"); field_type = tdesc_named_type (feature, "uint64"); @@ -195,12 +177,12 @@ initialize_tdesc_amd64_mpx (void) field_type = tdesc_named_type (feature, "_bndcfgu"); tdesc_add_field (type, "config", field_type); - tdesc_create_reg (feature, "bnd0raw", 73, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd1raw", 74, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd2raw", 75, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd3raw", 76, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bndcfgu", 77, 1, NULL, 64, "cfgu"); - tdesc_create_reg (feature, "bndstatus", 78, 1, NULL, 64, "status"); + tdesc_create_reg (feature, "bnd0raw", 57, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd1raw", 58, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd2raw", 59, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd3raw", 60, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bndcfgu", 61, 1, NULL, 64, "cfgu"); + tdesc_create_reg (feature, "bndstatus", 62, 1, NULL, 64, "status"); tdesc_amd64_mpx = result; } diff --git a/gdb/features/i386/amd64-mpx.xml b/gdb/features/i386/amd64-mpx.xml index 21b6df38f1d..e458736ac01 100644 --- a/gdb/features/i386/amd64-mpx.xml +++ b/gdb/features/i386/amd64-mpx.xml @@ -12,6 +12,5 @@ i386:x86-64 - diff --git a/gdb/features/i386/i386-mpx-linux.c b/gdb/features/i386/i386-mpx-linux.c index 33f979a8ec7..298b7ffc4b3 100644 --- a/gdb/features/i386/i386-mpx-linux.c +++ b/gdb/features/i386/i386-mpx-linux.c @@ -135,16 +135,6 @@ initialize_tdesc_i386_mpx_linux (void) feature = tdesc_create_feature (result, "org.gnu.gdb.i386.linux"); tdesc_create_reg (feature, "orig_eax", 41, 1, NULL, 32, "int"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx"); - tdesc_create_reg (feature, "ymm0h", 42, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm1h", 43, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm2h", 44, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm3h", 45, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm4h", 46, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm5h", 47, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm6h", 48, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm7h", 49, 1, NULL, 128, "uint128"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx"); type = tdesc_create_struct (feature, "br128"); field_type = tdesc_named_type (feature, "uint64"); @@ -176,12 +166,12 @@ initialize_tdesc_i386_mpx_linux (void) field_type = tdesc_named_type (feature, "_bndcfgu"); tdesc_add_field (type, "config", field_type); - tdesc_create_reg (feature, "bnd0raw", 50, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd1raw", 51, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd2raw", 52, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd3raw", 53, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bndcfgu", 54, 1, NULL, 64, "cfgu"); - tdesc_create_reg (feature, "bndstatus", 55, 1, NULL, 64, "status"); + tdesc_create_reg (feature, "bnd0raw", 42, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd1raw", 43, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd2raw", 44, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd3raw", 45, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bndcfgu", 46, 1, NULL, 64, "cfgu"); + tdesc_create_reg (feature, "bndstatus", 47, 1, NULL, 64, "status"); tdesc_i386_mpx_linux = result; } diff --git a/gdb/features/i386/i386-mpx-linux.xml b/gdb/features/i386/i386-mpx-linux.xml index c4004d66f8d..4228cf5a8c6 100644 --- a/gdb/features/i386/i386-mpx-linux.xml +++ b/gdb/features/i386/i386-mpx-linux.xml @@ -14,6 +14,5 @@ - diff --git a/gdb/features/i386/i386-mpx.c b/gdb/features/i386/i386-mpx.c index 28f51ac9105..c19af55d226 100644 --- a/gdb/features/i386/i386-mpx.c +++ b/gdb/features/i386/i386-mpx.c @@ -130,16 +130,6 @@ initialize_tdesc_i386_mpx (void) tdesc_create_reg (feature, "xmm7", 39, 1, NULL, 128, "vec128"); tdesc_create_reg (feature, "mxcsr", 40, 1, "vector", 32, "i386_mxcsr"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.avx"); - tdesc_create_reg (feature, "ymm0h", 41, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm1h", 42, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm2h", 43, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm3h", 44, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm4h", 45, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm5h", 46, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm6h", 47, 1, NULL, 128, "uint128"); - tdesc_create_reg (feature, "ymm7h", 48, 1, NULL, 128, "uint128"); - feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx"); type = tdesc_create_struct (feature, "br128"); field_type = tdesc_named_type (feature, "uint64"); @@ -171,12 +161,12 @@ initialize_tdesc_i386_mpx (void) field_type = tdesc_named_type (feature, "_bndcfgu"); tdesc_add_field (type, "config", field_type); - tdesc_create_reg (feature, "bnd0raw", 49, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd1raw", 50, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd2raw", 51, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bnd3raw", 52, 1, NULL, 128, "br128"); - tdesc_create_reg (feature, "bndcfgu", 53, 1, NULL, 64, "cfgu"); - tdesc_create_reg (feature, "bndstatus", 54, 1, NULL, 64, "status"); + tdesc_create_reg (feature, "bnd0raw", 41, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd1raw", 42, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd2raw", 43, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bnd3raw", 44, 1, NULL, 128, "br128"); + tdesc_create_reg (feature, "bndcfgu", 45, 1, NULL, 64, "cfgu"); + tdesc_create_reg (feature, "bndstatus", 46, 1, NULL, 64, "status"); tdesc_i386_mpx = result; } diff --git a/gdb/features/i386/i386-mpx.xml b/gdb/features/i386/i386-mpx.xml index 52a68db98bd..c1806cb5e3d 100644 --- a/gdb/features/i386/i386-mpx.xml +++ b/gdb/features/i386/i386-mpx.xml @@ -12,6 +12,5 @@ i386 - diff --git a/gdb/regformats/i386/amd64-mpx-linux.dat b/gdb/regformats/i386/amd64-mpx-linux.dat index 7a05cfe3c7b..523ae01da12 100644 --- a/gdb/regformats/i386/amd64-mpx-linux.dat +++ b/gdb/regformats/i386/amd64-mpx-linux.dat @@ -61,22 +61,6 @@ expedite:rbp,rsp,rip 128:xmm15 32:mxcsr 64:orig_rax -128:ymm0h -128:ymm1h -128:ymm2h -128:ymm3h -128:ymm4h -128:ymm5h -128:ymm6h -128:ymm7h -128:ymm8h -128:ymm9h -128:ymm10h -128:ymm11h -128:ymm12h -128:ymm13h -128:ymm14h -128:ymm15h 128:bnd0raw 128:bnd1raw 128:bnd2raw diff --git a/gdb/regformats/i386/amd64-mpx.dat b/gdb/regformats/i386/amd64-mpx.dat index 1b75f4d59f8..43b87769c2d 100644 --- a/gdb/regformats/i386/amd64-mpx.dat +++ b/gdb/regformats/i386/amd64-mpx.dat @@ -60,22 +60,6 @@ expedite:rbp,rsp,rip 128:xmm14 128:xmm15 32:mxcsr -128:ymm0h -128:ymm1h -128:ymm2h -128:ymm3h -128:ymm4h -128:ymm5h -128:ymm6h -128:ymm7h -128:ymm8h -128:ymm9h -128:ymm10h -128:ymm11h -128:ymm12h -128:ymm13h -128:ymm14h -128:ymm15h 128:bnd0raw 128:bnd1raw 128:bnd2raw diff --git a/gdb/regformats/i386/i386-mpx-linux.dat b/gdb/regformats/i386/i386-mpx-linux.dat index b52b68de4fd..1dcdce98cf5 100644 --- a/gdb/regformats/i386/i386-mpx-linux.dat +++ b/gdb/regformats/i386/i386-mpx-linux.dat @@ -45,14 +45,6 @@ expedite:ebp,esp,eip 128:xmm7 32:mxcsr 32:orig_eax -128:ymm0h -128:ymm1h -128:ymm2h -128:ymm3h -128:ymm4h -128:ymm5h -128:ymm6h -128:ymm7h 128:bnd0raw 128:bnd1raw 128:bnd2raw diff --git a/gdb/regformats/i386/i386-mpx.dat b/gdb/regformats/i386/i386-mpx.dat index 0ea420b3890..dda5164a329 100644 --- a/gdb/regformats/i386/i386-mpx.dat +++ b/gdb/regformats/i386/i386-mpx.dat @@ -44,14 +44,6 @@ expedite:ebp,esp,eip 128:xmm6 128:xmm7 32:mxcsr -128:ymm0h -128:ymm1h -128:ymm2h -128:ymm3h -128:ymm4h -128:ymm5h -128:ymm6h -128:ymm7h 128:bnd0raw 128:bnd1raw 128:bnd2raw -- 2.30.2