From patchwork Tue Jul 21 18:26:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jozef Lawrynowicz X-Patchwork-Id: 1333289 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=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mittosystems.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mittosystems.com header.i=@mittosystems.com header.a=rsa-sha256 header.s=google header.b=dPHQP/uf; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4BB6W12S3bz9sPf for ; Wed, 22 Jul 2020 04:26:37 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 258F03840C19; Tue, 21 Jul 2020 18:26:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id D1FCF3870905 for ; Tue, 21 Jul 2020 18:26:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D1FCF3870905 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=mittosystems.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=jozef.l@mittosystems.com Received: by mail-wm1-x336.google.com with SMTP id q15so3769596wmj.2 for ; Tue, 21 Jul 2020 11:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mittosystems.com; s=google; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=Qhta6q/IAxUuq/jCjsgr4R/14ApzJKMsAfDsaCqZ1Wo=; b=dPHQP/ufNON6gJNlq5JmdxC23FWoD5dvEsvSh4F75mPBXfrYK3Qf1/UhYDFli5YgRb HnwBZwbhLz4xdNG6MR0xdQD/OudAVg1mqJtxx9Ot0pBCwlr88wPiHzg7Cg/AFDn+qhMI UGG5bpFLaOrfeh6SZ3BKyr6T4CVFkvvYgWHZlTCEqfw04YmyCJzmGmHHw1WfGsubcGAr VSmoIax7+lnD76D7ajVhUt6p8ShJ9HmM5S0Jk3jIRADRkwxPW6A3JBtUjMmaLYSmPv/j olzEdMyViKedqeUPRjcwlJCOBFCLRkU49uPCuKb0AvsIePu+vbbn4dXglxorIZxm3QO7 rBrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to; bh=Qhta6q/IAxUuq/jCjsgr4R/14ApzJKMsAfDsaCqZ1Wo=; b=ZCAgFP8P0KhmXLvwCS0dGteLJrKJgrHCwjueBgFJ+dYGDBpEXqHX/vo3Hb9rOzYs5Z nCAl5bjq/E/ujuLOQi6ErPzg84BOASFrHUJiN2p2S5gh5pdy79COkfkJaST9r6bhzjYx yZMb4zUZChTtLS9CR3n30MOtc5HGQyITuU/Ms0H/xemVfuOWOpGlI8+aqqTwAnEdGner JvrO+6a2ZrvD1qfQ2QpjzcxDnOfpWPn8iy66+B0jNKD2wPn/1EM9CLUXYnQ2Qm30j/tB MjGvMljpuKGzCI5CZQe2JH7dMetgfIkuTi5XQbbA7uBNIi2rnX78ajL9gB0QcojieFoi ZZQA== X-Gm-Message-State: AOAM530kbiw3wX8lQT3Tw8Tgsj7e0rfIGoAhXoJCISA8DtGUuLoFo9HX dksp8nULJODcsAkHvcJy/iIDw+nkIXY= X-Google-Smtp-Source: ABdhPJw+suh8S8kxZl8FruqzG4hTrQl+OZ7bJ0wJBnES3MeBfYCmJemte2Ev5ODHgil0cK4Cu1W2DA== X-Received: by 2002:a1c:2392:: with SMTP id j140mr5089935wmj.6.1595355974685; Tue, 21 Jul 2020 11:26:14 -0700 (PDT) Received: from jozef-acer-manjaro ([2a01:4b00:87fd:900:5e1d:5c99:56da:76e8]) by smtp.gmail.com with ESMTPSA id t202sm4548721wmt.20.2020.07.21.11.26.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 11:26:14 -0700 (PDT) Date: Tue, 21 Jul 2020 19:26:49 +0100 From: Jozef Lawrynowicz To: gcc-patches@gcc.gnu.org Subject: [PATCH 2/3] expmed: Fix possible use of NULL_RTX return value from emit_store_flag Message-ID: <20200721182649.mrhv4mk2qgigs7tv@jozef-acer-manjaro> Mail-Followup-To: gcc-patches@gcc.gnu.org References: <20200721181715.frr5xycz7wvxxkym@jozef-acer-manjaro> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200721181715.frr5xycz7wvxxkym@jozef-acer-manjaro> X-Spam-Status: No, score=-10.9 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 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" MSP430 does not support have any store-flag instructions, so emit_store_flag can return NULL_RTX. Catch the NULL_RTX in expmed.c:expand_sdiv_pow2. Successfully regtested on trunk for x86_64-pc-linux-gnu and msp430-elf. Ok to apply? From cb0f8219ac90229c0336281d73f511c107c877d3 Mon Sep 17 00:00:00 2001 From: Jozef Lawrynowicz Date: Wed, 15 Jul 2020 11:19:31 +0100 Subject: [PATCH 2/3] expmed: Fix possible use of NULL_RTX return value from emit_store_flag MSP430 does not support have any store-flag instructions, so emit_store_flag can return NULL_RTX. Catch the NULL_RTX in expmed.c:expand_sdiv_pow2. gcc/ChangeLog: * expmed.c (expand_sdiv_pow2): Check return value from emit_store_flag is not NULL_RTX before use. --- gcc/expmed.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/gcc/expmed.c b/gcc/expmed.c index e7c03fbf92c..d3a1735d39e 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -4086,9 +4086,12 @@ expand_sdiv_pow2 (scalar_int_mode mode, rtx op0, HOST_WIDE_INT d) { temp = gen_reg_rtx (mode); temp = emit_store_flag (temp, LT, op0, const0_rtx, mode, 0, 1); - temp = expand_binop (mode, add_optab, temp, op0, NULL_RTX, - 0, OPTAB_LIB_WIDEN); - return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0); + if (temp != NULL_RTX) + { + temp = expand_binop (mode, add_optab, temp, op0, NULL_RTX, + 0, OPTAB_LIB_WIDEN); + return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0); + } } if (HAVE_conditional_move @@ -4122,17 +4125,20 @@ expand_sdiv_pow2 (scalar_int_mode mode, rtx op0, HOST_WIDE_INT d) temp = gen_reg_rtx (mode); temp = emit_store_flag (temp, LT, op0, const0_rtx, mode, 0, -1); - if (GET_MODE_BITSIZE (mode) >= BITS_PER_WORD - || shift_cost (optimize_insn_for_speed_p (), mode, ushift) - > COSTS_N_INSNS (1)) - temp = expand_binop (mode, and_optab, temp, gen_int_mode (d - 1, mode), - NULL_RTX, 0, OPTAB_LIB_WIDEN); - else - temp = expand_shift (RSHIFT_EXPR, mode, temp, - ushift, NULL_RTX, 1); - temp = expand_binop (mode, add_optab, temp, op0, NULL_RTX, - 0, OPTAB_LIB_WIDEN); - return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0); + if (temp != NULL_RTX) + { + if (GET_MODE_BITSIZE (mode) >= BITS_PER_WORD + || shift_cost (optimize_insn_for_speed_p (), mode, ushift) + > COSTS_N_INSNS (1)) + temp = expand_binop (mode, and_optab, temp, gen_int_mode (d - 1, mode), + NULL_RTX, 0, OPTAB_LIB_WIDEN); + else + temp = expand_shift (RSHIFT_EXPR, mode, temp, + ushift, NULL_RTX, 1); + temp = expand_binop (mode, add_optab, temp, op0, NULL_RTX, + 0, OPTAB_LIB_WIDEN); + return expand_shift (RSHIFT_EXPR, mode, temp, logd, NULL_RTX, 0); + } } label = gen_label_rtx ();