From patchwork Sun Sep 9 21:05:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182664 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 89FB32C0086 for ; Mon, 10 Sep 2012 07:46:09 +1000 (EST) Received: from localhost ([::1]:58456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAolw-0003dm-Ui for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:10:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojQ-0000Eg-Oj for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojP-0006FV-E2 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:52 -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 1TAojP-0005pO-2y for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:51 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:50 -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=sulCcy4htRy1K8WQMJughUczCfg1RuiI44p3iMYo16M=; b=oKfGo1hNpsrjeyNO2eVbpiiB8+MoTDZbetDPcUl7D9G0PjYJeY/AaB8LFh8EJcfp61 K0yUroqjfUojG7zmDcHzJArjqW4I9jd4Sd12vXFpepYDGYdDMem7kKLckD4V4qrTSDWA +olQmJdmwpGHe6AA/VUtwrLuATKvujo1dqzQWpNYqyHw3kwtQtkbUDUlSTdpV37Ri8sO sp1bn7sAK2tZBK7lR1cbH3O0DsgM/jPU/KJcLi56/6dDRROBCe+ltfw9LzkOluOhx9OQ 1t6DK+RtbVntPWeKXQ2jqerbKhOthTfDLSPyaiGUYEFvZm/+v5yBKvLRC6O8pN1/yY0O nytw== Received: by 10.66.75.133 with SMTP id c5mr18325820paw.24.1347224870823; Sun, 09 Sep 2012 14:07:50 -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.49 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:47 -0700 Message-Id: <1347224784-19472-90-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 089/126] target-s390: Convert SCK 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 | 1 - target-s390x/insn-data.def | 3 +++ target-s390x/misc_helper.c | 8 -------- target-s390x/translate.c | 10 ---------- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 36d3539..33af097 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -92,7 +92,6 @@ 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_FLAGS_1(sck, TCG_CALL_CONST, i32, i64) DEF_HELPER_2(stck, i32, env, i64) DEF_HELPER_2(stcke, i32, env, i64) DEF_HELPER_FLAGS_2(sckc, TCG_CALL_CONST, void, env, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index dfac564..f5129bd 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -633,6 +633,9 @@ /* We only do 64-bit, so accept this as a no-op. Let SAM24 and SAM31 signal illegal instruction. */ C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0) +/* SET CLOCK */ + /* ??? Not implemented - is it necessary? */ + C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0) /* SET SYSTEM MASK */ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 6e9978c..1a22f12 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -742,14 +742,6 @@ void HELPER(spx)(CPUS390XState *env, uint64_t a1) tlb_flush_page(env, TARGET_PAGE_SIZE); } -/* Set Clock */ -uint32_t HELPER(sck)(uint64_t a1) -{ - /* XXX not implemented - is it necessary? */ - - return 0; -} - static inline uint64_t clock_value(CPUS390XState *env) { uint64_t time; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 796da9d..7221b22 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,16 +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 0x04: /* SCK D2(B2) [S] */ - /* Set Clock */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_sck(cc_op, tmp); - set_cc_static(s); - tcg_temp_free_i64(tmp); - break; case 0x05: /* STCK D2(B2) [S] */ /* Store Clock */ decode_rs(s, insn, &r1, &r3, &b2, &d2);