From patchwork Sun Sep 9 21:05:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182713 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 9D38C2C00A5 for ; Mon, 10 Sep 2012 08:52:36 +1000 (EST) Received: from localhost ([::1]:58906 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAomA-0003tm-1B for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:10:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojZ-0000QB-Mf for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojY-0006Ih-4S for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:01 -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 1TAojX-0005xl-RU for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:00 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:59 -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=kPj/LUhHHBmCaQXqL4rGi83uHghoyRn7NFuGjp/eaeE=; b=kNkZZNp+VZI9H7JmgPEtgs6Dvh5zCBrbhyrJeNf2DHJHFlZI5KJZWvYY2d+DkTJt06 jdbeN9kqNL4rjoqoubmyWG5x/hTh3iU4GL7xyX33mn8rm4YEyUSGXjwx+5kQPLkg3SLs ue7vIQsjf/GBUMQxtFU1fU/1ZaahjHwqStCCOzvPnAEV39pmafvdsZrgPpBlaJMXrs2m pL56DuD1o/XPBdEZxHn6jDapyVWKDMN2Yysd+5T2KoQMADmiZETXzEijLBStFct41Tq6 e+B45v2/TTgZ7NdZbNesjclSiiu2qNWYzeDfJMER8/6nKr5Heg8iQkMPU+Ncckau7X33 X6wg== Received: by 10.66.83.129 with SMTP id q1mr18254729pay.4.1347224879584; Sun, 09 Sep 2012 14:07:59 -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.58 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:57 -0700 Message-Id: <1347224784-19472-100-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 099/126] target-s390: Convert SSKE 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/helper.h | 2 +- target-s390x/insn-data.def | 2 ++ target-s390x/mem_helper.c | 2 +- target-s390x/translate.c | 18 +++++++----------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 13ceeec..aca4158 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -105,7 +105,7 @@ DEF_HELPER_4(stctl, void, env, i32, i64, i32) DEF_HELPER_4(stctg, void, env, i32, i64, i32) DEF_HELPER_FLAGS_2(tprot, TCG_CALL_CONST, i32, i64, i64) DEF_HELPER_FLAGS_2(iske, TCG_CALL_PURE|TCG_CALL_CONST, i64, env, i64) -DEF_HELPER_FLAGS_3(sske, TCG_CALL_CONST, void, env, i32, i64) +DEF_HELPER_FLAGS_3(sske, TCG_CALL_CONST, void, env, i64, i64) DEF_HELPER_FLAGS_3(rrbe, TCG_CALL_CONST, i32, env, i32, i64) DEF_HELPER_3(csp, i32, env, i32, i32) DEF_HELPER_4(mvcs, i32, env, i64, i64, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 3af659a..4f944e2 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -650,6 +650,8 @@ C(0xb210, SPX, S, Z, 0, m2_32u, 0, 0, spx, 0) /* SET PSW KEY FROM ADDRESS */ C(0xb20a, SPKA, S, Z, 0, a2, 0, 0, spka, 0) +/* SET STORAGE KEY EXTENDED */ + C(0xb22b, SSKE, RRF_c, Z, r1_o, r2_o, 0, 0, sske, 0) /* SET SYSTEM MASK */ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index a700bb0..4c19deb 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -948,7 +948,7 @@ uint64_t HELPER(iske)(CPUS390XState *env, uint64_t r2) } /* set storage key extended */ -void HELPER(sske)(CPUS390XState *env, uint32_t r1, uint64_t r2) +void HELPER(sske)(CPUS390XState *env, uint64_t r1, uint64_t r2) { uint64_t addr = get_address(env, 0, 0, r2); diff --git a/target-s390x/translate.c b/target-s390x/translate.c index b39ecc8..9e047eb 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1042,17 +1042,6 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn) tcg_temp_free_i32(tmp32_1); tcg_temp_free_i64(tmp); break; - case 0x2b: /* SSKE R1,R2 [RRE] */ - /* Set Storage Key Extended */ - check_privileged(s); - r1 = (insn >> 4) & 0xf; - r2 = insn & 0xf; - tmp32_1 = load_reg32(r1); - tmp = load_reg(r2); - gen_helper_sske(cpu_env, tmp32_1, tmp); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i64(tmp); - break; case 0x34: /* STCH ? */ /* Store Subchannel */ check_privileged(s); @@ -2770,6 +2759,13 @@ static ExitStatus op_spka(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_sske(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_sske(cpu_env, o->in1, o->in2); + return NO_EXIT; +} + static ExitStatus op_ssm(DisasContext *s, DisasOps *o) { check_privileged(s);