From patchwork Sun Sep 9 21:05:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182728 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 3D3DA2C0087 for ; Mon, 10 Sep 2012 09:04:26 +1000 (EST) Received: from localhost ([::1]:57723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAolc-0003DR-Bz for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:10:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojY-0000MD-4p for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojX-0006IM-2B for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:00 -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 1TAojW-0005pO-Sr for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:59 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:58 -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=fFLh+/6WK2+jMiIMUqmZmexAa31dkq0YEXwjrOljFME=; b=uduwcuJVUihHGaGFkXnxemkN/SrJO+U+Unyyye6UT194CsuoapfAfgPycl6K9DCa5d ky/N0N8tDl76hYYd8dusiEIYCrsFt0TJdemFxRgjsgmgj2JFouWjAnpAH6wO070XLmCS tm7/rJMr/f7kDU4pb+mGpcHnURUg0/ijN1ENBEbHsFQR5EwaRHpal8gvf8NKIEVZqTln 7dsA6GZVi0Qmdqf/v1qa2vFZg7gSYRYLN8qIIkyJ01ju912PsV7kjzwyT2pSPqTnzFzJ 2uuNYvjB6G4AfdTbatF8QRPdpdJeu6kEUNwuOkv5uRVfRFqoQGF/5vAUtFogcun4FAzj AMcg== Received: by 10.68.220.201 with SMTP id py9mr2037338pbc.137.1347224878639; Sun, 09 Sep 2012 14:07:58 -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.57 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:56 -0700 Message-Id: <1347224784-19472-99-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 098/126] target-s390: Convert ISKE 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 | 19 +++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index ba7b876..3af659a 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -616,6 +616,8 @@ #ifndef CONFIG_USER_ONLY /* DIAGNOSE (KVM hypercall) */ C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0) +/* INSERT STORAGE KEY EXTENDED */ + C(0xb229, ISKE, RRE, Z, 0, r2_o, new, r1_8, iske, 0) /* INVALIDATE PAGE TABLE ENTRY */ C(0xb221, IPTE, RRF_a, Z, r1_o, r2_o, 0, 0, ipte, 0) /* LOAD CONTROL */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index a677ded..b39ecc8 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 0x29: /* ISKE R1,R2 [RRE] */ - /* Insert Storage Key Extended */ - check_privileged(s); - r1 = (insn >> 4) & 0xf; - r2 = insn & 0xf; - tmp = load_reg(r2); - tmp2 = tcg_temp_new_i64(); - gen_helper_iske(tmp2, cpu_env, tmp); - store_reg(r1, tmp2); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - break; case 0x2a: /* RRBE R1,R2 [RRE] */ /* Set Storage Key Extended */ check_privileged(s); @@ -2162,6 +2150,13 @@ static ExitStatus op_ipte(DisasContext *s, DisasOps *o) gen_helper_ipte(cpu_env, o->in1, o->in2); return NO_EXIT; } + +static ExitStatus op_iske(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_iske(o->out, cpu_env, o->in2); + return NO_EXIT; +} #endif static ExitStatus op_ldeb(DisasContext *s, DisasOps *o)