From patchwork Sun Sep 9 21:05:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182692 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 EF6F32C009D for ; Mon, 10 Sep 2012 08:30:46 +1000 (EST) Received: from localhost ([::1]:56789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAolH-0002hl-TI for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:09:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoiz-0008BW-Ay for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoiy-00066k-3c for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:25 -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 1TAoix-0005xl-U5 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:24 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:23 -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=NY6L8Vomyw4iJttSVOUzMnECdBh3RiFB05QaLKL4yCE=; b=w/KW4IjGzvdF1t1/zy8ueRQMdMXEMbNL5CyC2oxsW4gJGPNs8nZYGrdra9jK3JrbSx s2MRqwombeNeK6VbaF9ncsE7YiDqkP7PDJysJ4u+dGPSnrhJookBebSWaHmih4aB6Mo1 DpSAlIn4wmzMBOnG6CLe7NshoCQVfz+2rsoBnzngeJfCpi73IRnP7cZiMedpDLUx3v1h stgHT2BemX8aJ9IhzE9KYMU+AsZRK+7MZ3ZQVdEn++HEoLnaFtGbGdzOkJcb+dbm2lBI V+GEk5+pIS3T/k+ptszGEN7e46jFz/B38tgDDt7Q7UdwILQYvm5pA44JWKiBkDzocNKJ bz3g== Received: by 10.68.135.199 with SMTP id pu7mr2079205pbb.0.1347224843692; Sun, 09 Sep 2012 14:07:23 -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.22 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:16 -0700 Message-Id: <1347224784-19472-59-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 058/126] target-s390: Convert SIGP 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/insn-data.def | 2 ++ target-s390x/translate.c | 28 ++++++++++++---------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index a078cc5..95f9987 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -475,6 +475,8 @@ C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0) /* SET SYSTEM MASK */ 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 THEN AND SYSTEM MASK */ C(0xac00, STNSM, SI, Z, la1, 0, new, m1_8, stnsm, 0) /* STORE THEN OR SYSTEM MASK */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 1829b25..698cb99 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2000,22 +2000,6 @@ static void disas_s390_insn(DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { -#ifndef CONFIG_USER_ONLY - case 0xae: /* SIGP R1,R3,D2(B2) [RS] */ - check_privileged(s); - insn = ld_code4(s->pc); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - tmp2 = load_reg(r3); - tmp32_1 = tcg_const_i32(r1); - potential_page_fault(s); - gen_helper_sigp(cc_op, cpu_env, tmp, tmp32_1, tmp2); - set_cc_static(s); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - tcg_temp_free_i32(tmp32_1); - break; -#endif case 0xb2: insn = ld_code4(s->pc); op = (insn >> 16) & 0xff; @@ -3129,6 +3113,18 @@ static ExitStatus op_rll64(DisasContext *s, DisasOps *o) return NO_EXIT; } +#ifndef CONFIG_USER_ONLY +static ExitStatus op_sigp(DisasContext *s, DisasOps *o) +{ + TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); + check_privileged(s); + potential_page_fault(s); + gen_helper_sigp(cc_op, cpu_env, o->in2, r1, o->in1); + tcg_temp_free_i32(r1); + return NO_EXIT; +} +#endif + static ExitStatus op_sla(DisasContext *s, DisasOps *o) { uint64_t sign = 1ull << s->insn->data;