From patchwork Sun Sep 9 21:05:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182683 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 00AE52C0089 for ; Mon, 10 Sep 2012 08:13:29 +1000 (EST) Received: from localhost ([::1]:47210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TApkt-0004i8-1c for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 18:13:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojS-0000JF-8P for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojQ-0006Fz-VR for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:54 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:63059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojQ-0005pO-P0 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:52 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:52 -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=isA7UtVtiOuhfnCDCDoV21ylfj4jvBzwEpqbfN5/yyE=; b=b5I37fWi9EixQgbOrxVyteAj/du1mtFG62LxME/MoSykt1me2wAcihLWbQ5aQTtzQ7 iY4T5Qg4B5FsvqfpRol/B01twvSzABgSTrtDHKmhMAlZk7CeiRcXDyD/vSw4Fr3t2qHc +PdqgxOQyVzaFbD2OWC5FsMMUVXFiy+Nk2ObPWiYHYubk0lE9QpyPHV7g1mK/6BTFJkI RqHLoqTGnr+5dVvnfPzXmTfVACCbpQZwXLMNPD0TT/pJoUsNudKFudyE/nyJDQVveA/R ZWOr9ng7LxCrv8DBBKsHwhRTZyYVDAfIwMuAIOqWS1yCFyhYuvwnyOzmUZoHeM3+3irs oNgQ== Received: by 10.66.90.1 with SMTP id bs1mr18158199pab.13.1347224872524; Sun, 09 Sep 2012 14:07:52 -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.51 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:49 -0700 Message-Id: <1347224784-19472-92-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.210.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 091/126] target-s390: Convert SCKC, STCKC 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 | 4 ++++ target-s390x/misc_helper.c | 8 +++----- target-s390x/translate.c | 32 ++++++++++++++------------------ 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 00608c8..011e64e 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -95,7 +95,7 @@ DEF_HELPER_FLAGS_2(spx, TCG_CALL_CONST, void, 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) +DEF_HELPER_FLAGS_1(stckc, TCG_CALL_CONST, i64, env) DEF_HELPER_FLAGS_2(spt, TCG_CALL_CONST, void, env, i64) DEF_HELPER_FLAGS_2(stpt, TCG_CALL_CONST, void, env, i64) DEF_HELPER_4(stsi, i32, env, i64, i32, i32) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index abff0cf..a2b4c73 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -636,6 +636,8 @@ /* SET CLOCK */ /* ??? Not implemented - is it necessary? */ C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0) +/* SET CLOCK COMPARATOR */ + C(0xb206, SCKC, S, Z, 0, m2_64, 0, 0, sckc, 0) /* SET SYSTEM MASK */ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ @@ -643,6 +645,8 @@ /* 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 CLOCK COMPARATOR */ + C(0xb207, STCKC, S, Z, la2, 0, new, m1_64, stckc, 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 8bff132..bdf3f09 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -773,10 +773,8 @@ uint32_t HELPER(stcke)(CPUS390XState *env, uint64_t a1) } /* Set Clock Comparator */ -void HELPER(sckc)(CPUS390XState *env, uint64_t a1) +void HELPER(sckc)(CPUS390XState *env, uint64_t time) { - uint64_t time = cpu_ldq_data(env, a1); - if (time == -1ULL) { return; } @@ -790,10 +788,10 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t a1) } /* Store Clock Comparator */ -void HELPER(stckc)(CPUS390XState *env, uint64_t a1) +uint64_t HELPER(stckc)(CPUS390XState *env) { /* XXX implement */ - cpu_stq_data(env, a1, 0); + return 0; } /* Set CPU Timer */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index dcb0c01..bcf0809 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,24 +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 0x06: /* SCKC D2(B2) [S] */ - /* Set Clock Comparator */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_sckc(cpu_env, tmp); - tcg_temp_free_i64(tmp); - break; - case 0x07: /* STCKC D2(B2) [S] */ - /* Store Clock Comparator */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_stckc(cpu_env, tmp); - tcg_temp_free_i64(tmp); - break; case 0x08: /* SPT D2(B2) [S] */ /* Set CPU Timer */ check_privileged(s); @@ -2893,6 +2875,20 @@ static ExitStatus op_stck(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_sckc(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_sckc(cpu_env, o->in2); + return NO_EXIT; +} + +static ExitStatus op_stckc(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_stckc(o->out, cpu_env); + return NO_EXIT; +} + static ExitStatus op_stnsm(DisasContext *s, DisasOps *o) { uint64_t i2 = get_field(s->fields, i2);