From patchwork Wed Jul 11 10:39:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 141722 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp123556ljj; Wed, 11 Jul 2018 03:42:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdbHMA8ho3/lfCOqoJDE/RqjIVkXEeypZKElUya1OJJzkBO3BC/0kX+y/sshCwCI8d/Np6G X-Received: by 2002:a37:5b83:: with SMTP id p125-v6mr25228759qkb.196.1531305742704; Wed, 11 Jul 2018 03:42:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531305742; cv=none; d=google.com; s=arc-20160816; b=D9lnEeSEdJVA38PqpZSE/ZvijusXOp2XAKavokd0woukHDP6qaA3KInOem6EEFI9S2 GeKpk8W5yV8L0hxIHO0M4ew3wSG2frbol2lMIA1PLc+Fpqz0Ohh0KcQ/H7jy+1ORXUSv HmYt6zDvLpgto5R27jFeuQOGLa92WbwF4wSqHRuuXOHFJ32viwriJkir0QtIDq5nJEdV YZnHIaY7HYBKYTt8FaqNjFu4ZKZLqKlVNdALkr768q3mSn2DkzBLzQzSdd1KR00c669S /J2RAJpTeBoJ/41C1JWyGJfo592iG2JsSH7oSlZUxpp0/l5m9Q86XJv3LwJpS6tMn90P wCog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :dkim-signature:arc-authentication-results; bh=9UpvB3knom6VHtEZuvcXGBBASDujF2Gjm/NZAtbq7xw=; b=Pc3mwQkgj2cbCZjlncy8frUVDLmodgL+5iFg4bFYHNk2A25Gj2rKxcch5QI4REJB83 NvVfxdyAKKiUDTRGxSDCKCBjDevi2suIANcyuG/VHg9XniEDm4v7fEXJ+mXr6XDibJ2V RtEBCFwNUZ0dgKMOijvVHG6/5VAUqFGWhrVYx91NUq+gVlhZE3wTxo6PfqJbYWFZb/NT dk9DgHV726SYN34lxrsqzQ09zksBF9cJTjgT8GuHUYoHNVO+s6zO20qR29kZ73FrO0BV wUDDMZDlvQI52y6ZJ74OwhGQ/todq8b4Xi/WPpaF1u/CXzB3puMEmOGlNJ0llcbb2vty /2Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="cx+LhFx/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j23-v6si18564940qtj.7.2018.07.11.03.42.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 11 Jul 2018 03:42:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="cx+LhFx/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdCZi-0007I8-42 for patch@linaro.org; Wed, 11 Jul 2018 06:42:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdCXW-0006gt-11 for qemu-devel@nongnu.org; Wed, 11 Jul 2018 06:40:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdCXS-0007VE-Tm for qemu-devel@nongnu.org; Wed, 11 Jul 2018 06:40:06 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:38731) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdCXS-0007V2-Lu for qemu-devel@nongnu.org; Wed, 11 Jul 2018 06:40:02 -0400 Received: by mail-pg1-x532.google.com with SMTP id k3-v6so2794693pgq.5 for ; Wed, 11 Jul 2018 03:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=9UpvB3knom6VHtEZuvcXGBBASDujF2Gjm/NZAtbq7xw=; b=cx+LhFx/4+6mnv94FvMr/XKSqWB36oFr2PcuKUo9Q1F9We4B6Ke7kuPbZEFuXUDdS1 Bapv0kdl2UC8hbPKPDABEuE4EpN9Q3o0tLbgVw9ob8EpMWoGHdieXr9+n3I7787jh3za FsatlCb83spO1hXUiWe+29VvoyovuVurfAI/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9UpvB3knom6VHtEZuvcXGBBASDujF2Gjm/NZAtbq7xw=; b=YWrJJl37pnTx10hMyeHRYLHkwFlAum2mxAZ78QLwuE+BRMwVAs6At+fkp4WA92kh26 Esj1DNC4UInTrjvP0wb5Y4LL1GaSzZICZdUyMVOcNLL3rbEj+oQRX4e19fUW85vwKSA4 cr5rqTxW8FYaQq8+s+b7RnUBFjdXEhMpyydLjQY1ph9xwwl530k8KOMbgQ0QKdy9dGFj IdxAO5U4MFDFskpXdoY/YYchigbTmvBhIc2rLBBEddpPahpM0p6HVwOtMGZesZQ+cxOM z4+IcM0IDy5m3h33CIU7hNOH21rhDGNI2DIqxsY+U/Xb7e4E2LaPBB3Pud5zxFHR/nQY heOw== X-Gm-Message-State: APt69E10t3F9uNVEhYI/+5za8RV+qSCsO5EUYNFtS5efakwqe0M2B86C N3JD0aHFQ0RIpbI2ZN3HcQbdtwJBnZ4= X-Received: by 2002:a65:6258:: with SMTP id q24-v6mr26264778pgv.131.1531305601393; Wed, 11 Jul 2018 03:40:01 -0700 (PDT) Received: from cloudburst.twiddle.net ([172.56.42.138]) by smtp.gmail.com with ESMTPSA id o4-v6sm41101324pfa.128.2018.07.11.03.39.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Jul 2018 03:40:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 11 Jul 2018 03:39:57 -0700 Message-Id: <20180711103957.3040-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::532 Subject: [Qemu-devel] [PATCH for-3.0] target/arm: Fix LD1W and LDFF1W (scalar plus vector) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 'I' was being double-incremented; correctly within the inner loop and incorrectly within the outer loop. Signed-off-by: Richard Henderson --- Fixes a SIGSEGV within one of these generated helpers, exposed by an armclang vectorized code sample. r~ --- target/arm/sve_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Laurent Desnogues Reviewed-by: Alex Bennée Tested-by: Alex Bennée diff --git a/target/arm/sve_helper.c b/target/arm/sve_helper.c index cec0d3ee54..ddc592ff79 100644 --- a/target/arm/sve_helper.c +++ b/target/arm/sve_helper.c @@ -4855,7 +4855,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, void *vm, \ intptr_t i, oprsz = simd_oprsz(desc); \ unsigned scale = simd_data(desc); \ uintptr_t ra = GETPC(); \ - for (i = 0; i < oprsz; i++) { \ + for (i = 0; i < oprsz; ) { \ uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \ do { \ TYPEM m = 0; \ @@ -4936,7 +4936,7 @@ void HELPER(NAME)(CPUARMState *env, void *vd, void *vg, void *vm, \ uintptr_t ra = GETPC(); \ bool first = true; \ mmap_lock(); \ - for (i = 0; i < oprsz; i++) { \ + for (i = 0; i < oprsz; ) { \ uint16_t pg = *(uint16_t *)(vg + H1_2(i >> 3)); \ do { \ TYPEM m = 0; \