From patchwork Sun Sep 9 21:05:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 89A932C0097 for ; Mon, 10 Sep 2012 07:24:47 +1000 (EST) Received: from localhost ([::1]:43733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAozl-0002mZ-KC for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:24:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojR-0000GA-8q for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojQ-0006Fh-5U for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:53 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojP-0005xl-Ts for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:52 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=PYdNVEtajlFrbC0pKFBR/LhLZo9KMMN2QENvFd67QgU=; b=V3B0zPdrI+iuFiaWYMcLGFKdjpRSop8PxEdBsAMxY6zD3fraKVtYN1OmvRF9l09c2c j9aTO0P7SBy2MMuqNpdJF6Bry8VK9XFz/OX+SdAwQ3u51O3Ik3FVKlxP11mV4yWSbXe8 FDTr5D7N9UzL8ftPdF5820oWL789bQsetRjnSoMT2aNUIB76FvyMqMaXUXvJ8jY+C57O iYX4KE/u60ZgJPtE94FnKgVGP0o7lYCGOqjC7bjYCfUlhCHpTdPbErqFWtQFyp1RN4OU 1rra1i4ZgZ3al0rqg1Km2fcWzinEXMutxLOeCwA99EC7hjv1a0SieFNnNA+F9PNpnEep inWg== Received: by 10.68.136.40 with SMTP id px8mr2045486pbb.153.1347224871689; Sun, 09 Sep 2012 14:07:51 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id tw5sm662053pbc.48.2012.09.09.14.07.50 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:48 -0700 Message-Id: <1347224784-19472-91-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1347224784-19472-1-git-send-email-rth@twiddle.net> References: <1347224784-19472-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 090/126] target-s390: Convert STCK X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson --- target-s390x/helper.h | 2 +- target-s390x/insn-data.def | 3 +++ target-s390x/misc_helper.c | 6 ++---- target-s390x/translate.c | 17 ++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 33af097..00608c8 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -92,7 +92,7 @@ DEF_HELPER_4(diag, i64, env, i32, i64, i64) DEF_HELPER_3(load_psw, void, env, i64, i64) DEF_HELPER_1(program_interrupt, void, i32) DEF_HELPER_FLAGS_2(spx, TCG_CALL_CONST, void, env, i64) -DEF_HELPER_2(stck, i32, env, i64) +DEF_HELPER_FLAGS_1(stck, TCG_CALL_CONST | TCG_CALL_PURE, i64, env) DEF_HELPER_2(stcke, i32, env, i64) DEF_HELPER_FLAGS_2(sckc, TCG_CALL_CONST, void, env, i64) DEF_HELPER_FLAGS_2(stckc, TCG_CALL_CONST, void, env, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index f5129bd..abff0cf 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -640,6 +640,9 @@ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ C(0xae00, SIGP, RS_a, Z, r3_o, a2, 0, 0, sigp, 0) +/* STORE CLOCK */ + C(0xb205, STCK, S, Z, la2, 0, new, m1_64, stck, 0) + C(0xb27c, STCKF, S, Z, la2, 0, new, m1_64, stck, 0) /* STORE CONTROL */ C(0xb600, STCTL, RS_a, Z, 0, a2, 0, 0, stctl, 0) C(0xeb25, STCTG, RSY_a, Z, 0, a2, 0, 0, stctg, 0) diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 1a22f12..8bff132 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -753,11 +753,9 @@ static inline uint64_t clock_value(CPUS390XState *env) } /* Store Clock */ -uint32_t HELPER(stck)(CPUS390XState *env, uint64_t a1) +uint64_t HELPER(stck)(CPUS390XState *env) { - cpu_stq_data(env, a1, clock_value(env)); - - return 0; + return clock_value(env); } /* Store Clock Extended */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 7221b22..dcb0c01 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,15 +1030,6 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn) LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x05: /* STCK D2(B2) [S] */ - /* Store Clock */ - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_stck(cc_op, cpu_env, tmp); - set_cc_static(s); - tcg_temp_free_i64(tmp); - break; case 0x06: /* SCKC D2(B2) [S] */ /* Set Clock Comparator */ check_privileged(s); @@ -2894,6 +2885,14 @@ static ExitStatus op_stidp(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_stck(DisasContext *s, DisasOps *o) +{ + gen_helper_stck(o->out, cpu_env); + /* ??? We don't implement clock states. */ + gen_op_movi_cc(s, 0); + return NO_EXIT; +} + static ExitStatus op_stnsm(DisasContext *s, DisasOps *o) { uint64_t i2 = get_field(s->fields, i2);