From patchwork Sun Oct 27 14:43:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 286340 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E0EAE2C00A9 for ; Mon, 28 Oct 2013 01:43:29 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; q=dns; s=default; b=tvRpcE8rIHP8a6GD 52C4n8HrlBXGI9+lzCpnWW3c4VAClLnEufkfWglK/dC4v8KTY8atoF8yiqsSfz69 GrAv1DFkDMYeiBrQ6kKzs41veHu81P80/XJDoPR6yuJ4PzcbDsQtL/xZG37ATSIO 1iWDomxqlNaAwZkLHwmw3MGf0qc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :message-id:from:to:subject:mime-version:content-type :content-transfer-encoding; s=default; bh=nW215ODS58bFaOItgQT4jx 3KHMA=; b=bNn/Sf3BKBelmCAedKs81v4TVo6f0e3I0oxRJqk7WJDL4TmzDz6EDg heHtlMRm709no5iuWhkdrAYFq00pBDnXOS+9aRKbXzJ2+g3FsmPGVu8VrzIZvhfP 59c+3d/gGM0rvmh0KyBDdMnCpRmiDkwfo7/cNb8Fw68tS1Kl5OvZo= Received: (qmail 22980 invoked by alias); 27 Oct 2013 14:43:23 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 22967 invoked by uid 89); 27 Oct 2013 14:43:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: ra.se.axis.com Received: from ra.se.axis.com (HELO ra.se.axis.com) (195.60.68.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 27 Oct 2013 14:43:21 +0000 Received: from localhost (localhost [127.0.0.1]) by ra.se.axis.com (Postfix) with ESMTP id 59EBA384F3A for ; Sun, 27 Oct 2013 15:43:18 +0100 (CET) Received: from ra.se.axis.com ([127.0.0.1]) by localhost (ra.se.axis.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 2rnuo-zRL2Nq for ; Sun, 27 Oct 2013 15:43:17 +0100 (CET) Received: from boulder.se.axis.com (boulder.se.axis.com [10.0.2.104]) by ra.se.axis.com (Postfix) with ESMTP id 840D4384EB5 for ; Sun, 27 Oct 2013 15:43:17 +0100 (CET) Received: from boulder.se.axis.com (localhost [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id 6CF74719 for ; Sun, 27 Oct 2013 15:43:17 +0100 (CET) Received: from seth.se.axis.com (seth.se.axis.com [10.0.2.172]) by boulder.se.axis.com (Postfix) with ESMTP id 612654DF for ; Sun, 27 Oct 2013 15:43:17 +0100 (CET) Received: from ignucius.se.axis.com (ignucius.se.axis.com [10.88.21.50]) by seth.se.axis.com (Postfix) with ESMTP id 5D5093E06F; Sun, 27 Oct 2013 15:43:17 +0100 (CET) Received: from ignucius.se.axis.com (localhost [127.0.0.1]) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) with ESMTP id r9REhGY2028858; Sun, 27 Oct 2013 15:43:17 +0100 Received: (from hp@localhost) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) id r9REhGUH028854; Sun, 27 Oct 2013 15:43:16 +0100 Date: Sun, 27 Oct 2013 15:43:16 +0100 Message-Id: <201310271443.r9REhGUH028854@ignucius.se.axis.com> From: Hans-Peter Nilsson To: gcc-patches@gcc.gnu.org Subject: Fix for cris-elf breakage from mudflap removal, take 2 MIME-Version: 1.0 PRED_NORETURN seems a better match; not that I see anything in the current source that actually treats them differently other than generating them, but my grep-fu may be weak and certainly my crystall-ball-fu is. After testing (no regressions compared to r204080 before the breakage), committed. * config/cris/cris.c (cris_emit_trap_for_misalignment): Replace the removed PRED_MUDFLAP with PRED_NORETURN. Correct file-path in comment. brgds, H-P Index: gcc/config/cris/cris.c =================================================================== --- gcc/config/cris/cris.c (revision 204101) +++ gcc/config/cris/cris.c (working copy) @@ -1989,17 +1989,14 @@ cris_emit_trap_for_misalignment (rtx mem /* This will yield a btstq without a separate register used, usually - with the exception for PRE hoisting the "and" but not the branch - around the trap: see gcc.dg/target/cris/sync-3s.c. */ + around the trap: see testsuite/gcc.target/cris/sync-3s.c. */ andop = gen_rtx_AND (Pmode, reg, GEN_INT (natural_alignment - 1)); emit_cmp_and_jump_insns (force_reg (SImode, andop), const0_rtx, EQ, NULL_RTX, Pmode, 1, ok_label); jmp = get_last_insn (); gcc_assert (JUMP_P (jmp)); - /* While this isn't mudflap, it is a similar kind of assertion. - If PRED_MUDFLAP stops working, use something else or introduce a - more suitable assertion predication type. */ - predict_insn_def (jmp, PRED_MUDFLAP, TAKEN); + predict_insn_def (jmp, PRED_NORETURN, TAKEN); expand_builtin_trap (); emit_label (ok_label); }