From patchwork Tue May 23 03:03:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wX18B5KwCz9sNk for ; Tue, 23 May 2017 13:23:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DgjDlAuT"; dkim-atps=neutral Received: from localhost ([::1]:45942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0Q4-0005q1-5x for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:23:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06s-0005uO-Pl for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06r-0003yY-Sk for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:46 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:33062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06r-0003yR-Ov for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:45 -0400 Received: by mail-qk0-x242.google.com with SMTP id o85so21454692qkh.0 for ; Mon, 22 May 2017 20:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=A/V6n9dWsoH1HGLdwvPeB+R0uKmJdUI432LjmYXER2A=; b=DgjDlAuTYUU4YHCidOKCxioYP6KHsrM3lrW5ut08C8bvY++m9KM9l+gAVNz48Jp/71 daRSPcWgsPu7pGqKQlifFMQpMpZvIpwy3Adl0qxKgg9yJOKYzRE9CG2iPfd5vzpSmF1I jkOCQRzYQO0O/VnkPsd1uX9bZQuQw4ytlOlONLA+ITGQNnoUsSIYVHi+TZGlOGpAV3as 0/TJt5M/64eSUwywpjrm0oMHm6Vj19z5f/Ejiu3HxswXY0nJLQNfdqGEidPQ5lDIDHbh wkHY5xVLghp+MyMNV5bl2HYMj8KAbrceprWOCy64kny3j05LaV36QqTyH8+z/wL91lfO f4ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=A/V6n9dWsoH1HGLdwvPeB+R0uKmJdUI432LjmYXER2A=; b=cVA5uwMaGqRpzbuzVb/g0fobmZtpE2uDbr+gO5h4GHfM5mazSaT3QouEhw2LzljhHD uLZh+VUQIC1grLxSKpx0BVEEb33nZYleZJKKGtMLwCCxm8Uao89XKtKYj7rCxECOgceU 1ILATiFWcpES1NmpbVruX1pCNon49j7zRHIV4KKBam3ChthjwYHRzbHUMkIUA3z4PkLw 6RF/XUhtF+SD6qOAqGUB75gdueCn6krME0C4uMYnHYMWZM2SsGv0bazgd99QD8U7xztG QE7/PSKvyIohDmeQj9U47NDJ/+c8pmBrg32jRrKj0J9o8bZ+4Fx7ACPCpYSj8iJ4B4jh 9TBQ== X-Gm-Message-State: AODbwcDxfNeXn4SH41k0rt/SRSzBVChMJyeUatyhT3+hnV7RWoDglxaJ dmscTBkF7w70vn+g70w= X-Received: by 10.55.16.41 with SMTP id a41mr22755312qkh.131.1495508625021; Mon, 22 May 2017 20:03:45 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id s190sm12918805qkh.57.2017.05.22.20.03.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:03:04 -0700 Message-Id: <20170523030312.6360-24-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170523030312.6360-1-rth@twiddle.net> References: <20170523030312.6360-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 23/31] target/s390x: Use unwind data for helper_lctlg 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 8 ++++---- target/s390x/translate.c | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 902290c..26960e4 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -821,20 +821,20 @@ void HELPER(cdsg)(CPUS390XState *env, uint64_t addr, #if !defined(CONFIG_USER_ONLY) void HELPER(lctlg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra = GETPC(); S390CPU *cpu = s390_env_get_cpu(env); bool PERchanged = false; - int i; uint64_t src = a2; - uint64_t val; + uint32_t i; for (i = r1;; i = (i + 1) % 16) { - val = cpu_ldq_data(env, src); + uint64_t val = cpu_ldq_data_ra(env, src, ra); if (env->cregs[i] != val && i >= 9 && i <= 11) { PERchanged = true; } env->cregs[i] = val; HELPER_LOG("load ctl %d from 0x%" PRIx64 " == 0x%" PRIx64 "\n", - i, src, env->cregs[i]); + i, src, val); src += sizeof(uint64_t); if (i == r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 531b5f1..886991e 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2557,7 +2557,6 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps *o) TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); check_privileged(s); - potential_page_fault(s); gen_helper_lctlg(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);