From patchwork Thu Sep 27 23:31:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187547 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 235072C008B for ; Fri, 28 Sep 2012 09:31:19 +1000 (EST) Received: from localhost ([::1]:58435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNY5-00077N-9V for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 19:31:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNXw-00076W-60 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:31:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THNXv-0002oQ-4Z for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:31:08 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:40111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNXu-0002oL-Tz for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:31:07 -0400 Received: by pbbrp2 with SMTP id rp2so4307981pbb.4 for ; Thu, 27 Sep 2012 16:31:06 -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=gLcsxjC91TGu1JqWKMSMKOTkOT30TjuZiCAIK/nJ3kQ=; b=w/9bwLHpwrlgIj4LE8Sjq2r/2vveskjR6OwAFmGhTW76sKhvMFBzXCTGUjdAAqHpCI 8OjzmDCNdjCzkKp1KrLGd9khw6F6shDQs5OYReOllGrd7+WLQKhR0LrMIFvC5fQlHGyr 40XvtxzjbISaUPLKcI7NFtJ9W7ne+eblaDSDzISfISosGlPdCCDZsjjrmy8mK5xAIgrC dresfJNga1VRmJTX0uFt2++wwbFrL7uZYFQ8+TvhyZq/tKUKWMsajqgydGcThPfixuUy Fpq/XR/qfFi/VLCtsJJVhkddwOdiy8e5ONz8IATstb40XIBbuKtOF5rV64DZVR0844O9 n9dA== Received: by 10.66.79.36 with SMTP id g4mr13047170pax.67.1348788666114; Thu, 27 Sep 2012 16:31:06 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id w4sm4427570paz.38.2012.09.27.16.31.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 16:31:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 16:31:02 -0700 Message-Id: <1348788662-24354-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 040/147] target-s390: Convert SUPERVISOR CALL 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 | 3 +++ target-s390x/translate.c | 34 +++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 69af25d..7a0c999 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -337,6 +337,9 @@ C(0xe399, SLB, RXY_a, Z, r1, m2_32u, new, r1_32, subb, subb32) C(0xe389, SLBG, RXY_a, Z, r1, m2_64, r1, 0, subb, subb64) +/* SUPERVISOR CALL */ + C(0x0a00, SVC, I, Z, 0, 0, 0, 0, svc, 0) + /* TEST UNDER MASK */ C(0x9100, TM, SI, Z, m1_8u, i2_8u, 0, 0, 0, tm32) C(0xeb51, TMY, SIY, LD, m1_8u, i2_8u, 0, 0, 0, tm32) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 5b64959..d0adf5a 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2371,21 +2371,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { - case 0xa: /* SVC I [RR] */ - insn = ld_code2(env, s->pc); - debug_insn(insn); - i = insn & 0xff; - update_psw_addr(s); - gen_op_calc_cc(s); - tmp32_1 = tcg_const_i32(i); - tmp32_2 = tcg_const_i32(s->next_pc - s->pc); - tcg_gen_st_i32(tmp32_1, cpu_env, offsetof(CPUS390XState, int_svc_code)); - tcg_gen_st_i32(tmp32_2, cpu_env, offsetof(CPUS390XState, int_svc_ilen)); - gen_exception(EXCP_SVC); - s->is_jmp = DISAS_EXCP; - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i32(tmp32_2); - break; case 0xe: /* MVCL R1,R2 [RR] */ insn = ld_code2(env, s->pc); decode_rr(s, insn, &r1, &r2); @@ -3717,6 +3702,25 @@ static ExitStatus op_subb(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_svc(DisasContext *s, DisasOps *o) +{ + TCGv_i32 t; + + update_psw_addr(s); + gen_op_calc_cc(s); + + t = tcg_const_i32(get_field(s->fields, i1) & 0xff); + tcg_gen_st_i32(t, cpu_env, offsetof(CPUS390XState, int_svc_code)); + tcg_temp_free_i32(t); + + t = tcg_const_i32(s->next_pc - s->pc); + tcg_gen_st_i32(t, cpu_env, offsetof(CPUS390XState, int_svc_ilen)); + tcg_temp_free_i32(t); + + gen_exception(EXCP_SVC); + return EXIT_NORETURN; +} + static ExitStatus op_xor(DisasContext *s, DisasOps *o) { tcg_gen_xor_i64(o->out, o->in1, o->in2);