From patchwork Sun Jun 4 17:34:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 770982 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 3wgln30Q3Hz9s03 for ; Mon, 5 Jun 2017 03:48:55 +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="clTYHAFZ"; dkim-atps=neutral Received: from localhost ([::1]:57883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZe0-00036C-L0 for incoming@patchwork.ozlabs.org; Sun, 04 Jun 2017 13:48:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZR2-0007Jy-3f for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZR1-0002n1-5q for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:28 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:35862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZR1-0002mk-0w for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:27 -0400 Received: by mail-pg0-x244.google.com with SMTP id v18so3985269pgb.3 for ; Sun, 04 Jun 2017 10:35:26 -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=3JtzHY/kU5dl2FTSozLeYnTXzchr4UvfJWi+tQKChcM=; b=clTYHAFZNEa0IMbPOjYySeV2KbsaZ/gfBchX183TRj/pGgbs7Kce885nwbcQfIPu9X OiLb8shKElighbg/2Bi3mld5OhUGPWMMiiR1UvuJ62bZA0C8GUN+VfBuSUTatctFCHD2 H27VR3Lzb9P2ezuE1z7+QY0b60/zHiq6/f9JcTZzFLFD2leWdKytxJFW1+vrd3334jf1 rf24ZEgxJuJVnZT2dbYP0Tlqo5Irr1rNJXtlDwDqzZzNWVu2iQvW6Vcfp7O8R1pVMVVO G5/l7bqi6cIf5U2BZ5Vhi5c70M8nAYQbhh5c+qxe21B1hRe9R/xPBZ3qlCC8SVA6uPxi wJmg== 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=3JtzHY/kU5dl2FTSozLeYnTXzchr4UvfJWi+tQKChcM=; b=rtuD3C1qeIgLz+V8KM8at2tFBZkEOBCby4s6isZebkveqVmeVCqVs26ibSePEw+B1w +1h5LEQ2HkUMoFlMzj0XZDkoaDfPdx+jyOvxliCZM63WMr2oo8g9A0XZcHpSdBrMs/UZ WO1YLGOz2PUy9pc/YA2BtPdbZRu6U5WUfFkWuCAPFGYAzyNUyuhWUd6eolLzwLTeUVQe 49J/M1yni6pJTzxmFVVLoyitod7QK17UwRFgerMM9FWM3486MrQMwNcdgKpf7VBcq09P fI5CQiHWuAYqDTg94cPJT8jCTrnJLmzlmX2fZd2yt7mtBj0x2Z6dJ4HmoeHtdN5ngAfe x/Pg== X-Gm-Message-State: AODbwcDhnX+X9MXozublLymdoTlEc2kuBEHbX+s2nXiKIgEHLsHbAm91 1fBuFM2wJv27Lvq0+ms= X-Received: by 10.84.194.34 with SMTP id g31mr10354026pld.89.1496597725965; Sun, 04 Jun 2017 10:35:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:10 -0700 Message-Id: <20170604173509.29684-11-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::244 Subject: [Qemu-devel] [PULL 10/69] target/s390x: Use unwind data for helper_srst 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 | 3 ++- target/s390x/translate.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 3e75cae..33d83e5 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -327,6 +327,7 @@ static inline uint64_t get_address_31fix(CPUS390XState *env, int reg) uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, uint64_t str) { + uintptr_t ra = GETPC(); uint32_t len; uint8_t v, c = r0; @@ -344,7 +345,7 @@ uint64_t HELPER(srst)(CPUS390XState *env, uint64_t r0, uint64_t end, env->cc_op = 2; return end; } - v = cpu_ldub_data(env, str + len); + v = cpu_ldub_data_ra(env, str + len, ra); if (v == c) { /* Character found. Set R1 to the location; R2 is unmodified. */ env->cc_op = 1; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 34ccc22..cd33c51 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3972,7 +3972,6 @@ static ExitStatus op_stmh(DisasContext *s, DisasOps *o) static ExitStatus op_srst(DisasContext *s, DisasOps *o) { - potential_page_fault(s); gen_helper_srst(o->in1, cpu_env, regs[0], o->in1, o->in2); set_cc_static(s); return_low128(o->in2);