From patchwork Sun Jun 4 17:34:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 770998 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 3wgm0S0q3Mz9ryv for ; Mon, 5 Jun 2017 03:58:48 +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="aUbSNaZp"; dkim-atps=neutral Received: from localhost ([::1]:57926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZnZ-0004Mq-QG for incoming@patchwork.ozlabs.org; Sun, 04 Jun 2017 13:58:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRL-0007Yj-Ck for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRK-0003Ap-Iy for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:47 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35777) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRK-0003AU-D5 for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:46 -0400 Received: by mail-pg0-x242.google.com with SMTP id f127so7255487pgc.2 for ; Sun, 04 Jun 2017 10:35:46 -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=n5BR7XB2IJ0BdEFSIgpNPSj8l11Jxl1kySMmYJ5ZWp0=; b=aUbSNaZppbV89hMmHmcUHCIT2w7zFNIqjcI2nhsrHuKt8pboHl2m6/WJgT4vaHeQZn Zt6ReEZ3GpDFv1nPBJ8w9gv1k9CcuB0mb9Yhnlpd2PupiQobNIYd2KlmqNnJ9UfZWVj6 UPNNvIMb7OnIaMJWFMOQ/l9IlUwYj8+4Tq4C4kF+xiGRca10bZ31ZkVrI1m1xDG9yBg3 gp0VJ9wnoe4U5tIto/DqmeQYsxgvFtLs2/ZAIgJq4h+ZUX6qyaOhCpG8KX+pkd7cND7U fOAV9FltQDjTUqIBA6yPB2QlsISobFFIdjHh5PwuQXfp+g63MPWLxgNEDD5allINlYvG qe2A== 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=n5BR7XB2IJ0BdEFSIgpNPSj8l11Jxl1kySMmYJ5ZWp0=; b=mvkN5k8HvZFQdoBRybMyOxw5qKckNrqDiTX9tRXAHZNHIE4Tz1LU/KGW61yU/5LgwA 4fxSkXr/hHmFoUWuByq5ZOk/+5F6DaTbFlO6iVEumlvrqV7DEFiQOznER7VOmw2DBQlG W9+r6pCjfK124E6/Ya+Q+1VAn07CFtdiuRjvoaYsw1z7zfGPmn//bIRHy+B+ZsRGnfIc iyH0ftakADOhy34fQuD4KIuUAV6yHkjbLaHWIRDInniADw6SWJvJudjyVvQGwG3sv3v2 h+pikM9zq3at+0KfteSLmJaLTtoVhDDzdBqmpZQVJIm3+CPEFeHDmOy8I7EskK9NSaaG gc+Q== X-Gm-Message-State: AODbwcDUhkIBxPs3PFYOdC/tDtDooSA+xI/pnjjaIXHpi+k0kFH30017 cyLOwXnK7tGIoqI+sIk= X-Received: by 10.84.208.102 with SMTP id f35mr7465516plh.92.1496597745362; Sun, 04 Jun 2017 10:35:45 -0700 (PDT) Received: from bigtime.ASUS (cpe-98-155-27-246.hawaii.res.rr.com. [98.155.27.246]) by smtp.gmail.com with ESMTPSA id j191sm52854419pgc.53.2017.06.04.10.35.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:24 -0700 Message-Id: <20170604173509.29684-25-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170604173509.29684-1-rth@twiddle.net> References: <20170604173509.29684-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PULL 24/69] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 fed9f17..65ae573 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2552,7 +2552,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);