From patchwork Sun Sep 9 21:05:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182750 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 686032C0088 for ; Mon, 10 Sep 2012 09:21:31 +1000 (EST) Received: from localhost ([::1]:56791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAolI-0002hp-Ei for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:09:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoj1-0008GD-9A for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoiz-00067F-SD for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:26 -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 1TAoiz-0005xl-M0 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:25 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:25 -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=wxyZx3xK/CVoqvc6hMU2UqxjCsCGnKhp6u2H+B4fabw=; b=dbTIeCiZLuu5VUIr8YOL2eGzhtSs2F45wAp8nnOW8mMJ5n/d4+lmS0667LvHB7THE+ 2CaLnln1W3bUt2b9wvR/Pe5zs9HCRJlg8Kz3ee7kwCRheSFZkJDQ/4EhHDR4spuPesNt RuPuLCVNUxTFODjQoTCW3vcii2CjutqAkdC/eNh3aTtzpV9w7JzZDyduNSr42FmqIIDP oI441IIQYn9b85PoIAEBtJ9Nr5dmHX750eLvMBEuG9yJdf7IKzt1uosAh+FRBWKDvNHY ySBV5NvUjVlRD7mybDVvVqBZWzp6XETXfsr8yRREIpM4kCTcGy6c97IMnktv0PXPEs9C EOrA== Received: by 10.66.87.138 with SMTP id ay10mr18056523pab.38.1347224845428; Sun, 09 Sep 2012 14:07:25 -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.24 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:18 -0700 Message-Id: <1347224784-19472-61-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 060/126] target-s390: Convert LCTL, STCTL 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 | 4 ++++ target-s390x/translate.c | 54 +++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 745d1e6..522fe12 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -465,6 +465,8 @@ #ifndef CONFIG_USER_ONLY /* DIAGNOSE (KVM hypercall) */ C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0) +/* LOAD CONTROL */ + C(0xb700, LCTL, RS_a, Z, 0, a2, 0, 0, lctl, 0) /* LOAD PSW */ C(0x8200, LPSW, S, Z, 0, a2, 0, 0, lpsw, 0) /* LOAD REAL ADDRESS */ @@ -483,6 +485,8 @@ 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 CONTROL */ + C(0xb600, STCTL, RS_a, Z, 0, a2, 0, 0, stctl, 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 439a90d..d08b42f 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2007,36 +2007,6 @@ static void disas_s390_insn(DisasContext *s) r2 = insn & 0xf; disas_b3(s, op, r3, r1, r2); break; -#ifndef CONFIG_USER_ONLY - case 0xb6: /* STCTL R1,R3,D2(B2) [RS] */ - /* Store Control */ - check_privileged(s); - insn = ld_code4(s->pc); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - tmp32_1 = tcg_const_i32(r1); - tmp32_2 = tcg_const_i32(r3); - potential_page_fault(s); - gen_helper_stctl(cpu_env, tmp32_1, tmp, tmp32_2); - tcg_temp_free_i64(tmp); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i32(tmp32_2); - break; - case 0xb7: /* LCTL R1,R3,D2(B2) [RS] */ - /* Load Control */ - check_privileged(s); - insn = ld_code4(s->pc); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - tmp32_1 = tcg_const_i32(r1); - tmp32_2 = tcg_const_i32(r3); - potential_page_fault(s); - gen_helper_lctl(cpu_env, tmp32_1, tmp, tmp32_2); - tcg_temp_free_i64(tmp); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i32(tmp32_2); - break; -#endif case 0xb9: insn = ld_code4(s->pc); r1 = (insn >> 4) & 0xf; @@ -2843,6 +2813,18 @@ static ExitStatus op_ld64(DisasContext *s, DisasOps *o) } #ifndef CONFIG_USER_ONLY +static ExitStatus op_lctl(DisasContext *s, DisasOps *o) +{ + TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); + TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); + check_privileged(s); + potential_page_fault(s); + gen_helper_lctl(cpu_env, r1, o->in2, r3); + tcg_temp_free_i32(r1); + tcg_temp_free_i32(r3); + return NO_EXIT; +} + static ExitStatus op_lra(DisasContext *s, DisasOps *o) { check_privileged(s); @@ -3148,6 +3130,18 @@ static ExitStatus op_ssm(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_stctl(DisasContext *s, DisasOps *o) +{ + TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); + TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); + check_privileged(s); + potential_page_fault(s); + gen_helper_stctl(cpu_env, r1, o->in2, r3); + tcg_temp_free_i32(r1); + tcg_temp_free_i32(r3); + return NO_EXIT; +} + static ExitStatus op_stnsm(DisasContext *s, DisasOps *o) { uint64_t i2 = get_field(s->fields, i2);