From nobody Wed Nov 5 17:23:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496795772981349.7332265780849; Tue, 6 Jun 2017 17:36:12 -0700 (PDT) Received: from localhost ([::1]:40576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOxH-0006Rn-Nc for importer@patchew.org; Tue, 06 Jun 2017 20:36:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOsw-0002Ub-UV for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOsv-0001tz-Ln for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:42 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:35614) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOsv-0001tp-Hj for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:41 -0400 Received: by mail-qk0-x244.google.com with SMTP id u129so438509qka.2 for ; Tue, 06 Jun 2017 17:31:41 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:40 -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=E8qWpXtOC71OufwP8EUI/mYVWfZRp7WpeAuKvgo8hLM=; b=BzEv03S/CDtNe6p3Rwk4hMMB5w/9sby6EONkc7I6NI6+d7+Pqlbyb/076CiU363zTX UxZ88bZNnf4Ai/Sehx52IoPP+5RoQAeOagCVeKGrPFM2oH54UbmNg+n7jfme9hcoL9vv hLAevq0iPcWok6hI+WiMVEzBdx/E6wo8qhZsHpctdyQCG1sdTDjjSONCqZ2leFNdXtHQ QcOQTR4ba3NlL4vLEFcr0yI+7MdZcK/VwqMDmM+10Ck6x4gaJiVzOcHh8lrCSBQkQc4O ytWDo/aoqG+z6Djpw48+LPYZLiIe9AS6ViqckMbbwJnsyRzSrONyTwaZxp9dAEIEmeRf GbKA== 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=E8qWpXtOC71OufwP8EUI/mYVWfZRp7WpeAuKvgo8hLM=; b=KA2yHTrOnNzpKyXQ2xlDnlc509DuYqwLjiOUPdWI/8LmAz0XyIa15of/yd6e1AkCg8 MZ34DRA7bYFy+qxusxrfk5bnB6tTB33/YR1eyxRuDCtFcecOJdfoGFX1KbNOdPNpewYs yGa10uYg/Zhk/FpUzkERrrpka77//yO23CK6x6rE1VUbu0vZbwZ/6DZo4wCxfU8W1L5a q6WhLs3jGQf/yqS12Rm5aIV6Z7HUEmlTPBpNIpUcM9rboPQ5zdGS88sk52W9386RuaOR IC5u38QBIS1cOL14OY+35Bm3XL6qEV66D/kx0AePWt4XaMIhKK2ffapejbOdSoNgbVRF 8hXw== X-Gm-Message-State: AKS2vOwmWBCEza3rW44w2y7MucK6UousSHEnN8gNaDlsVYe9OS6ZXw3m UvnyQsXLOH1U+BiJzGo= X-Received: by 10.55.4.139 with SMTP id 133mr35619596qke.204.1496795500875; Tue, 06 Jun 2017 17:31:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:21 -0700 Message-Id: <20170607003119.14778-13-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::244 Subject: [Qemu-devel] [PULL v2 12/70] target/s390x: Use unwind data for helper_mvpg 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/helper.h | 2 +- target/s390x/mem_helper.c | 9 +++++---- target/s390x/translate.c | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index 1fae191..ea35834 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -12,7 +12,7 @@ DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64,= s64) DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64) DEF_HELPER_4(srst, i64, env, i64, i64, i64) DEF_HELPER_4(clst, i64, env, i64, i64, i64) -DEF_HELPER_4(mvpg, void, env, i64, i64, i64) +DEF_HELPER_FLAGS_4(mvpg, TCG_CALL_NO_WG, i32, env, i64, i64, i64) DEF_HELPER_4(mvst, i64, env, i64, i64, i64) DEF_HELPER_5(ex, i32, env, i32, i64, i64, i64) DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index af2801e..1c36a47 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -398,11 +398,12 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c,= uint64_t s1, uint64_t s2) } =20 /* move page */ -void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r= 2) +uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64= _t r2) { - /* XXX missing r0 handling */ - env->cc_op =3D 0; - fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, 0); + /* ??? missing r0 handling, which includes access keys, but more + importantly optional suppression of the exception! */ + fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, GETPC()); + return 0; /* data moved */ } =20 /* string copy (c is string terminator) */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index b87755e..ae29889 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2921,8 +2921,7 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *= o) =20 static ExitStatus op_mvpg(DisasContext *s, DisasOps *o) { - potential_page_fault(s); - gen_helper_mvpg(cpu_env, regs[0], o->in1, o->in2); + gen_helper_mvpg(cc_op, cpu_env, regs[0], o->in1, o->in2); set_cc_static(s); return NO_EXIT; } --=20 2.9.4