From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by sourceware.org (Postfix) with ESMTPS id 62F8D396E064 for ; Mon, 14 Sep 2020 21:31:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 62F8D396E064 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=alves.ped@gmail.com Received: by mail-wm1-f48.google.com with SMTP id e17so1404634wme.0 for ; Mon, 14 Sep 2020 14:31:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=SuCT2W7Io1lAo8K+sYRmENM3558IQR5kgLkVPWi3fGo=; b=G/vpGbXEEy2oh+hp9+9jM+UzG9VCTntxiRTmOSN16F8dQ6E22emWd176V16K70T51Q nJFRT1ToMide0u2VEkvhxJFn6UpmfGJUFsr8e5GAP1HU0inlH50NCaq/cJq+ZnJcc7ZB 5d0Pd6pM5SvbyQVKXvxuefcIEVdDOZKzlsXUU3M2/0kpToACWlhvp9rjOAzpN5ThXVMa DGvYm6V722II2Pc3OP3+Y7lJ8wJWSDu9zuimqTlE4WrpMKI1s6IJhf+CxHBRZZf4JUTm 4NxWQgfT8kat2v/8YlssZhpDGZeNf2jImt4OCPKhi67qqKft24Iu/0RqMLdz3RWzZP3+ dUpg== X-Gm-Message-State: AOAM533lLeAqjobRuCm8Cmw9X7YiUr1yrFd3oR0G/ruFMs1jDsiIwYGh ZgPKzr19igjKs6B8Qg4Wql2CahOcEC3pdQ== X-Google-Smtp-Source: ABdhPJwe/jTkxFtlwsK9ApU8XYVMGJyJMU4Z51DohM95zsulWs+i0onAdX2wkR3wMu9KBfhunxP+7g== X-Received: by 2002:a05:600c:283:: with SMTP id 3mr1347940wmk.110.1600119079691; Mon, 14 Sep 2020 14:31:19 -0700 (PDT) Received: from localhost ([2001:8a0:f905:5600:eefd:c63:53e0:3e8a]) by smtp.gmail.com with ESMTPSA id v128sm20974500wme.2.2020.09.14.14.31.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Sep 2020 14:31:18 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [pushed v2 2/4] Rename address_space_int_to_name/address_space_name_to_int Date: Mon, 14 Sep 2020 22:31:10 +0100 Message-Id: <20200914213112.19593-3-pedro@palves.net> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20200914213112.19593-1-pedro@palves.net> References: <20200914213112.19593-1-pedro@palves.net> X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , X-List-Received-Date: Mon, 14 Sep 2020 21:31:22 -0000 These methods now take/return a type_instance_flags instead of a raw integer, so rename them accordingly. gdb/ChangeLog: * c-typeprint.c (c_type_print_modifier): Adjust to rename. * gdbtypes.c (address_space_name_to_int): Rename to ... (address_space_name_to_type_instance_flags): ... this. (address_space_int_to_name): Rename to ... (address_space_type_instance_flags_to_name): ... this. * gdbtypes.h (address_space_name_to_int): Rename to ... (address_space_name_to_type_instance_flags): ... this. (address_space_int_to_name): Rename to ... (address_space_type_instance_flags_to_name): ... this. * type-stack.c (type_stack::insert): Adjust to rename. * type-stack.h (type_stack::insert): Likewise. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/c-typeprint.c | 5 +++-- gdb/gdbtypes.c | 16 ++++++++-------- gdb/gdbtypes.h | 8 ++++---- gdb/type-stack.c | 5 +++-- gdb/type-stack.h | 10 +++++----- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7d4800b0b0..cb435c1fd7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2020-09-14 Pedro Alves + + * c-typeprint.c (c_type_print_modifier): Adjust to rename. + * gdbtypes.c (address_space_name_to_int): Rename to ... + (address_space_name_to_type_instance_flags): ... this. + (address_space_int_to_name): Rename to ... + (address_space_type_instance_flags_to_name): ... this. + * gdbtypes.h (address_space_name_to_int): Rename to ... + (address_space_name_to_type_instance_flags): ... this. + (address_space_int_to_name): Rename to ... + (address_space_type_instance_flags_to_name): ... this. + * type-stack.c (type_stack::insert): Adjust to rename. + * type-stack.h (type_stack::insert): Likewise. + 2020-09-14 Pedro Alves Andrew Burgess diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index b642c88178..a07b29a95d 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -526,8 +526,9 @@ c_type_print_modifier (struct type *type, struct ui_file *stream, did_print_modifier = 1; } - address_space_id = address_space_int_to_name (get_type_arch (type), - TYPE_INSTANCE_FLAGS (type)); + address_space_id + = address_space_type_instance_flags_to_name (get_type_arch (type), + TYPE_INSTANCE_FLAGS (type)); if (address_space_id) { if (did_print_modifier || need_pre_space) diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index b57353dec3..7ade2ccb53 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -575,12 +575,12 @@ lookup_function_type_with_arguments (struct type *type, return fn; } -/* Identify address space identifier by name -- - return the integer flag defined in gdbtypes.h. */ +/* Identify address space identifier by name -- return a + type_instance_flags. */ type_instance_flags -address_space_name_to_int (struct gdbarch *gdbarch, - const char *space_identifier) +address_space_name_to_type_instance_flags (struct gdbarch *gdbarch, + const char *space_identifier) { type_instance_flags type_flags; @@ -598,12 +598,12 @@ address_space_name_to_int (struct gdbarch *gdbarch, error (_("Unknown address space specifier: \"%s\""), space_identifier); } -/* Identify address space identifier by integer flag as defined in - gdbtypes.h -- return the string version of the adress space name. */ +/* Identify address space identifier by type_instance_flags and return + the string version of the adress space name. */ const char * -address_space_int_to_name (struct gdbarch *gdbarch, - type_instance_flags space_flag) +address_space_type_instance_flags_to_name (struct gdbarch *gdbarch, + type_instance_flags space_flag) { if (space_flag & TYPE_INSTANCE_FLAG_CODE_SPACE) return "code"; diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index cdd136ef52..6b87de307b 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -2217,11 +2217,11 @@ extern struct type *make_atomic_type (struct type *); extern void replace_type (struct type *, struct type *); -extern type_instance_flags address_space_name_to_int (struct gdbarch *, - const char *); +extern type_instance_flags address_space_name_to_type_instance_flags + (struct gdbarch *, const char *); -extern const char *address_space_int_to_name (struct gdbarch *, - type_instance_flags); +extern const char *address_space_type_instance_flags_to_name + (struct gdbarch *, type_instance_flags); extern struct type *make_type_with_address_space (struct type *type, type_instance_flags space_identifier); diff --git a/gdb/type-stack.c b/gdb/type-stack.c index 608142c849..94ff9ba8c9 100644 --- a/gdb/type-stack.c +++ b/gdb/type-stack.c @@ -67,8 +67,9 @@ type_stack::insert (struct expr_builder *pstate, const char *string) element.piece = tp_space_identifier; insert_into (slot, element); - element.int_val = address_space_name_to_int (pstate->gdbarch (), - string); + element.int_val + = address_space_name_to_type_instance_flags (pstate->gdbarch (), + string); insert_into (slot, element); } diff --git a/gdb/type-stack.h b/gdb/type-stack.h index 8060f2fea7..265178fc37 100644 --- a/gdb/type-stack.h +++ b/gdb/type-stack.h @@ -157,11 +157,11 @@ struct type_stack /* Insert a tp_space_identifier and the corresponding address space value into the stack. STRING is the name of an address space, as - recognized by address_space_name_to_int. If the stack is empty, - the new elements are simply pushed. If the stack is not empty, - this function assumes that the first item on the stack is a - tp_pointer, and the new values are inserted above the first - item. */ + recognized by address_space_name_to_type_instance_flags. If the + stack is empty, the new elements are simply pushed. If the stack + is not empty, this function assumes that the first item on the + stack is a tp_pointer, and the new values are inserted above the + first item. */ void insert (struct expr_builder *pstate, const char *string); -- 2.14.5