From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lndn.lancelotsix.com (lndn.lancelotsix.com [51.195.220.111]) by sourceware.org (Postfix) with ESMTPS id 4DBFF3857C40 for ; Mon, 25 Sep 2023 21:58:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4DBFF3857C40 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=lancelotsix.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lancelotsix.com Received: from octopus (cust120-dsl54.idnet.net [212.69.54.120]) by lndn.lancelotsix.com (Postfix) with ESMTPSA id 146D5853C0; Mon, 25 Sep 2023 21:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lancelotsix.com; s=2021; t=1695679096; bh=h5/0VkRTZNcTmcusbUmwcpj2H8M7g73KhEjnEeW1A30=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=CRSfpjrNw1aA5/1r4ihdGdiriB1f/SO61HQ2Y7apFGhPynEIBZhx3oY2fOfbQDO2E c5VAjPsdk/MDTeTvsB593s77XU1RFeU8+dPJQdnqPAZqV4DMqsmZ29hCDprNa4XkYH zXXcUkluiM85GSkjCPZep5E25dGkioA6pPIWMnfhXObXEq6XPhH2GT88Ix+iyGBgxp N5g09Rn1u3kTS4lzQzOZ252+v8QCtANfzfNrgUWR/6a0Z/p2b/fwzcU8auc/SH6Vx0 azZhX6FeP9ITZEsru4JqseVu8Cw9p0xwWy86b9arVG8rbex6NBNHCDrK1fEVIMAqzi RKQfuxRFq5/Vg== Date: Mon, 25 Sep 2023 22:58:10 +0100 From: Lancelot SIX To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [PATCH 1/7] Use .def file to stringify type codes Message-ID: <20230925215810.jhxq35iznktykrzl@octopus> References: <20230921-field-bits-v1-0-201285360900@adacore.com> <20230921-field-bits-v1-1-201285360900@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230921-field-bits-v1-1-201285360900@adacore.com> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (lndn.lancelotsix.com [0.0.0.0]); Mon, 25 Sep 2023 21:58:16 +0000 (UTC) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: Hi Tom, On Thu, Sep 21, 2023 at 12:01:28PM -0600, Tom Tromey via Gdb-patches wrote: > This changes recursive_dump_type to reuse the type-codes.def file when > stringifying type codes. > --- > gdb/gdbtypes.c | 99 +++++++++++----------------------------------------------- > 1 file changed, 18 insertions(+), 81 deletions(-) > > diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c > index 7011fddd695..18aa8e5c29e 100644 > --- a/gdb/gdbtypes.c > +++ b/gdb/gdbtypes.c > @@ -5099,6 +5099,23 @@ dump_dynamic_prop (dynamic_prop const& prop) > } > } > > +/* Return a string that represents a type code. */ > +static const char * > +type_code_name (type_code code) > +{ > + switch (code) > + { > +#define OP(X) case X: return # X; > +#include "type-codes.def" > +#undef OP > + > + case TYPE_CODE_UNDEF: > + return "TYPE_CODE_UNDEF"; > + default: > + return "UNKNOWN TYPE CODE"; Is this default "just" to make the compiler happy? I don't expect it should ever executed. If so, I usually prefer the following construct: static const char * foo (some_enume e) { switch (e) { case A: return "A"; case B: return "B"; [...] /* No "default:". */ } return "unknown"; } The return after the switch block avoids the "control reaches end of non-void function" error, but since there is no "default:" the compiler can warn if some enumerator is not covered by the switch. That being said, given how type_code is constructed, the "#include type-codes.def" make it really unlikely that type_code_name can evolve without having this function evolve as well. Best, Lancelot. > + } > +} > + > void > recursive_dump_type (struct type *type, int spaces) > { > @@ -5136,87 +5153,7 @@ recursive_dump_type (struct type *type, int spaces) > type->name () ? type->name () : "", > host_address_to_string (type->name ())); > gdb_printf ("%*scode 0x%x ", spaces, "", type->code ()); > - switch (type->code ()) > - { > - case TYPE_CODE_UNDEF: > - gdb_printf ("(TYPE_CODE_UNDEF)"); > - break; > - case TYPE_CODE_PTR: > - gdb_printf ("(TYPE_CODE_PTR)"); > - break; > - case TYPE_CODE_ARRAY: > - gdb_printf ("(TYPE_CODE_ARRAY)"); > - break; > - case TYPE_CODE_STRUCT: > - gdb_printf ("(TYPE_CODE_STRUCT)"); > - break; > - case TYPE_CODE_UNION: > - gdb_printf ("(TYPE_CODE_UNION)"); > - break; > - case TYPE_CODE_ENUM: > - gdb_printf ("(TYPE_CODE_ENUM)"); > - break; > - case TYPE_CODE_FLAGS: > - gdb_printf ("(TYPE_CODE_FLAGS)"); > - break; > - case TYPE_CODE_FUNC: > - gdb_printf ("(TYPE_CODE_FUNC)"); > - break; > - case TYPE_CODE_INT: > - gdb_printf ("(TYPE_CODE_INT)"); > - break; > - case TYPE_CODE_FLT: > - gdb_printf ("(TYPE_CODE_FLT)"); > - break; > - case TYPE_CODE_VOID: > - gdb_printf ("(TYPE_CODE_VOID)"); > - break; > - case TYPE_CODE_SET: > - gdb_printf ("(TYPE_CODE_SET)"); > - break; > - case TYPE_CODE_RANGE: > - gdb_printf ("(TYPE_CODE_RANGE)"); > - break; > - case TYPE_CODE_STRING: > - gdb_printf ("(TYPE_CODE_STRING)"); > - break; > - case TYPE_CODE_ERROR: > - gdb_printf ("(TYPE_CODE_ERROR)"); > - break; > - case TYPE_CODE_MEMBERPTR: > - gdb_printf ("(TYPE_CODE_MEMBERPTR)"); > - break; > - case TYPE_CODE_METHODPTR: > - gdb_printf ("(TYPE_CODE_METHODPTR)"); > - break; > - case TYPE_CODE_METHOD: > - gdb_printf ("(TYPE_CODE_METHOD)"); > - break; > - case TYPE_CODE_REF: > - gdb_printf ("(TYPE_CODE_REF)"); > - break; > - case TYPE_CODE_CHAR: > - gdb_printf ("(TYPE_CODE_CHAR)"); > - break; > - case TYPE_CODE_BOOL: > - gdb_printf ("(TYPE_CODE_BOOL)"); > - break; > - case TYPE_CODE_COMPLEX: > - gdb_printf ("(TYPE_CODE_COMPLEX)"); > - break; > - case TYPE_CODE_TYPEDEF: > - gdb_printf ("(TYPE_CODE_TYPEDEF)"); > - break; > - case TYPE_CODE_NAMESPACE: > - gdb_printf ("(TYPE_CODE_NAMESPACE)"); > - break; > - case TYPE_CODE_FIXED_POINT: > - gdb_printf ("(TYPE_CODE_FIXED_POINT)"); > - break; > - default: > - gdb_printf ("(UNKNOWN TYPE CODE)"); > - break; > - } > + gdb_printf ("(%s)", type_code_name (type->code ())); > gdb_puts ("\n"); > gdb_printf ("%*slength %s\n", spaces, "", > pulongest (type->length ())); > > -- > 2.40.1 >