From patchwork Tue May 23 03:03:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 765706 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 3wX0xb1Q13z9sNk for ; Tue, 23 May 2017 13:14:27 +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="m48nQgC/"; dkim-atps=neutral Received: from localhost ([::1]:45897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0HA-00066Q-Lt for incoming@patchwork.ozlabs.org; Mon, 22 May 2017 23:14:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06u-0005wf-QG for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06u-0003z2-0W for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:48 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:36082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06t-0003yu-Tg for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:47 -0400 Received: by mail-qt0-x241.google.com with SMTP id j13so20679969qta.3 for ; Mon, 22 May 2017 20:03:47 -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=6JPfWAqdR19YwBeFVFyuFuPM8XqA9YfSFY/8GQgEoNo=; b=m48nQgC/FQ6JGlNjUK7petGBs1uN9ZfU0MP663bCoI0pfWlOclxttpz2waKNyX/yCU EjT0uGiAX6LcZAdK6eWyP3zWKovyInboVc4MlwL3s4NorJJnL/5TavujLVKXTulGbnc0 EJtK5ANTJFxY9CC5PfYGQXKvMw+XsWcjJ5VzPIAdd3VUT+tr5MtkM0TjomxXXCXD9X07 +WFM0hz0/g9cynW/JUZeuQp7XYyrkeSCQ/lvV+W8kbO2Uug3NItN4cii7uBWowUjsQcS +R1au8FgBKgcffOoEmPP5NtqE2sj26YTWbnCPa/f4yIQRtNHJ8jyzvLsLXSs+P1lvGpM 0CxQ== 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=6JPfWAqdR19YwBeFVFyuFuPM8XqA9YfSFY/8GQgEoNo=; b=kFrBkC0cwDqFn8Y6hye0pl7jvVhZ6euq54RzwR5Ha15qZxcvoNol8YzNMO7LpOU1rW /3UREAaigidEwdHQdpM7x6hwumBAXf2aa7qlYBDBkadhkNnRNbkLa4mjJrAJgXwhR6jU d5jrtudFMlB46VF+fLovB/HousGm82e7FC6J14IBB/fqFaICv6stiNm1o75gwJrLfF2v mzmtCcfa2SUj96lc/zWr/3IvOf7ncPwFaI3mDvtDfAz32AoQLPuFvAK4cEUs0+OW/4OW VvOR7HYZkbNBkbRDY6xWK6rlruS/fS0PpLjbswu7eZyv5Dr3BeDVbh7PMPFCjmPKMBkh x/wg== X-Gm-Message-State: AODbwcAKfTEN88CF+2tzNgHV7d+jGUFNfaUUBrJsje4PFKXzbG0QGYsg DTbeY4nFsp8B4AOB+9s= X-Received: by 10.200.37.106 with SMTP id 39mr26706482qtn.92.1495508627249; Mon, 22 May 2017 20:03:47 -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.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:03:06 -0700 Message-Id: <20170523030312.6360-26-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:c0d::241 Subject: [Qemu-devel] [PATCH 25/31] target/s390x: Use unwind data for helper_stctl 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 | 10 ++++++---- target/s390x/translate.c | 2 -- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b169e0e..1e31bd3 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -880,11 +880,12 @@ void HELPER(lctl)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) void HELPER(stctg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { - int i; + uintptr_t ra = GETPC(); uint64_t dest = a2; + uint32_t i; for (i = r1;; i = (i + 1) % 16) { - cpu_stq_data(env, dest, env->cregs[i]); + cpu_stq_data_ra(env, dest, env->cregs[i], ra); dest += sizeof(uint64_t); if (i == r3) { @@ -895,11 +896,12 @@ void HELPER(stctg)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) void HELPER(stctl)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { - int i; + uintptr_t ra = GETPC(); uint64_t dest = a2; + uint32_t i; for (i = r1;; i = (i + 1) % 16) { - cpu_stl_data(env, dest, env->cregs[i]); + cpu_stl_data_ra(env, dest, env->cregs[i], ra); dest += sizeof(uint32_t); if (i == r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 4d964a8..3a2151f 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3617,7 +3617,6 @@ static ExitStatus op_stctg(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_stctg(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3); @@ -3629,7 +3628,6 @@ static ExitStatus op_stctl(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_stctl(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);