From patchwork Mon May 30 08:32:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1636822 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=V12p/HGA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LBTLq6BwDz9s07 for ; Mon, 30 May 2022 18:37:55 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D7F7F3815FEE for ; Mon, 30 May 2022 08:37:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D7F7F3815FEE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1653899873; bh=PkXHbBuZy5kYTalw3D+H6UxQZUHWWnnhMInnsfGagY0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=V12p/HGA6adedAqDI9J4HKBQPAvz7bm0rv5Z/tGV3mwiJNRe9cxW/fdrMkUzPWpP9 gRxfbJI719yj5snihS5yf2iMMUntxWHaqlxR5fMBY9BWdDicWNDery4oijm5CmULA/ 2rM0TX6JZcyBhm4Q3rV+joVyr7W9hrpYCP4KwsTI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id 2C11C3829BDD for ; Mon, 30 May 2022 08:32:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2C11C3829BDD Received: by mail-wr1-x432.google.com with SMTP id h5so5519325wrb.0 for ; Mon, 30 May 2022 01:32:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=PkXHbBuZy5kYTalw3D+H6UxQZUHWWnnhMInnsfGagY0=; b=Y8eTOjwdi4Cn9/Qh83zOGVVWuI7+btHBurO0cTYefPH04wMnopw+g/uY/FrmGFTTct IP1vaEjh6fjMRa3G/nGA2jiKTCvGGrCb66w4DdAwapxSnM7rFYNbf3s2lde5vLoMJS6t A/79ar+assmoLMrWFcl99XW/GlNWl8adnR0IFCO5H7TTTa/AF7ZZuT7zmlNV9UyIHIbs jQ+CzfDpois1+sU8F1i+0vnfXVP0i5QH/2kLzTEIVZk0GvqyN/1NE0Z8Xn0d5mPx6G0b QP7XuvzMCawxEdL+ar9+r0WOuAlGyCVt5Os3C+pafud/UwHSWWV6Hyod+ue0YnXisjaI /NXw== X-Gm-Message-State: AOAM531hSyLvMHl1Bo7sTk4qqug5JuTrtwXiiYfVq7cJH7QQiWcDouxT 5HVNYt4D8FJVc0zUznRs0IJtl4JEqQIrWQ== X-Google-Smtp-Source: ABdhPJyyRdIBySBDmG8sfTj0aL5/q1hof8GOMRwF59W2MrR1P0zc8JL5nSauzttRrd5MxlziuxZJhg== X-Received: by 2002:adf:d18a:0:b0:210:414:ec4 with SMTP id v10-20020adfd18a000000b0021004140ec4mr8382577wrc.250.1653899558893; Mon, 30 May 2022 01:32:38 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id e14-20020a5d6d0e000000b0020fee88d0f2sm12050211wrq.0.2022.05.30.01.32.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 01:32:38 -0700 (PDT) Date: Mon, 30 May 2022 08:32:38 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Adapt proof of runtime unit s-arit32 Message-ID: <20220530083238.GA210633@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Yannick Moy Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" After changes in GNATprove, adapt proof. Simply move an assertion up before it is first needed here. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/s-arit32.adb (Scaled_Divide32): Move assertion up. diff --git a/gcc/ada/libgnat/s-arit32.adb b/gcc/ada/libgnat/s-arit32.adb --- a/gcc/ada/libgnat/s-arit32.adb +++ b/gcc/ada/libgnat/s-arit32.adb @@ -474,6 +474,7 @@ is D := Uns64 (Xu) * Uns64 (Yu); + Lemma_Abs_Mult_Commutation (Big (X), Big (Y)); pragma Assert (Mult = Big (D)); Lemma_Hi_Lo (D, Hi (D), Lo (D)); pragma Assert (Mult = Big_2xx32 * Big (Hi (D)) + Big (Lo (D))); @@ -508,7 +509,6 @@ is Lemma_Abs_Div_Commutation (Big (X) * Big (Y), Big (Z)); Lemma_Abs_Rem_Commutation (Big (X) * Big (Y), Big (Z)); - Lemma_Abs_Mult_Commutation (Big (X), Big (Y)); Lemma_Abs_Commutation (X); Lemma_Abs_Commutation (Y); Lemma_Abs_Commutation (Z);