From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOcs-0002OX-6i for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:40:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOcr-0000Ys-5C for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:40:18 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:65112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOcq-0000YF-T2 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:40:17 -0400 Received: by pbbrp2 with SMTP id rp2so4368502pbb.4 for ; Thu, 27 Sep 2012 17:40:15 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 27 Sep 2012 17:40:12 -0700 Message-Id: <1348792812-27226-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 105/147] target-s390: Convert ISKE 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 | 19 +++++++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index c8368cf..87daec1 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 1001812..bf746c7 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,18 +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 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); @@ -2209,6 +2197,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) -- 1.7.11.4