From patchwork Sun Jun 4 17:34:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 770985 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 3wglr429Gkz9ryb for ; Mon, 5 Jun 2017 03:51:31 +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="BTN9bLxZ"; dkim-atps=neutral Received: from localhost ([::1]:57897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZgW-0005Ha-Uf for incoming@patchwork.ozlabs.org; Sun, 04 Jun 2017 13:51:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZR5-0007L5-7D for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZR4-0002pt-0I for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:31 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:36338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZR3-0002pK-QU for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:29 -0400 Received: by mail-pf0-x242.google.com with SMTP id n23so18100571pfb.3 for ; Sun, 04 Jun 2017 10:35:29 -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=oBtayqCqrX5JFJ4PnTkD7y1N01uWlp7BdwDRXYhQU7Y=; b=BTN9bLxZBDukuyUEKuxvMzpODTZqL2FAuf2XWskcB2Vb7FS97bcKECdmyxJ9XsEw2C 8BnvGouVzIwIeIHWYg6ZI4cAKqvzNwpaU0TNXLMnezioW+issM0/OTXfnTiB7N8tFiIO vQD1FkRtmNRZI34/uh8tCwXUPE6FRlso0CAh5n4UpVLW1y0BAbwm2xg6LEoVOYq8OhjL rYupyBrAfgrpveTSLQnNbksQhjz4sPcDiUGTY5888H2mLgyP9AgnrnhPZQ5teXyW5T75 aEu/TZGrNyrDZtz13CnluqIK/dpJBIMFihVUpsVMTJQLZSi0s6SW8Y79/iyCuDoNOuVl YuIw== 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=oBtayqCqrX5JFJ4PnTkD7y1N01uWlp7BdwDRXYhQU7Y=; b=GI1GZFanU2US7yGHAU5PBP2NZgp9ss75xYcAx5V9UJ3oqwtR1qvbKk+Cd0ypTVUnVl GTV3D827wztrfwNV93nynZ9jMEwiIfMe2KHxodjR4wvuC6CjwChPeedBcpz9snOWUn6b vFHURhmAs4tfc+p5V5c938nJwXO/ADp6o6mTWtt2FsFMrZHzjS2d/irYGlC+xTjRnUCd 06+Ls9bEw6g/pH1T8oDUteg3s9cQZK68+nJ0uZtXMlZGS+KfeumPmS45VFJx6cH3KKxH EKHRLHeyG5katZOg5Aa8JmoS98nwq690/brPFKnvcCf1qfZ4o552qVw+QnQrNN9NnsuG 7BzA== X-Gm-Message-State: AODbwcDVG14uiZv1uwrxKF94ts4J1rn9IBN6mF6XFNnFC08P17THRbzI d4gZaznPnSVxjv8WwDc= X-Received: by 10.99.115.82 with SMTP id d18mr16106546pgn.155.1496597728771; Sun, 04 Jun 2017 10:35:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:12 -0700 Message-Id: <20170604173509.29684-13-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:c00::242 Subject: [Qemu-devel] [PULL 12/69] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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) } /* move page */ -void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) +uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) { - /* XXX missing r0 handling */ - env->cc_op = 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 */ } /* string copy (c is string terminator) */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index a24e288..f55f10a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2916,8 +2916,7 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o) 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; }