From patchwork Wed Jun 7 00:30: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: 9770331 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C6AC560393 for ; Wed, 7 Jun 2017 00:43:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A830F284EA for ; Wed, 7 Jun 2017 00:43:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D28728524; Wed, 7 Jun 2017 00:43:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3AF9E284ED for ; Wed, 7 Jun 2017 00:43:28 +0000 (UTC) Received: from localhost ([::1]:40601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP4J-0003on-92 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 20:43:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtB-0002gj-Gj for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOtA-0001zZ-MA for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:57 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:35629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOtA-0001zL-IC for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:56 -0400 Received: by mail-qk0-x242.google.com with SMTP id u129so438991qka.2 for ; Tue, 06 Jun 2017 17:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=nhlhyITiE/P22zYjO3naPfjfH2Dv+KiP/sKNAE9hcsA=; b=oKkpzOx1SVRR5bLG4xdyGKuoUeYSo2Ig052gxcybXBPaP+FbSNiwL5MRMhQf6Y/dK2 qsSyeA6QaXLR2Q4Q45gS6Rce1BfpL8FwpDVr7kTTXf96fH65GfCxsAzgBQckzQ84tgdm cwNgQ3vSOP6S0hnBH1ym/BZYtkkejH/41TEsAu6VPnaIG6pk7bHGM19xPPHMFId4bViG 5rWYRftrXpCzwemf2lagURn5qbsa19BTdvWmXue++Y/dXfaLOVJuzP9PRlM3TQx9lxjr CJoCvLGg6JAzOQuVpBExViOX4kmeHWgsqPrNPFV3BosDJ+T0azsDtbMskulUVK/Xx46t EYYQ== 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:cc:subject:date:message-id :in-reply-to:references; bh=nhlhyITiE/P22zYjO3naPfjfH2Dv+KiP/sKNAE9hcsA=; b=IBgzkfTMmkDjwYsqE1TdldVJVQYNwy9CgKKNkLuIROMRdVd/czRnDCARFVCuLJUw2p VHQw4XX5ZiSMADXIPNF4WwuvzvXGexlxcoXfN1Zj6wcFvbslNfWZshVSJnSecoNtcsAL j9FF0MNoN3WMYlhtRnTk4E2XUG8toeZWcSH2H+6TrgTvAgwbmoA+8iEAxKjCqrtnD3tu Bk6Mo9msXeLSP5gTw4BOmwkQEEr4UOiW2hrQsy6Xo0CJGV1v5VI6ioVdsfBfNvLYCNGQ 4PRPM/uKQGdcnk4/DyqF2BT7HTZy8NZeeUhbfw5HIxgxnbmCXyYx/rmbXN++wcdOpykB Vs5A== X-Gm-Message-State: AKS2vOzuRziZecURrZ/ejVn2xniZdgI4wrdiBmRVz3BBQ6asNY6vC3ni 61M7TRjCgRUlFotXUnI= X-Received: by 10.55.212.3 with SMTP id l3mr23535647qki.112.1496795515780; Tue, 06 Jun 2017 17:31:55 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.31.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:33 -0700 Message-Id: <20170607003119.14778-25-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-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] [PULL v2 24/70] 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: , Cc: peter.maydell@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- 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 ff12777..68e3817 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -848,20 +848,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 c95adcd..2386c41 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);