From patchwork Mon Apr 1 20:58:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 161579 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp983211jan; Mon, 1 Apr 2019 15:00:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwoZjj1lJZhLU6W6to8Jxvz/+cE2ZdmCGJzOluYNzQHhL05Fky0wNsbKBTWs/4+jq6fQAJL X-Received: by 2002:a81:6045:: with SMTP id u66mr20659553ywb.53.1554156000469; Mon, 01 Apr 2019 15:00:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554156000; cv=none; d=google.com; s=arc-20160816; b=q4PmA25OSCPArB1OE2UEzoXJdubNJoi/Ow8H4DsTL+YrlsIf2dmyP20TFHuN/kmsz6 OenY9EN5RCZCmKRFJMb4XqBb70OUHxx+IGaBQ5DUTlsdS5dEbOfiNahnlZphY4JcDLpC 9nf7zWG8HMpmaWzelwQFWNQtptv/Fmr6Dx+7KVVvcbVr2WHwIbYzgr3+5c7jJe/9RxhF TGhGVyHSYfe9JEfuPV7RJqANGGB4ZnsGOY+OKtuSN3U0EfdG1ibi6l63dZ44bir8nOoZ sBjHsFTuM+dpxxL3CgW/1sYK8fmVjxTbZ1ILspwS2O04A+ZARny2MsYgkVbYDttfSGmj mB4Q== 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:references :in-reply-to:date:to:from; bh=s1J1Tl1SjdP88iHpp739mq3lTqviO1MactBUl7mSJXw=; b=l3GIlsuFyaQNgRsE3hSB6pWrPhCd+CbWpDh4tk5F642y7sXK+aJbBonHky5n5xMURi rMipoXcbZ3KaFiUvY5lcPyOSLaA5dup/xHnRYd1HG0kwDG1RLiR8/Wpu+kfU4KePQBmL 7U1K0avGl2/Ip9M7ermTQypWW9W1j1o+6/lSHJwxad2LbDpnt59A4ULEkY3MUrEuIPul OjAIx3lGuzPLaC00KdtXz0Tb8LILw20UxSTPJ5KSzIkgFpblAMjOo1y6G2Tr5qL8nC5p gb5Zcmd2WGsEO6jHYB5ctd5FaYSA2zqJcJ2Dra3sMTRcDo7tSGhuAAHbmhnnnuwUjPp+ xXWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t128si6549370yba.390.2019.04.01.15.00.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 01 Apr 2019 15:00:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from localhost ([127.0.0.1]:53507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hB4yF-0008F2-VT for patch@linaro.org; Mon, 01 Apr 2019 18:00:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hB46J-0002xl-Uf for qemu-devel@nongnu.org; Mon, 01 Apr 2019 17:04:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hB46I-0004US-Mu for qemu-devel@nongnu.org; Mon, 01 Apr 2019 17:04:15 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:53978 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hB46I-0004Li-HP for qemu-devel@nongnu.org; Mon, 01 Apr 2019 17:04:14 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x31L3tNK062270 for ; Mon, 1 Apr 2019 17:04:02 -0400 Received: from e13.ny.us.ibm.com (e13.ny.us.ibm.com [129.33.205.203]) by mx0a-001b2d01.pphosted.com with ESMTP id 2rkskgsyq4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 01 Apr 2019 17:03:58 -0400 Received: from localhost by e13.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 1 Apr 2019 22:03:10 +0100 Received: from b01cxnp22035.gho.pok.ibm.com (9.57.198.25) by e13.ny.us.ibm.com (146.89.104.200) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 1 Apr 2019 22:03:08 +0100 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x31L38ux18743406 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 1 Apr 2019 21:03:08 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E89F4B205F; Mon, 1 Apr 2019 21:03:07 +0000 (GMT) Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C1C10B2067; Mon, 1 Apr 2019 21:03:07 +0000 (GMT) Received: from localhost (unknown [9.80.94.43]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP; Mon, 1 Apr 2019 21:03:07 +0000 (GMT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 1 Apr 2019 15:58:41 -0500 X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190401210011.16009-1-mdroth@linux.vnet.ibm.com> References: <20190401210011.16009-1-mdroth@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 19040121-0064-0000-0000-000003C5174B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00010857; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000283; SDB=6.01182941; UDB=6.00619269; IPR=6.00963684; MB=3.00026249; MTD=3.00000008; XFM=3.00000015; UTC=2019-04-01 21:03:10 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19040121-0065-0000-0000-00003CEA8137 Message-Id: <20190401210011.16009-8-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-04-01_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904010136 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 07/97] 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: Peter Maydell , Richard Henderson , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson 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 Tested-by: Laurent Desnogues Reviewed-by: Laurent Desnogues Signed-off-by: Peter Maydell (cherry picked from commit d0e372b0298f897993f831dbff7ad4f1c70f138e) Signed-off-by: Michael Roth --- target/arm/translate-sve.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.17.1 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]);