From patchwork Thu Aug 9 03:40:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 143652 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1578694ljj; Wed, 8 Aug 2018 20:49:03 -0700 (PDT) X-Google-Smtp-Source: AA+uWPx3g3jqXQs+DVwwRtHlnL7+Y4DYiZLvxURSOFg19ME7uIsQwaOYPIplj+iVdyLIXQoF8WNN X-Received: by 2002:ac8:3913:: with SMTP id s19-v6mr393615qtb.344.1533786543508; Wed, 08 Aug 2018 20:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533786543; cv=none; d=google.com; s=arc-20160816; b=guPh5rPi5fCgnEFmAfR99nZK5yQswXKO+t1fC1cqZqdF4c9FzEmMisxcA75Q+2uw/l vrDGcWVK7DPkkkcyLPdVGjv5cP1qtV3lRfIe0Mu2YZ51nxNToWRXejJRsJP+BB5axEdD saDFzcWj4n0g4xKxh90LYRUS3Ig/i4Jnltz9i3/rUukAv4GMtGcxGIYTUnwU+xnWhbae v77M8+NnFGzpcFa0p5GG3olP40fFV3jmywtUGUNfqA1DNI+PxmP7Bm2XsGIR3Fkgkew1 6yAoSdB0NuQn1KRlButO4Pvs6LQ4z/piD41QshU5pUtx5a9Odf0M6b3TOTTgME1m6Vvz p/ew== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=oR7/ZohV9ZWM7zkPc+xrlk2h0PYh/osElGNKWerwJO0=; b=YqgVCWVaR3wAXlvHe1NB/eOHqGsUoTj4N4VLrZvDUxLip6cFELxCnIeVLd4xWvVwJy yW+t7h1dd3xcT9DJOTLpuNrkOvfIP8/TMWF5J9VNjonpgnS/AE7WPw7qTj4hQUlJzzAh KCAHoraFIZ66fooQJBMX8Z9z+6a9ga7lEg9IJSo2BHChsGMktG7YDQ5ZLWByWEbWWW8p tuDQqUiPV23/AzpaKymddrzwBTIT9SOFWzJw+f4lBoWO6RoXm+OErCO52YMw6sC+T1Ih Qji7BdaSLW88B5YUiQmK2+GBcZx9VJGyQOt7jkZDFaj9vRGYm0BGw+VT/nfwa0zlMxKk 8wCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XXZM90Qc; 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 o37-v6si3219330qvh.216.2018.08.08.20.49.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 Aug 2018 20:49:03 -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=XXZM90Qc; 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]:46431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnbwd-0005FO-1p for patch@linaro.org; Wed, 08 Aug 2018 23:49:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnbof-0006kk-9e for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnbod-0003Cb-Mk for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:49 -0400 Received: from mail-pl0-x22a.google.com ([2607:f8b0:400e:c01::22a]:33009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnbod-0003CC-HI for qemu-devel@nongnu.org; Wed, 08 Aug 2018 23:40:47 -0400 Received: by mail-pl0-x22a.google.com with SMTP id b90-v6so1948822plb.0 for ; Wed, 08 Aug 2018 20:40:47 -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:in-reply-to:references; bh=oR7/ZohV9ZWM7zkPc+xrlk2h0PYh/osElGNKWerwJO0=; b=XXZM90QcMt7bf07Ee4KyIBIlK1DoLbN6TjAeXNOXvH2as1tWVV/Q7ySpvw1AaVnGmN nHyTRvtqOa8OrxBpjLnCRw0mc/NIWXO0s7Ildqo4m/ibSsLHJhh3RWzdwUnGWaROIfMq qdCpQhqefXht0kSO8cKFILlOdQShbdx99v3RU= 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:in-reply-to :references; bh=oR7/ZohV9ZWM7zkPc+xrlk2h0PYh/osElGNKWerwJO0=; b=E6XzT/AYZN+IqYviKPPD0nxPcURyolVUM6uiVBqKmHtLFdS+7CVWgy+UbHctzceAcW TjJq8SSQWL56C+B4khWmAs503QEc6LD8VU75pJhuOs4O9Jn8Ve6RB8DAemC1I3GTTnn3 ciHxe16lINIwMAL87FiFujXY7hqV9KfV41gggWzgRvTfT3HQ2m/Vz7Xkcf8SZP+2e4/k paqns7hpj8KxpskmTDqpH6go0BJyC6m/IyX1cUI51ayfPGNjnUceNAG4PfjBDBTliijB iM71w0TM11Xdf5/SuEEakYCIpSsowgmwemGkrOiTQ7wTMsaYN+8JsZOHuG/+Y4a2QkO3 Z5Jg== X-Gm-Message-State: AOUpUlH/VdQl5PUqS/fd8OBk3KcBgMEXi7GirMDLw8mPItypgnC7ts3b jibn2SmmHrxtz8wvOm72ju5q0GvPebw= X-Received: by 2002:a17:902:8b8b:: with SMTP id ay11-v6mr398345plb.1.1533786046267; Wed, 08 Aug 2018 20:40:46 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id q78-v6sm9674103pfi.185.2018.08.08.20.40.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Aug 2018 20:40:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 20:40:29 -0700 Message-Id: <20180809034033.10579-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180809034033.10579-1-richard.henderson@linaro.org> References: <20180809034033.10579-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::22a Subject: [Qemu-devel] [PATCH 07/11] target/arm: Fix offset for LD1R instructions 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: laurent.desnogues@gmail.com, peter.maydell@linaro.org, alex.bennee@linaro.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The immediate should be scaled by the size of the memory reference, not the size of the elements into which it is loaded. Cc: qemu-stable@nongnu.org (3.0.1) Reported-by: Laurent Desnogues Signed-off-by: Richard Henderson --- target/arm/translate-sve.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 Tested-by: Laurent Desnogues Reviewed-by: Laurent Desnogues diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index 9e63b5f8e5..f635822a61 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -4819,6 +4819,7 @@ static bool trans_LD1R_zpri(DisasContext *s, arg_rpri_load *a, uint32_t insn) unsigned vsz = vec_full_reg_size(s); unsigned psz = pred_full_reg_size(s); unsigned esz = dtype_esz[a->dtype]; + unsigned msz = dtype_msz(a->dtype); TCGLabel *over = gen_new_label(); TCGv_i64 temp; @@ -4842,7 +4843,7 @@ static bool trans_LD1R_zpri(DisasContext *s, arg_rpri_load *a, uint32_t insn) /* Load the data. */ temp = tcg_temp_new_i64(); - tcg_gen_addi_i64(temp, cpu_reg_sp(s, a->rn), a->imm << esz); + tcg_gen_addi_i64(temp, cpu_reg_sp(s, a->rn), a->imm << msz); tcg_gen_qemu_ld_i64(temp, temp, get_mem_index(s), s->be_data | dtype_mop[a->dtype]);