From patchwork Sun Sep 9 21:05:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182686 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 D37E52C0084 for ; Mon, 10 Sep 2012 08:20:54 +1000 (EST) Received: from localhost ([::1]:59752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAomX-0004L8-SR for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:11:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojb-0000V3-Fh for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojY-0006Is-RE for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:03 -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 1TAojY-0005pO-LB for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:08:00 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:08:00 -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=xL8HRzOwsPbWOi0xXweC/dnEBEzhmwv+xUrAIJ+mASw=; b=Hqa/LU+lSeABt/2N/1TglLcKIYRCzykVy2EcJnyvJVXaYkASnDDRokW20TV3Pq75AE LCS6YHQXrr6upi55sMdB/BKy2GJswcpMm5Ia/gbEr5jHMqruk9UcJ0Mf9x0UKwfN/WgD cojgBH3OCcLcIB7OHg/pwMtbGGHvwROXpV1thQ/RNGcbPnfKWIPpjni2eOBZESsfxIN0 hY8ZX0tI9gimGVkdhBqvOKwdkVinGyuVe3uLPkviPx1ipe2yWaN0QwpcgTQGN0CX2fk5 i8UUxNzju1UGFv/rbqzuWU2XLh8decIVKV8kMgOf3xfqG+vjOgEgIL6CiK/t2U7rwJ59 l0SQ== Received: by 10.66.79.195 with SMTP id l3mr18163151pax.33.1347224880412; Sun, 09 Sep 2012 14:08:00 -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.59 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:08:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:58 -0700 Message-Id: <1347224784-19472-101-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 100/126] target-s390: Convert RRBE 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/helper.h | 2 +- target-s390x/insn-data.def | 2 ++ target-s390x/mem_helper.c | 2 +- target-s390x/translate.c | 22 ++++++++++------------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index aca4158..52ce5ad 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -106,7 +106,7 @@ DEF_HELPER_4(stctg, void, env, i32, i64, i32) DEF_HELPER_FLAGS_2(tprot, TCG_CALL_CONST, i32, i64, i64) DEF_HELPER_FLAGS_2(iske, TCG_CALL_PURE|TCG_CALL_CONST, i64, env, i64) DEF_HELPER_FLAGS_3(sske, TCG_CALL_CONST, void, env, i64, i64) -DEF_HELPER_FLAGS_3(rrbe, TCG_CALL_CONST, i32, env, i32, i64) +DEF_HELPER_FLAGS_2(rrbe, TCG_CALL_CONST, i32, env, i64) DEF_HELPER_3(csp, i32, env, i32, i32) DEF_HELPER_4(mvcs, i32, env, i64, i64, i64) DEF_HELPER_4(mvcp, i32, env, i64, i64, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 4f944e2..5a38750 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -635,6 +635,8 @@ 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) +/* RESET REFERENCE BIT EXTENDED */ + C(0xb22a, RRBE, RRE, Z, 0, r2_o, 0, 0, rrbe, 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/mem_helper.c b/target-s390x/mem_helper.c index 4c19deb..1e24d29 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -960,7 +960,7 @@ void HELPER(sske)(CPUS390XState *env, uint64_t r1, uint64_t r2) } /* reset reference bit extended */ -uint32_t HELPER(rrbe)(CPUS390XState *env, uint32_t r1, uint64_t r2) +uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) { uint8_t re; uint8_t key; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 9e047eb..b4c8633 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 0x2a: /* RRBE R1,R2 [RRE] */ - /* Set Storage Key Extended */ - check_privileged(s); - r1 = (insn >> 4) & 0xf; - r2 = insn & 0xf; - tmp32_1 = load_reg32(r1); - tmp = load_reg(r2); - gen_helper_rrbe(cc_op, cpu_env, tmp32_1, tmp); - set_cc_static(s); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i64(tmp); - break; case 0x34: /* STCH ? */ /* Store Subchannel */ check_privileged(s); @@ -2655,6 +2643,16 @@ static ExitStatus op_rll64(DisasContext *s, DisasOps *o) return NO_EXIT; } +#ifndef CONFIG_USER_ONLY +static ExitStatus op_rrbe(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_rrbe(cc_op, cpu_env, o->in2); + set_cc_static(s); + return NO_EXIT; +} +#endif + static ExitStatus op_sar(DisasContext *s, DisasOps *o) { int r1 = get_field(s->fields, r1);