From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 886363858D20 for ; Tue, 20 Feb 2024 12:21:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 886363858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 886363858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708431696; cv=none; b=N+PyGCSwUuzlsOkoC2GxeqNi+Ij937y9ZeAkv7gIBT4jFMdiBc9LiM4ieeXvG705iLsaxaudKTIUbRzwDYWiBNedD4KYuXTyAFY9+3OT+8pEfgwRkF0pbCf9hIN7byofZhiWMel/38pW40mVlRdd55o2yk0oznrV0Yzwcm7zbn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708431696; c=relaxed/simple; bh=qwBiIlKn8OKJ3LUsfl1Sqf0XiBixkfs58BVZ/24rgQQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=BdBJd3qDnhPjbN/daARMVePm5MEuCbPZ2HUNq4t2ZWs9TMs9711v8DHY4LxKDR3YZ3/Wcy+0lnpwPVQpk9BURhGdzwuRRkBWC5scJaQcMwdxUe3/JWePP2gRqR6MaBYKokIro6xFIE6He5RjCJKLIvnTpXURXMRyoNQ6kYOZt8U= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708431694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=awtlmun6cspOfiGlTM9c9wczu2n+7qZm/8AU91OdRj0=; b=ZG/wstaFZMRKt6NxBtBar/Y5AgVbcysBRihl9S/7yNaBy8TyAw9So7w/z0uDmErUb/3uDO QcfF+2+hbmKYHjahaqF+N5kLX0y8tHlnaW8NbYzlnqvjzd5cPtc/VHAWSgXSIyrPwwwQuZ jA5AjE43ZBdlGh3FF36Eg4FpIpD1q3I= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-JoV9gouiP3GTuMlLRmLUyA-1; Tue, 20 Feb 2024 07:21:32 -0500 X-MC-Unique: JoV9gouiP3GTuMlLRmLUyA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-410e83001cbso29589415e9.3 for ; Tue, 20 Feb 2024 04:21:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708431691; x=1709036491; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=awtlmun6cspOfiGlTM9c9wczu2n+7qZm/8AU91OdRj0=; b=Oo+qf2rJjlq2cecCF0OhV6TAyZ41lhsqQ6ay6FdFAjMdlnBofFNOnb9kBYMFanzap9 HAeUjOWcEhuUjBmIj03e08p3EMoUEhvRIq2KKUzVAjwk/Yipkh59mIpSCtfk31+LZ2lE /TYBviFVPnQFWbxxOQiudFoYDJtMQKGpKaW1VZWVT60wj+0+2Z/BksG1fuqO8giGDpL7 Nl+WoX2vrvhmHnuUe8Ga70QoXbuAljPlCAy31/sch8Ng153HO4t3igUM8S3exdPQhoHD lhZtx+u8hKUomK5soqkkX1J353jldjek64sEYdb/cx0khawKMyBIZrgPaVabr+djqUUo MqCg== X-Forwarded-Encrypted: i=1; AJvYcCXWCx8qxSJq2DVly5JtvVCnTEZl3KD/SoAT5cwncZhFS795hE8WNsnGLQNN0FDx8nv7OpCIfPxrdDGMkg9s9zF6eRx0UiJDReeKgA== X-Gm-Message-State: AOJu0YxKFCzEa3n9VR/yWYil2Xp9fIjeIVv3DVnBnctT+/hJygj2hcVK b9YarJ1lWfCa1iL2gVS7pEnqczdRL1pCIQptG7A/fWFk4vhRQz3QcKy8mxQBA6BUJtsum3rgyAw iOvdS6CmrD/qvGEspq3LHMewKIV+USlTj5hTuG8GrxuOT0Dv4naLxFUakvaHVb78mMTI= X-Received: by 2002:a05:600c:511f:b0:410:55a:5458 with SMTP id o31-20020a05600c511f00b00410055a5458mr11273565wms.31.1708431691246; Tue, 20 Feb 2024 04:21:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBNBAoQEjI2D5YXfPIFaRd4Gtvi5ctw3jmTQtrJNdgt+40T5vRBrldp2VRT4vLIHjOeFlgiw== X-Received: by 2002:a05:600c:511f:b0:410:55a:5458 with SMTP id o31-20020a05600c511f00b00410055a5458mr11273550wms.31.1708431690925; Tue, 20 Feb 2024 04:21:30 -0800 (PST) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id m6-20020a5d56c6000000b0033d56aa4f45sm4967166wrw.112.2024.02.20.04.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 04:21:30 -0800 (PST) From: Andrew Burgess To: Tom Tromey , gdb-patches@sourceware.org Cc: Tom Tromey Subject: Re: [PATCH] Add obj_section::contains method In-Reply-To: <20240216041211.447526-1-tom@tromey.com> References: <20240216041211.447526-1-tom@tromey.com> Date: Tue, 20 Feb 2024 12:21:29 +0000 Message-ID: <8734tn5nsm.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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 List-Id: Tom Tromey writes: > I noticed a number of spots checking whether an address is in an > obj_section. This patch introduces a new method for this and changes > some code to use it. LGTM. Approved-By: Andrew Burgess Thanks, Andrew > > Regression tested on x86-64 Fedora 38. > --- > gdb/minsyms.c | 2 +- > gdb/objfiles.c | 2 +- > gdb/objfiles.h | 6 ++++++ > gdb/printcmd.c | 2 +- > gdb/symfile.c | 3 +-- > 5 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/gdb/minsyms.c b/gdb/minsyms.c > index 1b85424586f..543003f3bb9 100644 > --- a/gdb/minsyms.c > +++ b/gdb/minsyms.c > @@ -716,7 +716,7 @@ frob_address (struct objfile *objfile, CORE_ADDR pc, > { > for (obj_section *iter : objfile->sections ()) > { > - if (pc >= iter->addr () && pc < iter->endaddr ()) > + if (iter->contains (pc)) > { > *unrel_addr = unrelocated_addr (pc - iter->offset ()); > return 1; > diff --git a/gdb/objfiles.c b/gdb/objfiles.c > index bcaae42a30f..d880b9304d2 100644 > --- a/gdb/objfiles.c > +++ b/gdb/objfiles.c > @@ -1213,7 +1213,7 @@ is_addr_in_objfile (CORE_ADDR addr, const struct objfile *objfile) > if (section_is_overlay (osect) && !section_is_mapped (osect)) > continue; > > - if (osect->addr () <= addr && addr < osect->endaddr ()) > + if (osect->contains (addr)) > return true; > } > return false; > diff --git a/gdb/objfiles.h b/gdb/objfiles.h > index 98e2355f7a9..13cc78e17e3 100644 > --- a/gdb/objfiles.h > +++ b/gdb/objfiles.h > @@ -394,6 +394,12 @@ struct obj_section > return this->addr () + bfd_section_size (this->the_bfd_section); > } > > + /* True if ADDR is in this obj_section, false otherwise. */ > + bool contains (CORE_ADDR addr) const > + { > + return addr >= this->addr () && addr < endaddr (); > + } > + > /* BFD section pointer */ > struct bfd_section *the_bfd_section; > > diff --git a/gdb/printcmd.c b/gdb/printcmd.c > index 7f47f489a94..679323c61cb 100644 > --- a/gdb/printcmd.c > +++ b/gdb/printcmd.c > @@ -1499,7 +1499,7 @@ info_symbol_command (const char *arg, int from_tty) > > sect_addr = overlay_mapped_address (addr, osect); > > - if (osect->addr () <= sect_addr && sect_addr < osect->endaddr () > + if (osect->contains (sect_addr) > && (msymbol > = lookup_minimal_symbol_by_pc_section (sect_addr, > osect).minsym)) > diff --git a/gdb/symfile.c b/gdb/symfile.c > index 9d5ce7f6ad2..db6d76e78bf 100644 > --- a/gdb/symfile.c > +++ b/gdb/symfile.c > @@ -3085,8 +3085,7 @@ pc_in_mapped_range (CORE_ADDR pc, struct obj_section *section) > { > if (section_is_overlay (section)) > { > - if (section->addr () <= pc > - && pc < section->endaddr ()) > + if (section->contains (pc)) > return true; > } > > -- > 2.43.0