From patchwork Fri Aug 25 22:48:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111041 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp1683075qge; Fri, 25 Aug 2017 15:49:45 -0700 (PDT) X-Received: by 10.200.52.212 with SMTP id x20mr8617qtb.219.1503701385848; Fri, 25 Aug 2017 15:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503701385; cv=none; d=google.com; s=arc-20160816; b=iSqSvmlctT2nfgxub/jfgqRq2gfhXRB6IAeZTyssppGL5qMVZpRV1qw2LbSL7OKnvA Sec8oZP2NE+S29jlT923JvK9OPOUoCLrRwhvse1airx5XQYSI3CQzSUyOZ2+Zaa8FcPU YBpjO3X5wsCdBveMkindeDDP9zRTY6auMoVmAq/OSJfNLxGR7shLEzayyXQvKICQeJ94 MoBJ0hmXCZFbbpw31UNUX3awYbB5aU4KIeranf50mhPQ0PJl4nvCYml/Vna+0nHl19/0 DjxbWblRhiUksVvDw+i2A3J5TfgQjNI6sYjxKnxLN8fBxpd8EzIhy6+byrmn8B5c5PDx 84Yg== 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=oq+6LYUxUqGMzh3Jz8wl6Y896EmqkJ+9dBQMgVzDKFY=; b=F8O9Zsr0GqXab015kQk8umbkMF272IGwnVXIr1+X1vEJg7r5EICHpmU0Q5nEOWEqKC 9RoTGBus0/ZvlAQuCUc40nPq3i47CcN4tBpAJQSdve2g5J0psXWuk0RUCUbaBGYPYmMy L+tSKpFfNJ55n1+n5vVwMAzd3gf60ZtRq4SYh/YGTiw19wi5Kbo8vWN51jhPqEJPL/xL RbxNo0GeSXYU00IjnL43aEgyZ8Abzw04oR0rjdOJeUNWnXzdRPqH0A6mHMgLzg5jW7EZ AyhNlvIDd7rRgnfOPNBY+BVh2dIKMSf4uIVVFc/jPZtflprGnA0iNAwfwPYvMHWDdnmH Xa9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I/boU41n; 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 c199si6799651qke.81.2017.08.25.15.49.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 Aug 2017 15:49:45 -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=I/boU41n; 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]:55346 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dlNQ7-00053h-SP for patch@linaro.org; Fri, 25 Aug 2017 18:49:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43918) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dlNP6-0004Wd-KN for qemu-devel@nongnu.org; Fri, 25 Aug 2017 18:48:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dlNP5-0001wY-Bz for qemu-devel@nongnu.org; Fri, 25 Aug 2017 18:48:40 -0400 Received: from mail-pg0-x230.google.com ([2607:f8b0:400e:c05::230]:37489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dlNP5-0001ss-4Q for qemu-devel@nongnu.org; Fri, 25 Aug 2017 18:48:39 -0400 Received: by mail-pg0-x230.google.com with SMTP id 83so5885490pgb.4 for ; Fri, 25 Aug 2017 15:48:37 -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=oq+6LYUxUqGMzh3Jz8wl6Y896EmqkJ+9dBQMgVzDKFY=; b=I/boU41neE99mV7vrUQHBoAn6jqo61/zOH7bfuYpy9toaK/LA5BYnZpV8V1S1XPZjK H5ksYjyC0a3oWa80Rdd6pDbGglll09lgO2+qkYkPRNRveT1v6H1NZrMJdYZeAWqnTvI5 ULvIcv5I4aZPXZtJ4weJx/JAdUajsQkL2/NrA= 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=oq+6LYUxUqGMzh3Jz8wl6Y896EmqkJ+9dBQMgVzDKFY=; b=jglKtVmc39voFXlaDQn/k60bwK2e8PR+4pb6CXSvrLJ0FWXjTh68W26b8UIHAO+tqU Wgs/TI2/iX7ueGf1vo4ihiDe0ZazciXfz/jiNd+7/1mZc2T33iWQiJx8N5AdM+ZhB9nc 6h62o9DmuyeRaFN1rGx0E+t3zgBMP0QDS1Zo8y5Dyr6IF1bgcemFj40wO0JBVLtPL/wF vXykysizyIpEuNgYV9h2AwS6v4nKp5pZcXCAwGwuKIezgK2XoduxE0+LcQO21yDNfNVI NbaM5HeP+PUphZ2YB2ACYniQoeqhBwL4TvHTkUo4xExDRbY6fcPpXYheTClbiMRmH+wL i5Hw== X-Gm-Message-State: AHYfb5iTT/wNYH8BLMHfwKIU19bjSpkvRUhNA0t3bJl34hq89IzUhfCX yztH9b+6tWwk2voURFWlkw== X-Received: by 10.84.212.137 with SMTP id e9mr28122pli.284.1503701316404; Fri, 25 Aug 2017 15:48:36 -0700 (PDT) Received: from bigtime.twiddle.net.net ([2603:3004:4:2500::22fc]) by smtp.gmail.com with ESMTPSA id o10sm14346641pgc.81.2017.08.25.15.48.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Aug 2017 15:48:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 25 Aug 2017 15:48:33 -0700 Message-Id: <20170825224833.4463-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::230 Subject: [Qemu-devel] [PATCH] 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: qemu-arm@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Fixes: https://bugs.launchpad.net/qemu/+bug/1713066 Signed-off-by: Richard Henderson --- target/arm/translate-a64.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) -- 2.13.5 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index c596025b04..bfba816a77 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -2217,29 +2217,33 @@ 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); }