From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 60515 invoked by alias); 7 Apr 2017 10:30:41 -0000 Mailing-List: contact cgen-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sourceware.org Received: (qmail 56926 invoked by uid 89); 7 Apr 2017 10:30:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy=jul, Jul, HTo:U*cgen X-HELO: mail-pg0-f44.google.com Received: from mail-pg0-f44.google.com (HELO mail-pg0-f44.google.com) (74.125.83.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 07 Apr 2017 10:30:21 +0000 Received: by mail-pg0-f44.google.com with SMTP id x125so63067706pgb.0 for ; Fri, 07 Apr 2017 03:30:15 -0700 (PDT) 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:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=H9JcCRGo8orsrxDL5l7DXQYav1+j04HeZeTEugzPKuE=; b=brmkuNv8Iq+ne1aEhORBzgnGPK4EbPJKFSkEnYMyNd+kxsSZaMUS2XOhuS2tUvZK1t G84JbSw2O8JqfMlIdurR3oUzwjEVCnnBvgS2lKtyWd7lKtDOS664u3O8k0TINop4aKLX fGRiG6oZj4tAtfAc8RieJvKy6T4M7y8p+XlqIe6jsY51mdnRMyMt2DSckYTSVd0/jR83 XIpMwyiRe8RGIrLHSBTvqjvsKCvzEiryjmY4xVpW022VqIAW2weqsQDGROURV6bbf9oR d/4ZVHGumOgbHS2sAScDUaYrF9roFX3Oi/89EGJn8GuKb5wOIWwoTRUafOCnLijZ6fbO Y4Xg== X-Gm-Message-State: AFeK/H1XBjK7m7udFDIO6kPqN0ejyXKNz/W3+lBgMkLf+v96v9RrMI5kcJe67SuGKXw+3w== X-Received: by 10.84.245.2 with SMTP id i2mr49065195pll.131.1491561013683; Fri, 07 Apr 2017 03:30:13 -0700 (PDT) Received: from bubble.grove.modra.org (CPE-58-160-71-80.tyqh2.lon.bigpond.net.au. [58.160.71.80]) by smtp.gmail.com with ESMTPSA id h71sm8802858pfj.65.2017.04.07.03.30.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Apr 2017 03:30:13 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 1D323C7692; Fri, 7 Apr 2017 20:00:10 +0930 (ACST) Date: Fri, 07 Apr 2017 10:30:00 -0000 From: Alan Modra To: cgen@sourceware.org Cc: Nick Clifton Subject: Prevent an abort in the FRV disassembler if the target bfd name is unknown Message-ID: <20170407103010.GW16711@bubble.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-SW-Source: 2017-q2/txt/msg00002.txt.bz2 This moves one of Nick's patches to where it belongs. OK to apply? PR 20946 * desc-cpu.scm (lookup_mach_via_bfd_name): Return NULL if the name could not be matched. (@arch@_cgen_cpu_open): Allow for lookup_mach_via_bfd_name returning NULL. Index: desc-cpu.scm =================================================================== RCS file: /cvs/src/src/cgen/desc-cpu.scm,v retrieving revision 1.34 diff -u -p -r1.34 desc-cpu.scm --- desc-cpu.scm 25 Jul 2016 15:39:06 -0000 1.34 +++ desc-cpu.scm 7 Apr 2017 10:15:20 -0000 @@ -606,7 +606,7 @@ lookup_mach_via_bfd_name (const CGEN_MAC return table; ++table; } - abort (); + return NULL; } /* Subroutine of @arch@_cgen_cpu_open to build the hardware table. */ @@ -820,7 +820,8 @@ CGEN_CPU_DESC const CGEN_MACH *mach = lookup_mach_via_bfd_name (@arch@_cgen_mach_table, name); - machs |= 1 << mach->num; + if (mach != NULL) + machs |= 1 << mach->num; break; } case CGEN_CPU_OPEN_ENDIAN : -- Alan Modra Australia Development Lab, IBM