From patchwork Thu Sep 27 23:57:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187582 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 4E4AE2C00A2 for ; Fri, 28 Sep 2012 09:57:56 +1000 (EST) Received: from localhost ([::1]:53387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNxq-0002VM-Iu for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 19:57:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNxj-0002Uq-Mc for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:57:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THNxi-0003G4-O2 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:57:47 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:40411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNxi-0003Fy-HM for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:57:46 -0400 Received: by dadn15 with SMTP id n15so512903dad.4 for ; Thu, 27 Sep 2012 16:57:45 -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=xfrvJwn5F8hNLQllSyYXGX3lPkESXehxFXeLYFlb0I0=; b=Bmz+KqO/gWRoDoP0lRQ5CPHkK1Yriizjm24+n75NBUAFiXvQ8Eo/MFtwhlnAr3/bTk JdirHGPegSOMacSxHxosQfFYGdtHq86NyALDLWWxYYQuNDIfE4D5+YUoqklOCIwdkm9I 04zDAG/DxSS7OQ7hDbahi2UJ0MLettvgzYWs+GKamS9BmRZGZaTlJLgJhUBhudIWbAmL GJuBrDPLSGDvrEStI6Yd4QX7jpN/8l6orCT78ECGBk1KPJdUDk6GUsyJnIbnbEhL4Heb 7G4mFWwZcKI7tBnWkxUEQ/aQLJNhj2izHP63Fg4Ijm5X2YJLnTnJvyYcF/5ZquYnhWER l6Xg== Received: by 10.68.131.5 with SMTP id oi5mr15729561pbb.56.1348790265621; Thu, 27 Sep 2012 16:57:45 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id uz3sm4578023pbc.19.2012.09.27.16.57.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 16:57:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 16:57:41 -0700 Message-Id: <1348790261-25448-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.210.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 065/147] 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 a83ce95..899c6a5 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, 0, 0, stnosm, 0) /* STORE THEN OR SYSTEM MASK */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 550d6bb..1e63a0d 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2007,22 +2007,6 @@ static void disas_s390_insn(CPUS390XState *env, 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(env, 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(env, s->pc); op = (insn >> 16) & 0xff; @@ -3194,6 +3178,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;