From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOYk-0005dj-Kl for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOYj-0007sH-Hq for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:36:02 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:34458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOYj-0007rI-Bj for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:36:01 -0400 Received: by padfb10 with SMTP id fb10so1798103pad.4 for ; Thu, 27 Sep 2012 17:36:00 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 27 Sep 2012 17:35:57 -0700 Message-Id: <1348792557-27054-1-git-send-email-rth@twiddle.net> In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 101/147] target-s390: Convert PTLB List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf 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 f95ba11..e9b9dc1 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 b593b79..952de68 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,11 +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 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); @@ -2725,6 +2720,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); -- 1.7.11.4