From patchwork Sun Sep 9 21:05:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182726 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 4E1F82C0087 for ; Mon, 10 Sep 2012 09:03:53 +1000 (EST) Received: from localhost ([::1]:59245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAomK-000453-82 for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:10:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojb-0000UZ-AI for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojZ-0006J8-NY for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:03 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojZ-0005pQ-GI for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:01 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so291958pbb.4 for ; Sun, 09 Sep 2012 14:08:01 -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=/2AEvzjIiFJj/68/YMzZElZwQfzUX50itMAb/2OEA3U=; b=rogJtY6YvYLWldvjwZzTIsRz1YPu0b5C4c5MHuHsxeIOZkY7ZKJ6IqxG0Sd48VT5PU QDs+p308kj3QWeC9e3vPBQSVFatmpOJKiFxrqVX59Gt2IWHHw4UoeDZDvuRlnJHK0wmA Why3naEumH+uNYhCh8D0HMDqPSEK4hctN7RS7/r9UGaifU17AboGnHKJ8h9PLpLEN2fi k0qMwmYJgy29KkQSFoDVzFFLxmRBLMp1tS3+CCPjJKex4A7HOJDUaAs5fZxf/zYOirZ9 HZi+vZJ9NLY8wDFlAJs164MK5forbNMw5Ph1KXtG9jaCoX/9qqnhR5rXnq7/L2rwZzUR yNCw== Received: by 10.68.229.73 with SMTP id so9mr2066606pbc.66.1347224881254; Sun, 09 Sep 2012 14:08:01 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id tw5sm662053pbc.48.2012.09.09.14.08.00 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:08:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:59 -0700 Message-Id: <1347224784-19472-102-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 101/126] 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 Note that 0xb25f is not listed in PoO -08 as a valid insn. I believe the "CHSC" listed in the old code must be a typo for the "CSCH" insn at 0xb230. Because I'm not 100% certain what the errant entry was supposed to be, I've listed 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 | 11 +++++++++++ target-s390x/translate.c | 18 ++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 5a38750..6b5f934 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -680,4 +680,15 @@ C(0xad00, STOSM, SI, Z, la1, 0, new, m1_8, stosm, 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) #endif /* CONFIG_USER_ONLY */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index b4c8633..d714308 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,11 +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 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); @@ -1059,11 +1054,6 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn) 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); @@ -2855,6 +2845,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);