From f50b437c3da71d91dfb04db8e06b2cdb69d16294 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 13 Mar 2023 10:57:56 -0600 Subject: Unify arch_character_type and init_character_type This unifies arch_character_type and init_character_type by using a type allocator. Reviewed-By: Simon Marchi --- gdb/ada-lang.c | 6 +++--- gdb/ctfread.c | 2 +- gdb/d-lang.c | 6 +++--- gdb/dwarf2/read.c | 8 ++++---- gdb/gdbtypes.c | 29 +++++------------------------ gdb/gdbtypes.h | 11 +++++++---- gdb/go-lang.c | 2 +- gdb/m2-lang.c | 2 +- gdb/rust-lang.c | 2 +- gdb/stabsread.c | 4 ++-- 10 files changed, 28 insertions(+), 44 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a3ceb3a..07995f3 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13563,12 +13563,12 @@ public: 0, "long_integer")); add (init_integer_type (alloc, gdbarch_short_bit (gdbarch), 0, "short_integer")); - struct type *char_type = arch_character_type (gdbarch, TARGET_CHAR_BIT, + struct type *char_type = init_character_type (alloc, TARGET_CHAR_BIT, 1, "character"); lai->set_string_char_type (char_type); add (char_type); - add (arch_character_type (gdbarch, 16, 1, "wide_character")); - add (arch_character_type (gdbarch, 32, 1, "wide_wide_character")); + add (init_character_type (alloc, 16, 1, "wide_character")); + add (init_character_type (alloc, 32, 1, "wide_wide_character")); add (arch_float_type (gdbarch, gdbarch_float_bit (gdbarch), "float", gdbarch_float_format (gdbarch))); add (arch_float_type (gdbarch, gdbarch_double_bit (gdbarch), diff --git a/gdb/ctfread.c b/gdb/ctfread.c index 879fdeb..3940a4f 100644 --- a/gdb/ctfread.c +++ b/gdb/ctfread.c @@ -566,7 +566,7 @@ read_base_type (struct ctf_context *ccp, ctf_id_t tid) ischar = cet.cte_format & CTF_INT_CHAR; isbool = cet.cte_format & CTF_INT_BOOL; if (ischar) - type = init_character_type (of, TARGET_CHAR_BIT, !issigned, name); + type = init_character_type (alloc, TARGET_CHAR_BIT, !issigned, name); else if (isbool) type = init_boolean_type (of, gdbarch_int_bit (gdbarch), !issigned, name); diff --git a/gdb/d-lang.c b/gdb/d-lang.c index af9a81d..8e5262d 100644 --- a/gdb/d-lang.c +++ b/gdb/d-lang.c @@ -262,11 +262,11 @@ build_d_types (struct gdbarch *gdbarch) /* Character types. */ builtin_d_type->builtin_char - = arch_character_type (gdbarch, 8, 1, "char"); + = init_character_type (alloc, 8, 1, "char"); builtin_d_type->builtin_wchar - = arch_character_type (gdbarch, 16, 1, "wchar"); + = init_character_type (alloc, 16, 1, "wchar"); builtin_d_type->builtin_dchar - = arch_character_type (gdbarch, 32, 1, "dchar"); + = init_character_type (alloc, 32, 1, "dchar"); return builtin_d_type; } diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index d676f00..a7871a3 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -15264,7 +15264,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) if (cu->lang () == language_fortran && name && startswith (name, "character(")) - type = init_character_type (objfile, bits, 1, name); + type = init_character_type (alloc, bits, 1, name); else type = dwarf2_init_integer_type (cu, objfile, bits, 1, name); break; @@ -15273,7 +15273,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) || cu->lang () == language_m2 || cu->lang () == language_pascal || cu->lang () == language_fortran) - type = init_character_type (objfile, bits, 0, name); + type = init_character_type (alloc, bits, 0, name); else type = dwarf2_init_integer_type (cu, objfile, bits, 0, name); break; @@ -15283,13 +15283,13 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) || cu->lang () == language_pascal || cu->lang () == language_fortran || cu->lang () == language_rust) - type = init_character_type (objfile, bits, 1, name); + type = init_character_type (alloc, bits, 1, name); else type = dwarf2_init_integer_type (cu, objfile, bits, 1, name); break; case DW_ATE_UTF: { - type = init_character_type (objfile, bits, 1, name); + type = init_character_type (alloc, bits, 1, name); return set_die_type (die, type, cu); } break; diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index f5ddc86..49f88ce 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3417,17 +3417,15 @@ init_integer_type (type_allocator &alloc, return t; } -/* Allocate a TYPE_CODE_CHAR type structure associated with OBJFILE. - BIT is the type size in bits. If UNSIGNED_P is non-zero, set - the type's TYPE_UNSIGNED flag. NAME is the type name. */ +/* See gdbtypes.h. */ struct type * -init_character_type (struct objfile *objfile, +init_character_type (type_allocator &alloc, int bit, int unsigned_p, const char *name) { struct type *t; - t = type_allocator (objfile).new_type (TYPE_CODE_CHAR, bit, name); + t = alloc.new_type (TYPE_CODE_CHAR, bit, name); if (unsigned_p) t->set_is_unsigned (true); @@ -5750,23 +5748,6 @@ copy_type (const struct type *type) /* Helper functions to initialize architecture-specific types. */ -/* Allocate a TYPE_CODE_CHAR type structure associated with GDBARCH. - BIT is the type size in bits. If UNSIGNED_P is non-zero, set - the type's TYPE_UNSIGNED flag. NAME is the type name. */ - -struct type * -arch_character_type (struct gdbarch *gdbarch, - int bit, int unsigned_p, const char *name) -{ - struct type *t; - - t = type_allocator (gdbarch).new_type (TYPE_CODE_CHAR, bit, name); - if (unsigned_p) - t->set_is_unsigned (true); - - return t; -} - /* Allocate a TYPE_CODE_BOOL type structure associated with GDBARCH. BIT is the type size in bits. If UNSIGNED_P is non-zero, set the type's TYPE_UNSIGNED flag. NAME is the type name. */ @@ -6135,9 +6116,9 @@ create_gdbtypes_data (struct gdbarch *gdbarch) /* "True" character types. */ builtin_type->builtin_true_char - = arch_character_type (gdbarch, TARGET_CHAR_BIT, 0, "true character"); + = init_character_type (alloc, TARGET_CHAR_BIT, 0, "true character"); builtin_type->builtin_true_unsigned_char - = arch_character_type (gdbarch, TARGET_CHAR_BIT, 1, "true character"); + = init_character_type (alloc, TARGET_CHAR_BIT, 1, "true character"); /* Fixed-size integer types. */ builtin_type->builtin_int0 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index c1afbc0..20a5477 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -2300,8 +2300,13 @@ private: extern struct type *init_integer_type (type_allocator &alloc, int bit, int unsigned_p, const char *name); -extern struct type *init_character_type (struct objfile *, int, int, - const char *); + +/* Allocate a TYPE_CODE_CHAR type structure using ALLOC. BIT is the + type size in bits. If UNSIGNED_P is non-zero, set the type's + TYPE_UNSIGNED flag. NAME is the type name. */ + +extern struct type *init_character_type (type_allocator &alloc, int bit, + int unsigned_p, const char *name); extern struct type *init_boolean_type (struct objfile *, int, int, const char *); extern struct type *init_float_type (struct objfile *, int, const char *, @@ -2316,8 +2321,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_character_type (struct gdbarch *, int, int, - const char *); extern struct type *arch_boolean_type (struct gdbarch *, int, int, const char *); extern struct type *arch_float_type (struct gdbarch *, int, const char *, diff --git a/gdb/go-lang.c b/gdb/go-lang.c index 8cdd6b1..6d0d435 100644 --- a/gdb/go-lang.c +++ b/gdb/go-lang.c @@ -486,7 +486,7 @@ build_go_types (struct gdbarch *gdbarch) type_allocator alloc (gdbarch); builtin_go_type->builtin_void = builtin_type (gdbarch)->builtin_void; builtin_go_type->builtin_char - = arch_character_type (gdbarch, 8, 1, "char"); + = init_character_type (alloc, 8, 1, "char"); builtin_go_type->builtin_bool = arch_boolean_type (gdbarch, 8, 0, "bool"); builtin_go_type->builtin_int diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c index 218867d..d2fa1a4 100644 --- a/gdb/m2-lang.c +++ b/gdb/m2-lang.c @@ -292,7 +292,7 @@ build_m2_types (struct gdbarch *gdbarch) = arch_float_type (gdbarch, gdbarch_float_bit (gdbarch), "REAL", gdbarch_float_format (gdbarch)); builtin_m2_type->builtin_char - = arch_character_type (gdbarch, TARGET_CHAR_BIT, 1, "CHAR"); + = init_character_type (alloc, TARGET_CHAR_BIT, 1, "CHAR"); builtin_m2_type->builtin_bool = arch_boolean_type (gdbarch, gdbarch_int_bit (gdbarch), 1, "BOOLEAN"); diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 608799c..be0a710 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1597,7 +1597,7 @@ rust_language::language_arch_info (struct gdbarch *gdbarch, type_allocator alloc (gdbarch); struct type *bool_type = add (arch_boolean_type (gdbarch, 8, 1, "bool")); - add (arch_character_type (gdbarch, 32, 1, "char")); + add (init_character_type (alloc, 32, 1, "char")); add (init_integer_type (alloc, 8, 0, "i8")); struct type *u8_type = add (init_integer_type (alloc, 8, 1, "u8")); diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 6270f48..4c7b88f 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -2158,7 +2158,7 @@ rs6000_builtin_type (int typenum, struct objfile *objfile) rettype = alloc.new_type (TYPE_CODE_ERROR, 0, "stringptr"); break; case 20: - rettype = init_character_type (objfile, 8, 1, "character"); + rettype = init_character_type (alloc, 8, 1, "character"); break; case 21: rettype = init_boolean_type (objfile, 8, 1, "logical*1"); @@ -2192,7 +2192,7 @@ rs6000_builtin_type (int typenum, struct objfile *objfile) rettype = init_integer_type (alloc, 32, 0, "integer*4"); break; case 30: - rettype = init_character_type (objfile, 16, 0, "wchar"); + rettype = init_character_type (alloc, 16, 0, "wchar"); break; case 31: rettype = init_integer_type (alloc, 64, 0, "long long"); -- cgit v1.1