From patchwork Wed May 24 19:22:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 766653 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 3wY2hP3Y64z9sP8 for ; Thu, 25 May 2017 05:36:37 +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="cL9ZIixF"; dkim-atps=neutral Received: from localhost ([::1]:56508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDc5D-0005aQ-2a for incoming@patchwork.ozlabs.org; Wed, 24 May 2017 15:36:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsS-000242-ON for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsR-0001d0-Ky for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:24 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34243) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsR-0001cN-Gm for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:23 -0400 Received: by mail-qt0-x243.google.com with SMTP id l39so27575200qtb.1 for ; Wed, 24 May 2017 12:23:23 -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=l565x4qTFgq+ykA1/rHZfQVr64u+DPXBHDXbMuzIOC4=; b=cL9ZIixFWuCElWINaHPa96A2Hka7pOIDgnrifuwkwlQ3c3dO/JUJjL/nKWSC2mdvIS j/Y/4QIVsiZA8CwKGszKXo1gwC9q4zGuOqgCB3+P3LZYGwvJlQyPYI4yIzPiLpgKrbCo zKYL6YbUSRJTW39eGcv6lieqfRE0ygqjVwrYZT8UVc6Ot1iMyPKZcJuIBk5YIjeEJrJy oJ9on1kwvHLRxDmq4WjuP6mASuh14ZqDFxrFTt3EF9pr/o2rVuEjRdSctUQzxphdSeQ9 6vN88mN99JbmtAQBps4VV/5yPwRIUyH7Df1uHQffeIt7BZOHKsmoAM61RbtH0zQmWLx7 gY0Q== 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=l565x4qTFgq+ykA1/rHZfQVr64u+DPXBHDXbMuzIOC4=; b=kgjNlolJx8oaVrIImwm2Blx7rNgb/6ytIIDZyRa1/YbXo2IbDgzmDe9Azy1+FfoS9C U+QdwNNzurcbkiFu9jBr7clivwKtaK2i845zhUopH010AtLM+Uin2p8esqHcuhP4waaA oVdoGKxUXR2FeFxKdCNY+yoUUqho03ck340BXV8uTbBJ6yV+hNI0I/+BxKLthvhPhf/u rMk+qpafjuFMnwAt38z5dCuOIbZkRRQNRlG41Zva6YU5hXXuTt6cfbyGiSkGBxxK9rOl MrPl0x7AqpzGpC3xXPIgkF4rGhFGWQJuNVNWmBfNTzUG5Z7eG/EV6xzBJ+EJ256My4G9 vGQQ== X-Gm-Message-State: AODbwcDB9YpYDidUIiFy4wu0ZFs85F53NRSmR3Ejewz6Uq4OYUwVpmZl dFEiOAcxS32d9Q== X-Received: by 10.200.53.202 with SMTP id l10mr35177132qtb.211.1495653803068; Wed, 24 May 2017 12:23:23 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:37 -0700 Message-Id: <20170524192246.15905-25-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 24/33] target/s390x: Use unwind data for helper_lctl 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: thuth@redhat.com, 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 | 9 +++++---- target/s390x/translate.c | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 68e3817..614cdb2 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -878,18 +878,19 @@ void HELPER(lctlg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) void HELPER(lctl)(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; - uint32_t val; + uint32_t i; for (i = r1;; i = (i + 1) % 16) { - val = cpu_ldl_data(env, src); + uint32_t val = cpu_ldl_data_ra(env, src, ra); if ((uint32_t)env->cregs[i] != val && i >= 9 && i <= 11) { PERchanged = true; } - env->cregs[i] = (env->cregs[i] & 0xFFFFFFFF00000000ULL) | val; + env->cregs[i] = deposit64(env->cregs[i], 0, 32, val); + HELPER_LOG("load ctl %d from 0x%" PRIx64 " == 0x%x\n", i, src, val); src += sizeof(uint32_t); if (i == r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 65ae573..26f6b37 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2540,7 +2540,6 @@ static ExitStatus op_lctl(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_lctl(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);