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: 942410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="cx+LhFx/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41QbFN5H9TzB4MQ for ; Wed, 11 Jul 2018 20:40:39 +1000 (AEST) Received: from localhost ([::1]:52866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdCXx-0006l2-TS for incoming@patchwork.ozlabs.org; Wed, 11 Jul 2018 06:40:33 -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-Google-Smtp-Source: AAOMgpcoJWSxIENJiK7VLudZZOwkD+2QKVTUbvi9uHKRZAfn0vmowrqwg35SsgLr3jl1XRlh2dxZuQ== 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+incoming=patchwork.ozlabs.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 Reviewed-by: Laurent Desnogues Reviewed-by: Alex Bennée Tested-by: Alex Bennée --- 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(-) 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; \