From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 4FEB1385840D for ; Wed, 1 Dec 2021 22:04:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4FEB1385840D Received: by mail-il1-x135.google.com with SMTP id e8so26964952ilu.9 for ; Wed, 01 Dec 2021 14:04:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7yTXhtoxIuxsJOBd8eNxlTn5cg1FQhUIwSf97Jy6PO4=; b=VNNIbywEAPqhpICuERX5DccWKFSpuVn+HBY8t1+JAcUPHsh8Y0Bfo1Jos/cy4l4Loo T04tqurM74oL8kPpyLCt6vJHz+HxOCJIz/FIRmW67y9QncJuDELlZ1qC4Y8LZFuaw+I2 Vu6Fkkvv5mvmbIf+NP5S50lMfacBJL/xLnfYhnMx5pDjICftu1ZzSnv4SUNL34nVepRM /kdBCRBe9F8suNLjJMEGZ66HuEXQGh6petBJqREnSAGhuuDwMYBz3fFB1GCVfcB24lp0 OEC0C7/SQwx0UjNKe7WRCHxodrYxd8H9d7fTyeHfljGhFRT3WtKxot3lfOMazFMW88Sa 5qTA== X-Gm-Message-State: AOAM531tsxXjR3Z/UpIAb01+pEzsbpjbhk6W3m1D+A+CP0Blfo+W9ZAb l/Bx1yMZYhQThkN/gucLngIg9bu0joOvZA== X-Google-Smtp-Source: ABdhPJxHYpgJ6ULet1LR8HmlBjMY9DmT2LtySXXbETrQSawk6xcdLM/PV/xbVpIS7I06zqUYN1TTew== X-Received: by 2002:a92:d28d:: with SMTP id p13mr13458794ilp.163.1638396277696; Wed, 01 Dec 2021 14:04:37 -0800 (PST) Received: from murgatroyd.Home (97-122-84-67.hlrn.qwest.net. [97.122.84.67]) by smtp.gmail.com with ESMTPSA id l18sm622298iob.17.2021.12.01.14.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 14:04:37 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 2/6] Make call_site_target members private Date: Wed, 1 Dec 2021 15:04:28 -0700 Message-Id: <20211201220432.4105152-3-tromey@adacore.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211201220432.4105152-1-tromey@adacore.com> References: <20211201220432.4105152-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 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 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Wed, 01 Dec 2021 22:04:40 -0000 This makes the data members of call_site_target 'private'. This lets us remove most of its public API. call_site_to_target_addr is changed to be a method of this type. This is a preparatory refactoring for the fix at the end of this series. --- gdb/dwarf2/loc.c | 26 ++++++++++++-------------- gdb/gdbtypes.h | 44 +++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 37 deletions(-) diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 1d49e7960f1..7a3fda5eac1 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -632,16 +632,14 @@ show_entry_values_debug (struct ui_file *file, int from_tty, value); } -/* Find DW_TAG_call_site's DW_AT_call_target address. - CALLER_FRAME (for registers) can be NULL if it is not known. This function - always returns valid address or it throws NO_ENTRY_VALUE_ERROR. */ +/* See gdbtypes.h. */ -static CORE_ADDR -call_site_to_target_addr (struct gdbarch *call_site_gdbarch, - struct call_site *call_site, - struct frame_info *caller_frame) +CORE_ADDR +call_site_target::address (struct gdbarch *call_site_gdbarch, + const struct call_site *call_site, + struct frame_info *caller_frame) const { - switch (call_site->target.loc_kind ()) + switch (m_loc_kind) { case call_site_target::DWARF_BLOCK: { @@ -650,7 +648,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch, struct type *caller_core_addr_type; struct gdbarch *caller_arch; - dwarf_block = call_site->target.loc_dwarf_block (); + dwarf_block = m_loc.dwarf_block; if (dwarf_block == NULL) { struct bound_minimal_symbol msym; @@ -695,7 +693,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch, const char *physname; struct bound_minimal_symbol msym; - physname = call_site->target.loc_physname (); + physname = m_loc.physname; /* Handle both the mangled and demangled PHYSNAME. */ msym = lookup_minimal_symbol (physname, NULL, NULL); @@ -720,7 +718,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch, int sect_idx = COMPUNIT_BLOCK_LINE_SECTION (cust); CORE_ADDR delta = per_objfile->objfile->section_offsets[sect_idx]; - return call_site->target.loc_physaddr () + delta; + return m_loc.physaddr + delta; } default: @@ -790,7 +788,7 @@ func_verify_no_selftailcall (struct gdbarch *gdbarch, CORE_ADDR verify_addr) /* CALLER_FRAME with registers is not available for tail-call jumped frames. */ - target_addr = call_site_to_target_addr (gdbarch, call_site, NULL); + target_addr = call_site->address (gdbarch, nullptr); if (target_addr == verify_addr) { @@ -968,7 +966,7 @@ call_site_find_chain_1 (struct gdbarch *gdbarch, CORE_ADDR caller_pc, /* CALLER_FRAME with registers is not available for tail-call jumped frames. */ - target_func_addr = call_site_to_target_addr (gdbarch, call_site, NULL); + target_func_addr = call_site->address (gdbarch, nullptr); if (target_func_addr == callee_pc) { @@ -1159,7 +1157,7 @@ dwarf_expr_reg_to_entry_parameter (struct frame_info *frame, caller_pc = get_frame_pc (caller_frame); call_site = call_site_for_pc (gdbarch, caller_pc); - target_addr = call_site_to_target_addr (gdbarch, call_site, caller_frame); + target_addr = call_site->address (gdbarch, caller_frame); if (target_addr != func_addr) { struct minimal_symbol *target_msym, *func_msym; diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 48d1658613f..d2b5483c893 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1821,47 +1821,35 @@ struct call_site_target DWARF_BLOCK, }; - kind loc_kind () const - { - return m_loc_kind; - } - - CORE_ADDR loc_physaddr () const - { - gdb_assert (m_loc_kind == PHYSADDR); - return m_loc.physaddr; - } - void set_loc_physaddr (CORE_ADDR physaddr) { m_loc_kind = PHYSADDR; m_loc.physaddr = physaddr; } - const char *loc_physname () const - { - gdb_assert (m_loc_kind == PHYSNAME); - return m_loc.physname; - } - void set_loc_physname (const char *physname) { m_loc_kind = PHYSNAME; m_loc.physname = physname; } - dwarf2_locexpr_baton *loc_dwarf_block () const - { - gdb_assert (m_loc_kind == DWARF_BLOCK); - return m_loc.dwarf_block; - } - void set_loc_dwarf_block (dwarf2_locexpr_baton *dwarf_block) { m_loc_kind = DWARF_BLOCK; m_loc.dwarf_block = dwarf_block; } + /* Find DW_TAG_call_site's DW_AT_call_target address. CALLER_FRAME + (for registers) can be NULL if it is not known. This function + always returns valid address or it throws + NO_ENTRY_VALUE_ERROR. */ + + CORE_ADDR address (struct gdbarch *call_site_gdbarch, + const struct call_site *call_site, + struct frame_info *caller_frame) const; + +private: + union { /* Address. */ @@ -1953,6 +1941,16 @@ struct call_site CORE_ADDR pc () const; + /* Find the target address. CALLER_FRAME (for registers) can be + NULL if it is not known. This function always returns valid + address or it throws NO_ENTRY_VALUE_ERROR. */ + + CORE_ADDR address (struct gdbarch *call_site_gdbarch, + struct frame_info *caller_frame) const + { + return target.address (call_site_gdbarch, this, caller_frame); + } + /* * List successor with head in FUNC_TYPE.TAIL_CALL_LIST. */ struct call_site *tail_call_next = nullptr; -- 2.31.1