From patchwork Sun Sep 9 21:05:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182740 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 3C7E42C007D for ; Mon, 10 Sep 2012 09:14:16 +1000 (EST) Received: from localhost ([::1]:41882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAqhi-00020i-8Q for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 19:14:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojK-00007h-3D for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojI-0006Ds-QD for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:46 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojI-0005xl-Jq for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:44 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so292285pbb.4 for ; Sun, 09 Sep 2012 14:07:44 -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=Se6FIP/ZDJgHoeDS6qFl/pDZn2se03Jqkr6hoK71ZeQ=; b=Igc8H6dsTKixHyddCI06f56WLNX+4MGhb5h6TJNFWjOwlWGllYv0tpXCcNFPxRzo/4 Pvl82Ye/+b3AX1q6WeEEP2fL1P1HwkAfWhwEYIX7TQM+BSB9I+8GyxOnDvq95LKkiMfO ELuaFJGVBTxuH+vK3vKVOb20Ho0etlCdBwX99stDIT2KhdyRTwitmwa9YuYUaBi7T62J Hu9qinKJyApTquw/QXcNq0kDpzjBLbsTArJTLKYu58M3Bj4xDbeYP8g4b2+GiNWUxIn7 b45S2UXSHaSmgJRbeCg6t7aI5d58PWm6K+IyyEuRmxONYPqKfUXAvKNvbQx6bVjgAbLk atCg== Received: by 10.68.230.232 with SMTP id tb8mr2039088pbc.19.1347224864360; Sun, 09 Sep 2012 14:07:44 -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.43 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:40 -0700 Message-Id: <1347224784-19472-83-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.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 082/126] target-s390: Convert IPM 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 Note that the previous placement of the PM field was incorrect. Signed-off-by: Richard Henderson --- target-s390x/cc_helper.c | 12 ------------ target-s390x/helper.h | 1 - target-s390x/insn-data.def | 2 ++ target-s390x/translate.c | 25 +++++++++++++++++++------ 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/target-s390x/cc_helper.c b/target-s390x/cc_helper.c index 46c6d84..78c0cb2 100644 --- a/target-s390x/cc_helper.c +++ b/target-s390x/cc_helper.c @@ -544,18 +544,6 @@ uint32_t HELPER(calc_cc)(CPUS390XState *env, uint32_t cc_op, uint64_t src, return do_calc_cc(env, cc_op, src, dst, vr); } -/* insert psw mask and condition code into r1 */ -void HELPER(ipm)(CPUS390XState *env, uint32_t cc, uint32_t r1) -{ - uint64_t r = env->regs[r1]; - - r &= 0xffffffff00ffffffULL; - r |= (cc << 28) | ((env->psw.mask >> 40) & 0xf); - env->regs[r1] = r; - HELPER_LOG("%s: cc %d psw.mask 0x%lx r1 0x%lx\n", __func__, - cc, env->psw.mask, r); -} - #ifndef CONFIG_USER_ONLY void HELPER(load_psw)(CPUS390XState *env, uint64_t mask, uint64_t addr) { diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 29f1565..bb1f740 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -36,7 +36,6 @@ DEF_HELPER_FLAGS_1(abs_i32, TCG_CALL_PURE|TCG_CALL_CONST, i32, s32) DEF_HELPER_FLAGS_1(nabs_i32, TCG_CALL_PURE|TCG_CALL_CONST, s32, s32) DEF_HELPER_FLAGS_1(abs_i64, TCG_CALL_PURE|TCG_CALL_CONST, i64, s64) DEF_HELPER_FLAGS_1(nabs_i64, TCG_CALL_PURE|TCG_CALL_CONST, s64, s64) -DEF_HELPER_3(ipm, void, env, i32, i32) DEF_HELPER_4(stam, void, env, i32, i64, i32) DEF_HELPER_4(lam, void, env, i32, i64, i32) DEF_HELPER_4(mvcle, i32, env, i32, i64, i32) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 652c7ad..2eb248f 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -237,6 +237,8 @@ D(0xa501, IIHL, RI_a, Z, r1_o, i2_16u, r1, 0, insi, 0, 0x1020) D(0xa502, IILH, RI_a, Z, r1_o, i2_16u, r1, 0, insi, 0, 0x1010) D(0xa503, IILL, RI_a, Z, r1_o, i2_16u, r1, 0, insi, 0, 0x1000) +/* INSERT PROGRAM MASK */ + C(0xb222, IPM, RRE, Z, 0, 0, r1, 0, ipm, 0) /* LOAD */ C(0x1800, LR, RR_a, Z, 0, r2_o, 0, cond_r1r2_32, mov2, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 4fbade5..34615cb 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1031,12 +1031,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 0x22: /* IPM R1 [RRE] */ - tmp32_1 = tcg_const_i32(r1); - gen_op_calc_cc(s); - gen_helper_ipm(cpu_env, cc_op, tmp32_1); - tcg_temp_free_i32(tmp32_1); - break; case 0x41: /* CKSM R1,R2 [RRE] */ tmp32_1 = tcg_const_i32(r1); tmp32_2 = tcg_const_i32(r2); @@ -2301,6 +2295,25 @@ static ExitStatus op_insi(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_ipm(DisasContext *s, DisasOps *o) +{ + TCGv_i64 t1; + + gen_op_calc_cc(s); + tcg_gen_andi_i64(o->out, o->out, ~0xff000000ull); + + t1 = tcg_temp_new_i64(); + tcg_gen_shli_i64(t1, psw_mask, 20); + tcg_gen_shri_i64(t1, t1, 36); + tcg_gen_or_i64(o->out, o->out, t1); + + tcg_gen_extu_i32_i64(t1, cc_op); + tcg_gen_shli_i64(t1, t1, 28); + tcg_gen_or_i64(o->out, o->out, t1); + tcg_temp_free_i64(t1); + return NO_EXIT; +} + static ExitStatus op_ldeb(DisasContext *s, DisasOps *o) { gen_helper_ldeb(o->out, cpu_env, o->in2);