From patchwork Fri Sep 28 00:43:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187631 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 405C82C00B7 for ; Fri, 28 Sep 2012 10:43:38 +1000 (EST) Received: from localhost ([::1]:44137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOg4-0004tS-F6 for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 20:43:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOfx-0004tM-GU for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:43:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOfw-0001lT-Dp for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:43:29 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:37317) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOfw-0001lP-78 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:43:28 -0400 Received: by pbbrp2 with SMTP id rp2so4371100pbb.4 for ; Thu, 27 Sep 2012 17:43:27 -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=Hf2ai0K+oAlFtnVHARKWXOV/sh9nglN8QwjsI0MRuwk=; b=DOfE/lq7SiDNWf+idB/uRrnyLR08HUr6mQ4U2XGJUhkjVfhgIqrU6Lh4puRgzGdVmh volOUnf4cv+g8ZltCMdKa/VW1jlzJJfw3823afR9d+qRZ46df9biQJv5osM3AxXdP+ur gxx+/aqWoeC3n+LsJdiRLbfXfzjvH7fVGD2XPlOn9C66FNusOnxmT3DSP3NbvCBCrgpH GEicW+qTGOikIkqUGt5wCuA2LWvbE9yP41/5o5/urdprPq/4id4lZ6XNZdIkQspz96NP KxpZyywJufYxjCCwt2RBYf1tZuDtQCpwNlGhQOK7Wfi7J1PrdYqbkpsg5N2ElzXTyIuZ bIyA== Received: by 10.66.78.6 with SMTP id x6mr13448635paw.41.1348793007393; Thu, 27 Sep 2012 17:43:27 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id f9sm4542716paz.1.2012.09.27.17.43.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 17:43:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 17:43:23 -0700 Message-Id: <1348793003-27352-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-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 108/147] target-s390: Convert subchannel instructions 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 While we're at it, list all of the chapter 14 subchannel insns. Which is easy since all merely need indicate non-operation. Signed-off-by: Richard Henderson --- target-s390x/insn-data.def | 14 ++++++++++++++ target-s390x/translate.c | 18 ++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 2a04572..24a419c 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -680,4 +680,18 @@ C(0xad00, STOSM, SI, Z, la1, 0, 0, 0, stnosm, 0) /* TEST PROTECTION */ C(0xe501, TPROT, SSE, Z, la1, a2, 0, 0, tprot, 0) + +/* I/O Instructions. For each we simply indicate non-operation. */ + C(0xb276, XSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb230, CSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb231, HSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb232, MSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb23b, RCHP, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb238, RSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb233, SSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb234, STSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + C(0xb235, TSCH, S, Z, 0, 0, 0, 0, subchannel, 0) + /* ??? Not listed in PoO ninth edition, but there's a linux driver that + uses it: "A CHSC subchannel is usually present on LPAR only." */ + C(0xb25f, CHSC, S, Z, 0, 0, 0, 0, subchannel, 0) #endif /* CONFIG_USER_ONLY */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index e211a60..334d4ea 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,11 +1033,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x34: /* STCH ? */ - /* Store Subchannel */ - check_privileged(s); - gen_op_movi_cc(s, 3); - break; case 0x46: /* STURA R1,R2 [RRE] */ /* Store Using Real Address */ check_privileged(s); @@ -1062,11 +1057,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, tcg_temp_free_i32(tmp32_1); tcg_temp_free_i32(tmp32_2); break; - case 0x5f: /* CHSC ? */ - /* Channel Subsystem Call */ - check_privileged(s); - gen_op_movi_cc(s, 3); - break; case 0x78: /* STCKE D2(B2) [S] */ /* Store Clock Extended */ decode_rs(s, insn, &r1, &r3, &b2, &d2); @@ -2916,6 +2906,14 @@ static ExitStatus op_spx(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_subchannel(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + /* Not operational. */ + gen_op_movi_cc(s, 3); + return NO_EXIT; +} + static ExitStatus op_stpx(DisasContext *s, DisasOps *o) { check_privileged(s);