From patchwork Fri Sep 28 00:39:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187627 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 C794A2C00B7 for ; Fri, 28 Sep 2012 10:39:22 +1000 (EST) Received: from localhost ([::1]:38475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THObx-0001Km-0a for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 20:39:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THObp-0001KU-Mq for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:39:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THObo-0000BH-MN for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:39:13 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:65071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THObo-0000BC-Fp for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:39:12 -0400 Received: by padfb10 with SMTP id fb10so1799787pad.4 for ; Thu, 27 Sep 2012 17:39:11 -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=/6x+Vrvupie8nUkQWABiB/LDB8eLIhrG38FwXlh53+E=; b=ATzT/bLsco1k6f076XmkqoFMBFfAMIiuI5++kGqpUtkZuxLL6g36M9FL8abFH2JP6Y RaU6rrRjLvI232SkzJ/rjvRhvsndxhmRaAnx2/VhPKCFwCwAFSbVuZ6XILIMdzqLGjr/ 24Fef3SkN3tCAmg7g02rf3DUWybMHWKZFi3/qrMzQq8ROXlRB9oLSaROL49Zh9XGw5pq M2947qq51OEF3Z9jepo2z0PMnL7T18TJ2SO0AGK/ov+0hwTcYvc8zvuJhKzvrJ23KHql ZKkCJxGvy7G/dHwmwPfgNw8v2yPca8vMUNjAHgKFGj+yFWYFtkHzXq1KPuotTIWGL5zs wYDQ== Received: by 10.68.189.193 with SMTP id gk1mr15834800pbc.123.1348792751848; Thu, 27 Sep 2012 17:39:11 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id kj10sm4617060pbc.72.2012.09.27.17.39.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 17:39:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 17:39:08 -0700 Message-Id: <1348792748-27184-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.220.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 104/147] target-s390: Convert IPTE 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, 11 insertions(+), 11 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index f68e586..c8368cf 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) +/* INVALIDATE PAGE TABLE ENTRY */ + C(0xb221, IPTE, RRF_a, Z, r1_o, r2_o, 0, 0, ipte, 0) /* LOAD CONTROL */ C(0xb700, LCTL, RS_a, Z, 0, a2, 0, 0, lctl, 0) C(0xeb2f, LCTLG, RSY_a, Z, 0, a2, 0, 0, lctlg, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index fd58524..1001812 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,17 +1033,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x21: /* IPTE R1,R2 [RRE] */ - /* Invalidate PTE */ - check_privileged(s); - r1 = (insn >> 4) & 0xf; - r2 = insn & 0xf; - tmp = load_reg(r1); - tmp2 = load_reg(r2); - gen_helper_ipte(cpu_env, tmp, tmp2); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - break; case 0x29: /* ISKE R1,R2 [RRE] */ /* Insert Storage Key Extended */ check_privileged(s); @@ -2213,6 +2202,15 @@ static ExitStatus op_ipm(DisasContext *s, DisasOps *o) return NO_EXIT; } +#ifndef CONFIG_USER_ONLY +static ExitStatus op_ipte(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_ipte(cpu_env, o->in1, o->in2); + return NO_EXIT; +} +#endif + static ExitStatus op_ldeb(DisasContext *s, DisasOps *o) { gen_helper_ldeb(o->out, cpu_env, o->in2);