From patchwork Tue May 23 08:08:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 97888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1980867vqo; Tue, 23 May 2023 01:28:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4/5EOs9FSnrm2+tRjv1GUYM9Et7TIoFa3cpHCBQPoO780+nwnnr75Qyi/diUIiShKPXsRa X-Received: by 2002:a05:6402:b29:b0:504:8929:71ca with SMTP id bo9-20020a0564020b2900b00504892971camr9826585edb.6.1684830522925; Tue, 23 May 2023 01:28:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684830522; cv=none; d=google.com; s=arc-20160816; b=JrayZt2KVz7D4TYyq5FqZCVK/Y03tgyyJyOV2hdOGIs6IfF5BettDCQFWsYZSrxFwd KLeY/eoFECnz6rw9tRXPo9IlUSPSb4Et1bIVBepzqx+aQndfQXKumtZNDvC9+N3zI3Zq PTSnPLctpXBTJwX+DFA0xD33NJTgm6C5fp9A1QHHI7WiScyDHP47vSUinTjYuZGuXcRX fEXCFkufdfY0ii522H5ViBTW+zIafbfo91RY36cH7jMxtrN3zBzEH6mj3eN8GpXpwosP qUFtXFBbsXyHCykJiyy1c/Gd2trXZWjOBvXyt/hdZW82MP15HwabrBmqO6F2EjFnIzWy siEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=4UQV26wWGwYeld/pNh02xBZkbDT/36AT6lYVe0HypCc=; b=pSByKLvDCuO0nS19fgTmDzhY3cVjRIZtZM+a7GCamAZHjXSTyFA5H1o1jVzQRzJBFE lf7bA+fCR+fkhnIpjXDgQeAG8ugQX2X+U+yBUfP+eduJYWwVbZMh04VL7AwKM+DCvnET 2eEbHaoRl1U2i9jYqjJI9rXsbInOg2UsL8Bz4U9hLgAoSInvNGdOKr2IzkIgVOkb35cY 7Uot0JtQtignkoDkYoUo6CX91TzyI/4e56cjhOqlvfJl96uZsKhAlAirynaElTQwsNCF avnqB64ojrtGX5vPRu/uVkazsYueEawI8mnq0rB+t2M3zI8MwYtHCNAwiPcgkskmHFq9 pgJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ByQLl8GS; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id f1-20020a50ee81000000b00510e82ce84bsi5419093edr.229.2023.05.23.01.28.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:28:42 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ByQLl8GS; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7AE183AAA045 for ; Tue, 23 May 2023 08:18:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7AE183AAA045 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684829880; bh=4UQV26wWGwYeld/pNh02xBZkbDT/36AT6lYVe0HypCc=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ByQLl8GSkGaBvzFbYghUdH61kYqwxVauSPeiKAsoJC+8TteWL9gIIBHLJ9ucxk6i/ VgrMgqQalpr2jaZrFDs1MooEUwRzZ3I6A6ojjTcGuFbJbH+uPXhTwCo1e9rDJjSuXE 48ePDsYqNEpmGFcQhQ9MHurLIdy2NOgT1a2xjFWE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id E65A93854143 for ; Tue, 23 May 2023 08:09:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E65A93854143 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f607766059so15659235e9.3 for ; Tue, 23 May 2023 01:09:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684829340; x=1687421340; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4UQV26wWGwYeld/pNh02xBZkbDT/36AT6lYVe0HypCc=; b=ZueA0f65nhqSvxkIEYaKtghBn+ezFgS7i9nWJVxgKrPR8sZ02MclVvEHKzq+CrS5MQ x+ccoJHw/bw+6Vjoa0iQFaRFZN8tspjQokT49qb6YTAo14bARmLB5khnsXiY1rx6l/0M rajLiWI9jkyyTw6tF/gCEpLvMbIyNx9KDBAYLKd36Qhmor2eCVAtYNvg7eOEj9OxVAD4 GotuVym/EiJ6O3868NCCktCLkvR7Fwzbh97bdbmJk6SJvDPsqRCi4qNBrm9OV2xMO4pK fQEryPezkbN622u9UCfmLoWqxFASTX+ZSq6Kvy/CtNNIaz1qdpEYRjoOh99+Xn8EsaWH pkDQ== X-Gm-Message-State: AC+VfDyRAw3QqjDNsbbW//hTW5mxzt8D/zSlqfRjzMLrW4ccAD0gKZOv LAsGeaojbhCAdfvwx/2lOtYet64PY8cG3ebCF2KFNw== X-Received: by 2002:a05:600c:2058:b0:3f6:40d:136a with SMTP id p24-20020a05600c205800b003f6040d136amr4012338wmg.41.1684829340306; Tue, 23 May 2023 01:09:00 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id 8-20020a05600c22c800b003f4289b18a7sm10899768wmg.5.2023.05.23.01.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:08:59 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED] ada: Fix minor address arithmetic issues in System.Dwarf_Lines Date: Tue, 23 May 2023 10:08:58 +0200 Message-Id: <20230523080858.1874416-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766672850435035114?= X-GMAIL-MSGID: =?utf-8?q?1766672850435035114?= From: Eric Botcazou Offset calculations should use the operator of System.Storage_Elements. gcc/ada/ * libgnat/s-dwalin.adb (Enable_Cache): Use the subtract operator of System.Storage_Elements to compute the offset. (Symbolic_Address): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/libgnat/s-dwalin.adb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/ada/libgnat/s-dwalin.adb b/gcc/ada/libgnat/s-dwalin.adb index d38bc058e3b..d35d03a8a2f 100644 --- a/gcc/ada/libgnat/s-dwalin.adb +++ b/gcc/ada/libgnat/s-dwalin.adb @@ -1542,7 +1542,7 @@ package body System.Dwarf_Lines is exit when Ar_Start = Null_Address and Ar_Len = 0; Len := uint32 (Ar_Len); - Start := uint32 (Address'(Ar_Start - C.Low)); + Start := uint32 (Storage_Count'(Ar_Start - C.Low)); -- Search START in the array @@ -1762,7 +1762,7 @@ package body System.Dwarf_Lines is if C.Cache /= null then declare - Addr_Off : constant uint32 := uint32 (Address'(Addr - C.Low)); + Off : constant uint32 := uint32 (Storage_Count'(Addr - C.Low)); First, Last, Mid : Natural; begin @@ -1772,17 +1772,17 @@ package body System.Dwarf_Lines is while First <= Last loop Mid := First + (Last - First) / 2; - if Addr_Off < C.Cache (Mid).First then + if Off < C.Cache (Mid).First then Last := Mid - 1; - elsif Addr_Off >= C.Cache (Mid).First + C.Cache (Mid).Size then + elsif Off >= C.Cache (Mid).First + C.Cache (Mid).Size then First := Mid + 1; else exit; end if; end loop; - if Addr_Off >= C.Cache (Mid).First - and then Addr_Off < C.Cache (Mid).First + C.Cache (Mid).Size + if Off >= C.Cache (Mid).First + and then Off < C.Cache (Mid).First + C.Cache (Mid).Size then Line_Offset := Offset (C.Cache (Mid).Line); S := Read_Symbol (C.Obj.all, Offset (C.Cache (Mid).Sym));