aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog22
-rw-r--r--gdb/gdbtypes.c53
-rw-r--r--gdb/gdbtypes.h16
-rw-r--r--gdb/i386-tdep.c68
4 files changed, 100 insertions, 59 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 95b2f64..30abadc 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,25 @@
+2005-04-05 Jim Blandy <jimb@redhat.com>
+
+ Move construction of IA-32 vector types to i386-tdep.c.
+ * gdbtypes.c (build_builtin_type_vec64i,
+ build_builtin_type_vec128i): Delete functions.
+ (builtin_type_vec64i, builtin_type_vec128i): Delete variables.
+ (build_gdbtypes): Don't initialize them.
+ (_initialize_gdbtypes): Don't register GDBARCH swap entries for
+ them.
+ * gdbtypes.h (builtin_type_vec64i, builtin_type_vec128i): Delete
+ declarations.
+ (builtin_type_v2_float, builtin_type_v2_int32,
+ builtin_type_v4_int16, builtin_type_v8_int8,
+ builtin_type_v2_double, builtin_type_v4_float,
+ builtin_type_v2_int64, builtin_type_v4_int32,
+ builtin_type_v8_int16, builtin_type_v16_int8): Add extern
+ declarations.
+ * i386-tdep.c (i386_mmx_type, i386_sse_type): New variables.
+ (i386_build_mmx_type, i386_build_sse_type): New functions.
+ (i386_register_type): Call them, rather than referring to
+ builtin_type_vec64i and builtin_type_vec128i.
+
2005-04-02 Daniel Jacobowitz <dan@codesourcery.com>
* mips-linux-tdep.c (mips_linux_o32_sigframe_init): Adjust
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index ce769b6..86f1beb 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -94,9 +94,7 @@ struct type *builtin_type_v8hi;
struct type *builtin_type_v4hi;
struct type *builtin_type_v2si;
struct type *builtin_type_vec64;
-struct type *builtin_type_vec64i;
struct type *builtin_type_vec128;
-struct type *builtin_type_vec128i;
struct type *builtin_type_ieee_single[BFD_ENDIAN_UNKNOWN];
struct type *builtin_type_ieee_single_big;
struct type *builtin_type_ieee_single_little;
@@ -918,34 +916,6 @@ build_builtin_type_vec64 (void)
}
static struct type *
-build_builtin_type_vec64i (void)
-{
- /* Construct a type for the 64 bit registers. The type we're
- building is this: */
-#if 0
- union __gdb_builtin_type_vec64i
- {
- int64_t uint64;
- int32_t v2_int32[2];
- int16_t v4_int16[4];
- int8_t v8_int8[8];
- };
-#endif
-
- struct type *t;
-
- t = init_composite_type ("__gdb_builtin_type_vec64i", TYPE_CODE_UNION);
- append_composite_type_field (t, "uint64", builtin_type_int64);
- append_composite_type_field (t, "v2_int32", builtin_type_v2_int32);
- append_composite_type_field (t, "v4_int16", builtin_type_v4_int16);
- append_composite_type_field (t, "v8_int8", builtin_type_v8_int8);
-
- TYPE_FLAGS (t) |= TYPE_FLAG_VECTOR;
- TYPE_NAME (t) = "builtin_type_vec64i";
- return t;
-}
-
-static struct type *
build_builtin_type_vec128 (void)
{
/* Construct a type for the 128 bit registers. The type we're
@@ -975,26 +945,6 @@ build_builtin_type_vec128 (void)
return t;
}
-static struct type *
-build_builtin_type_vec128i (void)
-{
- /* 128-bit Intel SIMD registers */
- struct type *t;
-
- t = init_composite_type ("__gdb_builtin_type_vec128i", TYPE_CODE_UNION);
- append_composite_type_field (t, "v4_float", builtin_type_v4_float);
- append_composite_type_field (t, "v2_double", builtin_type_v2_double);
- append_composite_type_field (t, "v16_int8", builtin_type_v16_int8);
- append_composite_type_field (t, "v8_int16", builtin_type_v8_int16);
- append_composite_type_field (t, "v4_int32", builtin_type_v4_int32);
- append_composite_type_field (t, "v2_int64", builtin_type_v2_int64);
- append_composite_type_field (t, "uint128", builtin_type_int128);
-
- TYPE_FLAGS (t) |= TYPE_FLAG_VECTOR;
- TYPE_NAME (t) = "builtin_type_vec128i";
- return t;
-}
-
/* Smash TYPE to be a type of members of DOMAIN with type TO_TYPE.
A MEMBER is a wierd thing -- it amounts to a typed offset into
a struct, e.g. "an int at offset 8". A MEMBER TYPE doesn't
@@ -3307,9 +3257,7 @@ Show resolution of opaque struct/class/union types (if set before loading symbol
/* Vector types. */
builtin_type_vec64 = build_builtin_type_vec64 ();
- builtin_type_vec64i = build_builtin_type_vec64i ();
builtin_type_vec128 = build_builtin_type_vec128 ();
- builtin_type_vec128i = build_builtin_type_vec128i ();
/* Pointer/Address types. */
@@ -3608,7 +3556,6 @@ _initialize_gdbtypes (void)
DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v8_int8);
DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4_int16);
DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_vec128);
- DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_vec128i);
DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_void_data_ptr);
DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_void_func_ptr);
DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_CORE_ADDR);
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 6c12f05..4fb970e 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1072,13 +1072,21 @@ extern struct type *builtin_type_v8hi;
extern struct type *builtin_type_v4hi;
extern struct type *builtin_type_v2si;
-/* Type for 64 bit vectors. */
+/* Types for 64 bit vectors. */
+extern struct type *builtin_type_v2_float;
+extern struct type *builtin_type_v2_int32;
+extern struct type *builtin_type_v4_int16;
+extern struct type *builtin_type_v8_int8;
extern struct type *builtin_type_vec64;
-extern struct type *builtin_type_vec64i;
-/* Type for 128 bit vectors. */
+/* Types for 128 bit vectors. */
+extern struct type *builtin_type_v2_double;
+extern struct type *builtin_type_v4_float;
+extern struct type *builtin_type_v2_int64;
+extern struct type *builtin_type_v4_int32;
+extern struct type *builtin_type_v8_int16;
+extern struct type *builtin_type_v16_int8;
extern struct type *builtin_type_vec128;
-extern struct type *builtin_type_vec128i;
/* Explicit floating-point formats. See "floatformat.h". */
extern struct type *builtin_type_ieee_single[BFD_ENDIAN_UNKNOWN];
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 240a8b5..36b0630 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -1489,6 +1489,70 @@ i386_return_value (struct gdbarch *gdbarch, struct type *type,
}
+/* Types for the MMX and SSE registers. */
+static struct type *i386_mmx_type;
+static struct type *i386_sse_type;
+
+/* Construct the type for MMX registers. */
+static struct type *
+i386_build_mmx_type (void)
+{
+ /* The type we're building is this: */
+#if 0
+ union __gdb_builtin_type_vec64i
+ {
+ int64_t uint64;
+ int32_t v2_int32[2];
+ int16_t v4_int16[4];
+ int8_t v8_int8[8];
+ };
+#endif
+
+ if (! i386_mmx_type)
+ {
+ struct type *t;
+
+ t = init_composite_type ("__gdb_builtin_type_vec64i", TYPE_CODE_UNION);
+ append_composite_type_field (t, "uint64", builtin_type_int64);
+ append_composite_type_field (t, "v2_int32", builtin_type_v2_int32);
+ append_composite_type_field (t, "v4_int16", builtin_type_v4_int16);
+ append_composite_type_field (t, "v8_int8", builtin_type_v8_int8);
+
+ TYPE_FLAGS (t) |= TYPE_FLAG_VECTOR;
+ TYPE_NAME (t) = "builtin_type_vec64i";
+
+ i386_mmx_type = t;
+ }
+
+ return i386_mmx_type;
+}
+
+/* Construct the type for SSE registers. */
+static struct type *
+i386_build_sse_type (void)
+{
+ if (! i386_sse_type)
+ {
+ struct type *t;
+
+ t = init_composite_type ("__gdb_builtin_type_vec128i", TYPE_CODE_UNION);
+ append_composite_type_field (t, "v4_float", builtin_type_v4_float);
+ append_composite_type_field (t, "v2_double", builtin_type_v2_double);
+ append_composite_type_field (t, "v16_int8", builtin_type_v16_int8);
+ append_composite_type_field (t, "v8_int16", builtin_type_v8_int16);
+ append_composite_type_field (t, "v4_int32", builtin_type_v4_int32);
+ append_composite_type_field (t, "v2_int64", builtin_type_v2_int64);
+ append_composite_type_field (t, "uint128", builtin_type_int128);
+
+ TYPE_FLAGS (t) |= TYPE_FLAG_VECTOR;
+ TYPE_NAME (t) = "builtin_type_vec128i";
+
+ i386_sse_type = t;
+ }
+
+ return i386_sse_type;
+}
+
/* Return the GDB type object for the "standard" data type of data in
register REGNUM. Perhaps %esi and %edi should go here, but
potentially they could be used for things other than address. */
@@ -1504,10 +1568,10 @@ i386_register_type (struct gdbarch *gdbarch, int regnum)
return builtin_type_i387_ext;
if (i386_sse_regnum_p (gdbarch, regnum))
- return builtin_type_vec128i;
+ return i386_build_sse_type ();
if (i386_mmx_regnum_p (gdbarch, regnum))
- return builtin_type_vec64i;
+ return i386_build_mmx_type ();
return builtin_type_int;
}