From patchwork Sun Sep 9 21:05:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182706 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 DD0C62C0084 for ; Mon, 10 Sep 2012 08:43:16 +1000 (EST) Received: from localhost ([::1]:55718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAqDj-0000l1-2b for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 18:43:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojT-0000Jx-OG for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojS-0006GZ-Lg for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:55 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:63059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojS-0005pO-F5 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:54 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:54 -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=P8Q5FgrLy5MGUHyQTbTFEr5XktDBBroqBwqurAskQec=; b=JWyEz/7mSLBQtOViLZEhIbl+LCX1WoqEktGYvOVmV3UcsSLfrMq+phgJK5844h/Mun kmimVDHP6ZdjuNfHlcAFMkNMwhwrRolCyv8O/hrOxBkT0XJ2dgBciMXE0mUW/vbaLWnn bHvUvdvj9jEiomIuvwjJIOlTC2J+SAOovN9kgSG7muIrVsgALmJJ+6U13MsoYaHeaXMJ s00etvyk7mtUvt1+upqHUZqkhWscWG1kE1xVl0QkRyDwmU1zMW6DXuHqCOOdnboKLiVb LyDKA9n7/5OZGPRQ1izZqCBQdfe7JixYuTKg2V6zrz+Li7I1I+SN1U2uBxvo5wc4NAEC lIMQ== Received: by 10.66.88.1 with SMTP id bc1mr18165545pab.18.1347224874225; Sun, 09 Sep 2012 14:07:54 -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.53 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:51 -0700 Message-Id: <1347224784-19472-94-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.210.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 093/126] target-s390: Convert SPKA 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 | 20 ++++++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 29b3eb2..79ed499 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -640,6 +640,8 @@ C(0xb206, SCKC, S, Z, 0, m2_64, 0, 0, sckc, 0) /* SET CPU TIMER */ C(0xb208, SPT, S, Z, 0, m2_64, 0, 0, spt, 0) +/* SET PSW KEY FROM ADDRESS */ + C(0xb20a, SPKA, S, Z, 0, a2, 0, 0, spka, 0) /* SET SYSTEM MASK */ C(0x8000, SSM, S, Z, 0, m2_8u, 0, 0, ssm, 0) /* SIGNAL PROCESSOR */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 2043d6c..09901bc 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,18 +1030,6 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn) LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x0a: /* SPKA D2(B2) [S] */ - /* Set PSW Key from Address */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - tmp2 = tcg_temp_new_i64(); - tcg_gen_andi_i64(tmp2, psw_mask, ~PSW_MASK_KEY); - tcg_gen_shli_i64(tmp, tmp, PSW_SHIFT_KEY - 4); - tcg_gen_or_i64(psw_mask, tmp2, tmp); - tcg_temp_free_i64(tmp2); - tcg_temp_free_i64(tmp); - break; case 0x0d: /* PTLB [S] */ /* Purge TLB */ check_privileged(s); @@ -2811,6 +2799,14 @@ static ExitStatus op_sfpc(DisasContext *s, DisasOps *o) } #ifndef CONFIG_USER_ONLY +static ExitStatus op_spka(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + tcg_gen_shri_i64(o->in2, o->in2, 4); + tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, PSW_SHIFT_KEY - 4, 4); + return NO_EXIT; +} + static ExitStatus op_ssm(DisasContext *s, DisasOps *o) { check_privileged(s);