From patchwork Mon Mar 13 22:08:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 66333 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A996D3854835 for ; Mon, 13 Mar 2023 22:08:44 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id A48513858C1F for ; Mon, 13 Mar 2023 22:08:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A48513858C1F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id F10851004CA62 for ; Mon, 13 Mar 2023 22:08:07 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id bqKtpXv5iNX2abqKtpEw6r; Mon, 13 Mar 2023 22:08:07 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=640f9ec7 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=k__wU0fu6RkA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=l3IUqKpcTN6FWELoBeEA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=6FMwhEmL3ZGt6JH7DvEMGnCiJ6lw0YhMHw5Gx5HYLCE=; b=RqkHY6nKwpbBdMwiE74nnkDwBc WxLxumpP/ZdeXfCeyIKY6CFTDdTKsEIznSw2TdhRvzZ+nO3sX+gE8PzL0pDTn3p4Bwjh+RTnnU5bc DVLXoLcAD4BMgcZY9pB9XOYdm; Received: from 71-211-185-113.hlrn.qwest.net ([71.211.185.113]:52788 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pbqKt-000u2m-Os for gdb-patches@sourceware.org; Mon, 13 Mar 2023 16:08:07 -0600 From: Tom Tromey Date: Mon, 13 Mar 2023 16:08:09 -0600 Subject: [PATCH 09/20] Unify arch_character_type and init_character_type MIME-Version: 1.0 Message-Id: <20230313-split-objfile-type-allocator-2-v1-9-69ba773ac17b@tromey.com> References: <20230313-split-objfile-type-allocator-2-v1-0-69ba773ac17b@tromey.com> In-Reply-To: <20230313-split-objfile-type-allocator-2-v1-0-69ba773ac17b@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.185.113 X-Source-L: No X-Exim-ID: 1pbqKt-000u2m-Os X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-185-113.hlrn.qwest.net ([192.168.0.21]) [71.211.185.113]:52788 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3026.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This unifies arch_character_type and init_character_type by using a type allocator. --- 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 | 9 ++++++--- gdb/go-lang.c | 2 +- gdb/m2-lang.c | 2 +- gdb/rust-lang.c | 2 +- gdb/stabsread.c | 4 ++-- 10 files changed, 27 insertions(+), 43 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a3ceb3ae838..07995f3d47b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13563,12 +13563,12 @@ class ada_language : public language_defn 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 879fdeb74d6..3940a4f8c67 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 af9a81d1b1b..8e5262d170a 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 f3cc78ce10b..bb77f75179a 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -15270,7 +15270,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; @@ -15279,7 +15279,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; @@ -15289,13 +15289,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 f5ddc869ebf..49f88ce6026 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 7f2da7a6572..178a8b9a663 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -2300,7 +2300,12 @@ class type_allocator extern struct type *init_integer_type (type_allocator &, int, int, const char *); -extern struct type *init_character_type (struct objfile *, int, int, + +/* 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 &, int, int, const char *); extern struct type *init_boolean_type (struct objfile *, int, 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 8cdd6b124c4..6d0d43530f8 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 218867d408e..d2fa1a46364 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 608799cc662..be0a7100f56 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 6270f48bebb..4c7b88f30cd 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");