[PATCH 12/20] Unify arch_decfloat_type and init_decfloat_type

[Tom Tromey <tom@tromey.com>]

This unifies arch_decfloat_type and init_decfloat_type by using a type
allocator.
---
 gdb/dwarf2/read.c |  2 +-
 gdb/gdbtypes.c    | 25 ++++++-------------------
 gdb/gdbtypes.h    |  7 +++++--
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 857206ae034..21c9fa7c543 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -15258,7 +15258,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
 	  type = init_complex_type (name, type);
 	break;
       case DW_ATE_decimal_float:
-	type = init_decfloat_type (objfile, bits, name);
+	type = init_decfloat_type (alloc, bits, name);
 	break;
       case DW_ATE_float:
 	type = dwarf2_init_float_type (objfile, bits, name, name, byte_order);
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 02711e0af6a..df10ffea383 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3474,13 +3474,12 @@ init_float_type (type_allocator &alloc,
   return t;
 }
 
-/* Allocate a TYPE_CODE_DECFLOAT type structure associated with OBJFILE.
-   BIT is the type size in bits.  NAME is the type name.  */
+/* See gdbtypes.h.  */
 
 struct type *
-init_decfloat_type (struct objfile *objfile, int bit, const char *name)
+init_decfloat_type (type_allocator &alloc, int bit, const char *name)
 {
-  return type_allocator (objfile).new_type (TYPE_CODE_DECFLOAT, bit, name);
+  return alloc.new_type (TYPE_CODE_DECFLOAT, bit, name);
 }
 
 /* Return true if init_complex_type can be called with TARGET_TYPE.  */
@@ -5741,18 +5740,6 @@ copy_type (const struct type *type)
 \f
 /* Helper functions to initialize architecture-specific types.  */
 
-/* Allocate a TYPE_CODE_DECFLOAT type structure associated with GDBARCH.
-   BIT is the type size in bits.  NAME is the type name.  */
-
-struct type *
-arch_decfloat_type (struct gdbarch *gdbarch, int bit, const char *name)
-{
-  struct type *t;
-
-  t = type_allocator (gdbarch).new_type (TYPE_CODE_DECFLOAT, bit, name);
-  return t;
-}
-
 /* Allocate a TYPE_CODE_PTR type structure associated with GDBARCH.
    BIT is the pointer type size in bits.  NAME is the type name.
    TARGET_TYPE is the pointer target type.  Always sets the pointer type's
@@ -6064,11 +6051,11 @@ create_gdbtypes_data (struct gdbarch *gdbarch)
   /* The following three are about decimal floating point types, which
      are 32-bits, 64-bits and 128-bits respectively.  */
   builtin_type->builtin_decfloat
-    = arch_decfloat_type (gdbarch, 32, "_Decimal32");
+    = init_decfloat_type (alloc, 32, "_Decimal32");
   builtin_type->builtin_decdouble
-    = arch_decfloat_type (gdbarch, 64, "_Decimal64");
+    = init_decfloat_type (alloc, 64, "_Decimal64");
   builtin_type->builtin_declong
-    = arch_decfloat_type (gdbarch, 128, "_Decimal128");
+    = init_decfloat_type (alloc, 128, "_Decimal128");
 
   /* "True" character types.  */
   builtin_type->builtin_true_char
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 4613fd4a0fd..32662d5cd3f 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2326,7 +2326,11 @@ extern struct type *init_float_type (type_allocator &, int, const char *,
 				     const struct floatformat **,
 				     enum bfd_endian = BFD_ENDIAN_UNKNOWN);
 
-extern struct type *init_decfloat_type (struct objfile *, int, const char *);
+/* Allocate a TYPE_CODE_DECFLOAT type structure using ALLOC.
+   BIT is the type size in bits.  NAME is the type name.  */
+
+extern struct type *init_decfloat_type (type_allocator &, int, const char *);
+
 extern bool can_create_complex_type (struct type *);
 extern struct type *init_complex_type (const char *, struct type *);
 extern struct type *init_pointer_type (struct objfile *, int, const char *,
@@ -2335,7 +2339,6 @@ extern struct type *init_fixed_point_type (struct objfile *, int, int,
 					   const char *);
 
 /* Helper functions to construct architecture-owned types.  */
-extern struct type *arch_decfloat_type (struct gdbarch *, int, const char *);
 extern struct type *arch_pointer_type (struct gdbarch *, int, const char *,
 				       struct type *);
 

-- 
2.39.1