From patchwork Thu Sep 16 17:08:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 45094 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A8CB23857407 for ; Thu, 16 Sep 2021 17:09:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A8CB23857407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1631812162; bh=CrEFduCWB8UKrRDdxskmuqdKWjdJSxKau39cavk8fIA=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=gBjo69+tGLMIrZFSAuXDxMs/aXW7qHSbZ3ZWR0iYtfScB5iJOFh+O0vmZBbgguR9E wnH/jEPjj63U+JnwCL/Ny3dx/mJoeIAu2sWENcT0H0Eme55+xUjTYui8i5TFeJuKpT Jqun87My69HPzWgbAvY1lpYfr7PPOcANsT4mvwsA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) by sourceware.org (Postfix) with ESMTPS id F2FEA3858D3C for ; Thu, 16 Sep 2021 17:08:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org F2FEA3858D3C Received: by mail-qt1-x831.google.com with SMTP id g11so6203773qtk.5 for ; Thu, 16 Sep 2021 10:08:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=CrEFduCWB8UKrRDdxskmuqdKWjdJSxKau39cavk8fIA=; b=gpPzk1HlbGP8Tq5ObhKxfoFT/CNRviR2SOZtwmWkTD7vlgoOGbVeGEWaLjx4eMQ0pN In6kHQHBZUluSIc/yT4I3+GFRxo7LWulz4Cm89ISutr2nL010FveorG8CGXuGZKIAkxm S163xfIj0Fa0hHMaP7wExoOk5n8DywIywb1w9oSbBytfqYQ4NnRP/zvyZBzDYUfq9DD6 WxxGf2tkgd0m+S8pUQ2iagbJfmJUr8/rzcprQBGOd0UlhkgVXvesqgnGvQoSDNTAbRYX Euu24XHD5TG4ykezAdH5UUe7tGQOQuILoaWLqts0OHAwB2kZR9x8BFwM+BhqzMTn/mWU W6DQ== X-Gm-Message-State: AOAM533eq3oVwN8C7YU7PzXYzs3tPqnmhW6i9YCaff0zAMLuRTmgLh1o 2h/F2ZBRWnr0ZkzXVkLU8fUdqDfsx7GepIH33m4BJiJpPy4mOw== X-Google-Smtp-Source: ABdhPJzkqMJVDLYrusFyQeWwiHIGT7CIfBYDI+sQdU2Pdzy81q9uSDYT+n0thLDR5pv/6q8H2IVKKYTMv7eJ1a16aSs= X-Received: by 2002:ac8:7f52:: with SMTP id g18mr5939712qtk.169.1631812132401; Thu, 16 Sep 2021 10:08:52 -0700 (PDT) MIME-Version: 1.0 Date: Thu, 16 Sep 2021 19:08:41 +0200 Message-ID: Subject: [PATCH] [i386] Change ix86_decompose_address return type to bool. To: "gcc-patches@gcc.gnu.org" X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, 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: 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: Uros Bizjak via Gcc-patches From: Uros Bizjak Reply-To: Uros Bizjak Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" After a recent change only a boolean value is returned. 2021-09-16 Uroš Bizjak gcc/ * config/i386/i386-protos.h (ix86_decompose_address): Change return type to bool. * config/i386/i386.c (ix86_decompose_address): Ditto. Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}. Pushed to master. Uros. diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h index dcae34b915e..708834ae832 100644 --- a/gcc/config/i386/i386-protos.h +++ b/gcc/config/i386/i386-protos.h @@ -320,7 +320,7 @@ struct ix86_address addr_space_t seg; }; -extern int ix86_decompose_address (rtx, struct ix86_address *); +extern bool ix86_decompose_address (rtx, struct ix86_address *); extern int memory_address_length (rtx, bool); extern void x86_output_aligned_bss (FILE *, tree, const char *, unsigned HOST_WIDE_INT, unsigned); diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index d7abff0f396..337ea291780 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -10101,10 +10101,10 @@ ix86_live_on_entry (bitmap regs) } /* Extract the parts of an RTL expression that is a valid memory address - for an instruction. Return 0 if the structure of the address is + for an instruction. Return false if the structure of the address is grossly off. */ -int +bool ix86_decompose_address (rtx addr, struct ix86_address *out) { rtx base = NULL_RTX, index = NULL_RTX, disp = NULL_RTX; @@ -10123,17 +10123,17 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) { addr = XEXP (addr, 0); if (CONST_INT_P (addr)) - return 0; + return false; } else if (GET_CODE (addr) == AND && const_32bit_mask (XEXP (addr, 1), DImode)) { addr = lowpart_subreg (SImode, XEXP (addr, 0), DImode); if (addr == NULL_RTX) - return 0; + return false; if (CONST_INT_P (addr)) - return 0; + return false; } else if (GET_CODE (addr) == AND) { @@ -10167,7 +10167,7 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) { addr = SUBREG_REG (addr); if (CONST_INT_P (addr)) - return 0; + return false; } } @@ -10178,7 +10178,7 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) if (REG_P (SUBREG_REG (addr))) base = addr; else - return 0; + return false; } else if (GET_CODE (addr) == PLUS) { @@ -10189,13 +10189,13 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) do { if (n >= 4) - return 0; + return false; addends[n++] = XEXP (op, 1); op = XEXP (op, 0); } while (GET_CODE (op) == PLUS); if (n >= 4) - return 0; + return false; addends[n] = op; for (i = n; i >= 0; --i) @@ -10205,28 +10205,28 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) { case MULT: if (index) - return 0; + return false; index = XEXP (op, 0); scale_rtx = XEXP (op, 1); break; case ASHIFT: if (index) - return 0; + return false; index = XEXP (op, 0); tmp = XEXP (op, 1); if (!CONST_INT_P (tmp)) - return 0; + return false; scale = INTVAL (tmp); if ((unsigned HOST_WIDE_INT) scale > 3) - return 0; + return false; scale = 1 << scale; break; case ZERO_EXTEND: op = XEXP (op, 0); if (GET_CODE (op) != UNSPEC) - return 0; + return false; /* FALLTHRU */ case UNSPEC: @@ -10235,12 +10235,12 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) && seg == ADDR_SPACE_GENERIC) seg = DEFAULT_TLS_SEG_REG; else - return 0; + return false; break; case SUBREG: if (!REG_P (SUBREG_REG (op))) - return 0; + return false; /* FALLTHRU */ case REG: @@ -10249,7 +10249,7 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) else if (!index) index = op; else - return 0; + return false; break; case CONST: @@ -10257,12 +10257,12 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) case SYMBOL_REF: case LABEL_REF: if (disp) - return 0; + return false; disp = op; break; default: - return 0; + return false; } } } @@ -10277,10 +10277,10 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) index = XEXP (addr, 0); tmp = XEXP (addr, 1); if (!CONST_INT_P (tmp)) - return 0; + return false; scale = INTVAL (tmp); if ((unsigned HOST_WIDE_INT) scale > 3) - return 0; + return false; scale = 1 << scale; } else @@ -10294,14 +10294,14 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) && REG_P (SUBREG_REG (index))) ; else - return 0; + return false; } /* Extract the integral value of scale. */ if (scale_rtx) { if (!CONST_INT_P (scale_rtx)) - return 0; + return false; scale = INTVAL (scale_rtx); } @@ -10354,7 +10354,7 @@ ix86_decompose_address (rtx addr, struct ix86_address *out) out->scale = scale; out->seg = seg; - return 1; + return true; } /* Return cost of the memory address x.