Remove some uses of is_mi_like_p from spu-tdep.c

[deliverable/binutils-gdb.git] / gdb / features / i386 / 32bit-mpx.c

diff --git a/gdb/features/i386/32bit-mpx.c b/gdb/features/i386/32bit-mpx.c
index f7d2ef052c5aa16c8c717b167ee10b1457294b10..8288e9d758f2718465621ed55b3514145cf1dd3b 100644 (file)
--- a/gdb/features/i386/32bit-mpx.c
+++ b/gdb/features/i386/32bit-mpx.c
@@ -1,7 +1,7 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-mpx.xml */
 
-#include "arch/tdesc.h"
+#include "common/tdesc.h"
 
 static int
 create_feature_i386_32bit_mpx (struct target_desc *result, long regnum)
@@ -9,37 +9,37 @@ create_feature_i386_32bit_mpx (struct target_desc *result, long regnum)
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result, "org.gnu.gdb.i386.mpx");
-  struct tdesc_type *field_type;
-  struct tdesc_type *type;
-  type = tdesc_create_struct (feature, "br128");
+  tdesc_type_with_fields *type_with_fields;
+  type_with_fields = tdesc_create_struct (feature, "br128");
+  tdesc_type *field_type;
   field_type = tdesc_named_type (feature, "uint64");
-  tdesc_add_field (type, "lbound", field_type);
+  tdesc_add_field (type_with_fields, "lbound", field_type);
   field_type = tdesc_named_type (feature, "uint64");
-  tdesc_add_field (type, "ubound_raw", field_type);
+  tdesc_add_field (type_with_fields, "ubound_raw", field_type);
 
-  type = tdesc_create_struct (feature, "_bndstatus");
-  tdesc_set_struct_size (type, 8);
-  tdesc_add_bitfield (type, "bde", 2, 31);
-  tdesc_add_bitfield (type, "error", 0, 1);
+  type_with_fields = tdesc_create_struct (feature, "_bndstatus");
+  tdesc_set_struct_size (type_with_fields, 8);
+  tdesc_add_bitfield (type_with_fields, "bde", 2, 31);
+  tdesc_add_bitfield (type_with_fields, "error", 0, 1);
 
-  type = tdesc_create_union (feature, "status");
+  type_with_fields = tdesc_create_union (feature, "status");
   field_type = tdesc_named_type (feature, "data_ptr");
-  tdesc_add_field (type, "raw", field_type);
+  tdesc_add_field (type_with_fields, "raw", field_type);
   field_type = tdesc_named_type (feature, "_bndstatus");
-  tdesc_add_field (type, "status", field_type);
+  tdesc_add_field (type_with_fields, "status", field_type);
 
-  type = tdesc_create_struct (feature, "_bndcfgu");
-  tdesc_set_struct_size (type, 8);
-  tdesc_add_bitfield (type, "base", 12, 31);
-  tdesc_add_bitfield (type, "reserved", 2, 11);
-  tdesc_add_bitfield (type, "preserved", 1, 1);
-  tdesc_add_bitfield (type, "enabled", 0, 0);
+  type_with_fields = tdesc_create_struct (feature, "_bndcfgu");
+  tdesc_set_struct_size (type_with_fields, 8);
+  tdesc_add_bitfield (type_with_fields, "base", 12, 31);
+  tdesc_add_bitfield (type_with_fields, "reserved", 2, 11);
+  tdesc_add_bitfield (type_with_fields, "preserved", 1, 1);
+  tdesc_add_bitfield (type_with_fields, "enabled", 0, 0);
 
-  type = tdesc_create_union (feature, "cfgu");
+  type_with_fields = tdesc_create_union (feature, "cfgu");
   field_type = tdesc_named_type (feature, "data_ptr");
-  tdesc_add_field (type, "raw", field_type);
+  tdesc_add_field (type_with_fields, "raw", field_type);
   field_type = tdesc_named_type (feature, "_bndcfgu");
-  tdesc_add_field (type, "config", field_type);
+  tdesc_add_field (type_with_fields, "config", field_type);
 
   tdesc_create_reg (feature, "bnd0raw", regnum++, 1, NULL, 128, "br128");
   tdesc_create_reg (feature, "bnd1raw", regnum++, 1, NULL, 128, "br128");