From patchwork Fri Nov 3 16:09:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79029 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 CC38238560A7 for ; Fri, 3 Nov 2023 16:10:09 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by sourceware.org (Postfix) with ESMTPS id 583483858D32 for ; Fri, 3 Nov 2023 16:09:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 583483858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 583483858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699027779; cv=none; b=tS5pSadXqjGgewMMBMl3m1M1DX2LHezWlHy8Q4Kns/+RWaOaP7iA9GjHPN95osP2FyRHaBtSJpT6phvq3dORE1x9Nni9XFTHuViMLI4GZ0XRi2Ujz737OJUGfAQrLi05t8DL949bLj15ipAI0kN1EtIOAI/IJCJQC2ue8MQd28Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699027779; c=relaxed/simple; bh=qnkaD8QljU+nv2gwZWS53ZwHF7va04YuFpjrlXG7fe8=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=O0Ai1QhJ+ICkr3v+fqL9okUHecUH99AYdv4nwaLOouynwA0rxFIbNuj9zRJACAO5Dwopm3qA3i8M+OMYLrO0n2wMVBoFqxCAebaqP5eVEPWPcBXhmg5ayFqZMeY98zgWTJonrLf5wz68V3RLxc9W7tREPIlrnLd1Kdp3xWgKkdI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-7a694a365d9so93223039f.0 for ; Fri, 03 Nov 2023 09:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1699027768; x=1699632568; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ln40IXP1ybg+ELNvFQsbE6u9ASyV20l5UFcfCRcT2P4=; b=Lte1YoAc72tBaPF+0zb1YHcgKWS2XN6BjszWIYg6duSvIE8erFnMRx8yjGEfORPjr8 E1HrwbpSvn8mmLDDoKlFewWiLlyXxMhdRVH06QW6ztYwWPfHinUttrO8VSSp/mDhX8aL Z9y2/VR3+xXMLkRI2fmPemsdga02nvEhpBM+XNhuH/VxJiifUbR3RP9JuUNWmWFZGEFS 1THw03Iy/D7dwZQqrrXSleA7vAqce9oydmtPlt3ySVZRuIKCdeeyJzbvTrMYgeovudqS BG7yAp49Eo9eRiWhwn6djh4Ko/bvhInbE1jjzMcK7ryzxTerwmEaa3ffonbMMn0jf4GL i5bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699027768; x=1699632568; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ln40IXP1ybg+ELNvFQsbE6u9ASyV20l5UFcfCRcT2P4=; b=FpLJre4KZeODW8DwlPJeNFDNgPTpfSEhy9H4K4zE9N9TJm8u5s1c1iQUqtPzve+V8Q +JL2WJnwPdh0kuRHeN7u5gshWGQn1dVAm6kUzIfFujSJb6Zp/2K4BWpt5v0wjCBb/O6G jCGjvAg6Sxgp6+Wz+J5uGCpxGsDM1FvrUgszldCvDFRQ0u0pYC7/c7b8cGUdryizN891 KGWt+DT8uRaHj32S2Ac5ahYkZ7x46fyvvMhblc5hfrMJzRf1TxAUSl9A483gXmeL6A6N VAleiDyQ7ugmCUMMKZcZl3sS8eYhNqwMJSlVHZMHaqlx8OIuuX+WA2igga+XKxXn/OyF FNgg== X-Gm-Message-State: AOJu0YyV2zshpg0M004ppS7CuRo+yPbSb/SCMaTNnzomv36Hzw5aMjDL e4+d8ZzSWWKZEWU8zYrmuJ9a/t+c2EsJpM9UUWVdlQ== X-Google-Smtp-Source: AGHT+IFYIOs5XhZ5OxyODne0KNDW3AOV4roxPS2Rt7QIdTadBpVgI1FQ7PSgNsmq+eXEs1E4TGZnag== X-Received: by 2002:a05:6602:1608:b0:79a:b53c:d758 with SMTP id x8-20020a056602160800b0079ab53cd758mr30983845iow.1.1699027768564; Fri, 03 Nov 2023 09:09:28 -0700 (PDT) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id gu16-20020a0566382e1000b0042b3dcb1106sm581839jab.47.2023.11.03.09.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 09:09:28 -0700 (PDT) From: Tom Tromey Date: Fri, 03 Nov 2023 10:09:23 -0600 Subject: [PATCH v3 1/9] Use .def file to stringify type codes MIME-Version: 1.0 Message-Id: <20231103-field-bits-v3-1-273c40bcaf3d@adacore.com> References: <20231103-field-bits-v3-0-273c40bcaf3d@adacore.com> In-Reply-To: <20231103-field-bits-v3-0-273c40bcaf3d@adacore.com> To: gdb-patches@sourceware.org Cc: Simon Marchi , Keith Seitz X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 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 This changes recursive_dump_type to reuse the type-codes.def file when stringifying type codes. This version of the patch changes the "unknown" case to an assert. Acked-By: Simon Marchi Reviewed-by: Keith Seitz --- gdb/gdbtypes.c | 99 +++++++++++----------------------------------------------- 1 file changed, 18 insertions(+), 81 deletions(-) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 7011fddd695..a585674ebe4 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"; + } + + gdb_assert_not_reached ("unhandled type_code"); +} + 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 ()));