From patchwork Fri Jul 2 14:51:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 1500165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: 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=KN+Rd8lM; dkim-atps=neutral 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 (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GGdN80V5Fz9sS8 for ; Sat, 3 Jul 2021 00:52:22 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B52CC3983024 for ; Fri, 2 Jul 2021 14:52:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B52CC3983024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1625237539; bh=PV6qGjoAR/Fx0uBoAWu3Liy2O8ZLP9vMRxQIubBYOD8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=KN+Rd8lML7IVNnzRuPxS0D4MVLagkcD7JCbfsQtBE+66PX+cNlgfwDk/E8te4lnXu aTjhws7jFogW8ytw6RR2u0OU2wpRCdnVSBzyb853YWand+rTbZ0qGLLLoTgoUvw4EA LOLTA69RQ6TBqi/YKfIJZok+SOCYXBXZbuyiwsiE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id 2ABD03983007 for ; Fri, 2 Jul 2021 14:51:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2ABD03983007 Received: by mail-pg1-x52b.google.com with SMTP id f5so448680pgv.3 for ; Fri, 02 Jul 2021 07:51:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=PV6qGjoAR/Fx0uBoAWu3Liy2O8ZLP9vMRxQIubBYOD8=; b=nmcG00WFaVh5wZi6tQ9DDtYdoxK90+TsENdSe4yC9WWg4lRKFOSdKjp8L8QIq8XyfU 9VfV0LNRsYFVjZTfVb/1ofT+S/DzxHg/VE1Nk+WnBcQilDnUyBmS1D+brkH4zQcAgMVW 9rqji7u7zgVu8MoSXsJsF3772nfETPH5vhiayqEm/EP7UYgQRAkXd2CcSq9MtkY2cvEU AgqA+8wVEuYwHt/R2oBlo4ZeI9GqWNkefnxw5A064+niwtJawxh2kygmsP8BxCBlCCqN 1MASicMLEMwYWi8c2/s2aOkSyr+/J0Ng0U0OZp3bwzUHIGc5sWQiyYn6lk+SLiun4m+6 fMYg== X-Gm-Message-State: AOAM530bKzqCl0yvGBN0Q+hPVHg2wiQoNN7LzyXJ2S45BqCkCQ9FDSu4 F6p2GyAmbmtUPkIrSquhE16d6nhtqrEnYg== X-Google-Smtp-Source: ABdhPJxAE3TKSt3LFZbG8KWvYNWSlK90p64x/2zvChRk6IVC+fipxwpM45QITDmX9FWK5CiiI3vDwA== X-Received: by 2002:a05:6a00:1a54:b029:30f:bc94:6d5c with SMTP id h20-20020a056a001a54b029030fbc946d5cmr5816082pfv.56.1625237495037; Fri, 02 Jul 2021 07:51:35 -0700 (PDT) Received: from [192.168.1.35] (c-98-202-48-222.hsd1.ut.comcast.net. [98.202.48.222]) by smtp.gmail.com with ESMTPSA id r15sm94677pje.12.2021.07.02.07.51.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Jul 2021 07:51:34 -0700 (PDT) To: GCC Patches Subject: [committed] Fix m32r target specific fallout from recent int->bool changes Message-ID: <0a4a5912-4ec9-a03b-0ffd-7d9a38f33e9b@gmail.com> Date: Fri, 2 Jul 2021 08:51:32 -0600 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-8.3 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: Jeff Law via Gcc-patches From: Jeff Law Reply-To: Jeff Law Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" And finally, the same for m32r.  Committed to the trunk, Jeff commit f6aa1c34e4a89c8c93518c49a108f3c43b78ea47 Author: Jeff Law Date: Fri Jul 2 10:48:26 2021 -0400 Fix m32r target specific fallout from recent int->bool changes gcc/ChangeLog * config/m32r/m32r-protos.h (call_operand): Adjust return type. (small_data_operand, memreg_operand, small_insn_p): Likewise. * config/m32r/m32r.c (call_operand): Adjust return type. (small_data_operand, memreg_operand): Likewise. diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h index 23313fb9b28..82b2c701be0 100644 --- a/gcc/config/m32r/m32r-protos.h +++ b/gcc/config/m32r/m32r-protos.h @@ -49,13 +49,13 @@ extern rtx m32r_return_addr (int); extern rtx m32r_function_symbol (const char *); #ifdef HAVE_MACHINE_MODES -extern int call_operand (rtx, machine_mode); -extern int small_data_operand (rtx, machine_mode); +extern bool call_operand (rtx, machine_mode); +extern bool small_data_operand (rtx, machine_mode); extern int addr24_operand (rtx, machine_mode); extern int addr32_operand (rtx, machine_mode); extern int call26_operand (rtx, machine_mode); -extern int memreg_operand (rtx, machine_mode); -extern int small_insn_p (rtx, machine_mode); +extern bool memreg_operand (rtx, machine_mode); +extern bool small_insn_p (rtx, machine_mode); #endif /* HAVE_MACHINE_MODES */ diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index 3444ed49eee..1aaba94bb5c 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -532,7 +532,7 @@ m32r_init_expanders (void) to make it easy to experiment. */ } -int +bool call_operand (rtx op, machine_mode mode) { if (!MEM_P (op)) @@ -543,7 +543,7 @@ call_operand (rtx op, machine_mode mode) /* Return 1 if OP is a reference to an object in .sdata/.sbss. */ -int +bool small_data_operand (rtx op, machine_mode mode ATTRIBUTE_UNUSED) { if (! TARGET_SDATA_USE) @@ -674,7 +674,7 @@ easy_df_const (rtx op) /* Return 1 if OP is (mem (reg ...)). This is used in insn length calcs. */ -int +bool memreg_operand (rtx op, machine_mode mode ATTRIBUTE_UNUSED) { return MEM_P (op) && REG_P (XEXP (op, 0));