From patchwork Sun Sep 9 21:05:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182725 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 C65612C0087 for ; Mon, 10 Sep 2012 09:03:49 +1000 (EST) Received: from localhost ([::1]:53848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAqXb-0000CH-UC for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 19:03:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojU-0000Jz-M8 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojT-0006H7-FI for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:56 -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 1TAojT-0005pO-9x for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:55 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:55 -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=U64yRZ+C88gofzItQV4cVFVLrJrIacQQ724z0eMGt+c=; b=dGXXJ2hpeeDnGDI4aEp4M5vMu85Ola8XAnMTRNbKu8Yki0RGzs+j1sZSSl5G8yf4hl aWebV7+9RFEYWm030La+QO8YjTuSy6lE3jMuduFhvHf7H6I8hirbAb8YiensBatLLk1v xVxx3R+OHAvDc82SjykqD4YwuEo4XueD2yWg/fRbPvf1Rg7pdCORq8nc8oHkg/hmcGu4 7j2n4MkQcKJegS17cg+YZik18cDDIRaDG9I65z352AwlAhhfyVYOxuD+e8CwnHiPn5xn WZ0kqBlncNIDc65rm2TaAsmpYdmFN/JWtgNU7ggX5FihThufz9EbEqXej2uBHZ20Ybgw nXzA== Received: by 10.68.218.196 with SMTP id pi4mr2029716pbc.128.1347224875071; Sun, 09 Sep 2012 14:07:55 -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.54 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:52 -0700 Message-Id: <1347224784-19472-95-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 094/126] target-s390: Convert PTLB 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 | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 79ed499..58f2b41 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -629,6 +629,8 @@ C(0xda00, MVCP, SS_d, Z, la1, a2, 0, 0, mvcp, 0) /* MOVE TO SECONDARY */ C(0xdb00, MVCS, SS_d, Z, la1, a2, 0, 0, mvcs, 0) +/* PURGE TLB */ + C(0xb20d, PTLB, S, Z, 0, 0, 0, 0, ptlb, 0) /* SET ADDRESSING MODE */ /* We only do 64-bit, so accept this as a no-op. Let SAM24 and SAM31 signal illegal instruction. */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 09901bc..f3108f3 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,11 +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 0x0d: /* PTLB [S] */ - /* Purge TLB */ - check_privileged(s); - gen_helper_ptlb(cpu_env); - break; case 0x10: /* SPX D2(B2) [S] */ /* Set Prefix Register */ check_privileged(s); @@ -2664,6 +2659,15 @@ static ExitStatus op_ori(DisasContext *s, DisasOps *o) return NO_EXIT; } +#ifndef CONFIG_USER_ONLY +static ExitStatus op_ptlb(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_ptlb(cpu_env); + return NO_EXIT; +} +#endif + static ExitStatus op_rev16(DisasContext *s, DisasOps *o) { tcg_gen_bswap16_i64(o->out, o->in2);