From patchwork Wed Sep 20 00:45:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 113073 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp138134qgf; Tue, 19 Sep 2017 17:47:23 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC6oDCB5t9TUZDPw4W9PPRFY1gSUpslKdWoRVzcThF3mUtSGhE5HPiASVMF2SdGst1OWxUx X-Received: by 10.55.102.73 with SMTP id a70mr4407381qkc.345.1505868442963; Tue, 19 Sep 2017 17:47:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505868442; cv=none; d=google.com; s=arc-20160816; b=g4a4KfT+sJC94M5DvzkoY5g4FxX2ZMiqEHL8SzIO2X5VIY1d2L0kzGMnv18PSvIkAB SG+fEHzMRwxa5Sl/9FUOH3JdzPJedxupvgbgzSoU4O4z1aaizM54FYxHVh6Fx92GTdK6 zJo8g4jlr2gPR7/nkxfdKASDRTJLgexJK4W2tIeIwj9b1+7VmIkf5TsKXsDzvbKJsIDg +Cv8T2cy/Yinr+DNiT6eDy6Q1wp8vyAKbIsjD5mrps1cGAfP+LeiK+PCxktL51PXKPKm 09w0TkkvqcIGlMzva8CI5afWKgsJKK/XOKHdb4Fdiq1RcV1PcoDvJ4vsdGT7BbMff1qA ecTw== 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:arc-authentication-results; bh=4uU4qHK9ro1AQAGAMzKwt+IrJDca5NhS3dzs6x0n0zs=; b=K1RE1zlJp9NcTCHHM8ZUamkTXxixXXIWP1fQy1eBtHrQ7rsllKCni8CXQtGlnrDHs1 7rYNwpFHx3HMvb34A6HI4ou1xXU3nWmL9qBwYbI+gpxn/O5vVwtZY4kzxRcDfjRDZgdi kV1WXoU4TvRT7sFsiruIfXS/NnLYx3U7EgpxAKpGi+5CNmYAqRfwnizFQueb5gaXAJeZ JldIZJNQ7V2Z1/HJdcn0ajJkwLnPM1Ii1ASigM56GHKlHNXuENiNYQmE7NFbBn4XgRln 0GmTGp/LLclMRNv3CsKTW5v8iXSNJMWx+k8fQ7xFX+ZQIMK0CYE/aIcCgLHR8DnMS+uT DIHQ== ARC-Authentication-Results: i=1; mx.google.com; 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=ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 28si121076qtv.153.2017.09.19.17.47.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Sep 2017 17:47: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; 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=ibm.com Received: from localhost ([::1]:46029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duTAe-00051W-Sh for patch@linaro.org; Tue, 19 Sep 2017 20:47:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duT9Y-0004R8-2T for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duT9O-0005dm-FL for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:07 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:55284 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 1duT9O-0005d4-1Y for qemu-devel@nongnu.org; Tue, 19 Sep 2017 20:46:02 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v8K0hblp139549 for ; Tue, 19 Sep 2017 20:46:01 -0400 Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) by mx0b-001b2d01.pphosted.com with ESMTP id 2d39xyvars-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 19 Sep 2017 20:46:01 -0400 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 19 Sep 2017 18:46:00 -0600 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 19 Sep 2017 18:45:58 -0600 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v8K0jvFA63438930; Tue, 19 Sep 2017 17:45:57 -0700 Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 85960BE039; Tue, 19 Sep 2017 18:45:57 -0600 (MDT) Received: from localhost (unknown [9.80.107.19]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id 4A68BBE038; Tue, 19 Sep 2017 18:45:57 -0600 (MDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 19:45:12 -0500 X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170920004521.9417-1-mdroth@linux.vnet.ibm.com> References: <20170920004521.9417-1-mdroth@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17092000-0004-0000-0000-000012F283D4 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007765; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000230; SDB=6.00919510; UDB=6.00461960; IPR=6.00699736; BA=6.00005598; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017216; XFM=3.00000015; UTC=2017-09-20 00:45:59 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092000-0005-0000-0000-00008428A8EC Message-Id: <20170920004521.9417-4-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-09-19_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709200008 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 03/12] target/arm: Fix aa64 ldp register writeback 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 , qemu-arm@nongnu.org, Richard Henderson , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson For "ldp x0, x1, [x0]", if the second load is on a second page and the second page is unmapped, the exception would be raised with x0 already modified. This means the instruction couldn't be restarted. Cc: qemu-arm@nongnu.org Cc: qemu-stable@nongnu.org Reported-by: Andrew Signed-off-by: Richard Henderson Message-id: 20170825224833.4463-1-richard.henderson@linaro.org Fixes: https://bugs.launchpad.net/qemu/+bug/1713066 Signed-off-by: Richard Henderson [PMM: tweaked comment format] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell (cherry picked from commit 3e4d91b94ce400326fae0850578d9e9f30a71adb) Signed-off-by: Michael Roth --- target/arm/translate-a64.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) -- 2.11.0 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 2200e25be0..cb44632d16 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -2217,29 +2217,34 @@ static void disas_ldst_pair(DisasContext *s, uint32_t insn) } else { do_fp_st(s, rt, tcg_addr, size); } - } else { - TCGv_i64 tcg_rt = cpu_reg(s, rt); - if (is_load) { - do_gpr_ld(s, tcg_rt, tcg_addr, size, is_signed, false, - false, 0, false, false); - } else { - do_gpr_st(s, tcg_rt, tcg_addr, size, - false, 0, false, false); - } - } - tcg_gen_addi_i64(tcg_addr, tcg_addr, 1 << size); - if (is_vector) { + tcg_gen_addi_i64(tcg_addr, tcg_addr, 1 << size); if (is_load) { do_fp_ld(s, rt2, tcg_addr, size); } else { do_fp_st(s, rt2, tcg_addr, size); } } else { + TCGv_i64 tcg_rt = cpu_reg(s, rt); TCGv_i64 tcg_rt2 = cpu_reg(s, rt2); + if (is_load) { + TCGv_i64 tmp = tcg_temp_new_i64(); + + /* Do not modify tcg_rt before recognizing any exception + * from the second load. + */ + do_gpr_ld(s, tmp, tcg_addr, size, is_signed, false, + false, 0, false, false); + tcg_gen_addi_i64(tcg_addr, tcg_addr, 1 << size); do_gpr_ld(s, tcg_rt2, tcg_addr, size, is_signed, false, false, 0, false, false); + + tcg_gen_mov_i64(tcg_rt, tmp); + tcg_temp_free_i64(tmp); } else { + do_gpr_st(s, tcg_rt, tcg_addr, size, + false, 0, false, false); + tcg_gen_addi_i64(tcg_addr, tcg_addr, 1 << size); do_gpr_st(s, tcg_rt2, tcg_addr, size, false, 0, false, false); }