From patchwork Fri Sep 28 00:45:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187633 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 4CF982C00BC for ; Fri, 28 Sep 2012 10:45:45 +1000 (EST) Received: from localhost ([::1]:47065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOi7-0006ot-Fe for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 20:45:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOi0-0006om-UY for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:45:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOhz-0002gm-Tw for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:45:36 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:52436) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOhz-0002gi-ME for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:45:35 -0400 Received: by padfb10 with SMTP id fb10so1803003pad.4 for ; Thu, 27 Sep 2012 17:45:34 -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=VcHI+fDlrq/0G2HHiFmBsmRxv7Y49fl8JNLLWANHAMk=; b=AtMf/ZI/GQKqpubW1bLBC+8ywZ9unMTgwKXKvt/GPK20CvhqcmxTsex1bJT8KKOZDS Oy6U13jyZNMhYZ127mkhGmGLFJiq5DLG7CkT8CaU2e6L8jWdd5NVWqDEAVwYvNVBRffN T8FZSpOgRFqv12QzmkoWX1t2Kk/nC/XmUj3JtHnm5WnEZUXG9lHekWaA/xeDYT6dfG2e LUnWTj/QDnaCUQVbqYoHNxxGPRC+N7OI5Mt9OvJzkpYpe7krNvfEN8NrVjGayJ9kF54d oyOEZ5TvpCMiByKPS9Ssvev22D8Z1ILH00hsJRCzAKvmrBkG+j1ABrBthJ6rd54JMSkS a8IA== Received: by 10.68.212.131 with SMTP id nk3mr16028744pbc.109.1348793134881; Thu, 27 Sep 2012 17:45:34 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id b10sm4536940pav.17.2012.09.27.17.45.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 17:45:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 17:45:31 -0700 Message-Id: <1348793131-27443-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-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.220.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 110/147] target-s390: Convert CSP 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 | 6 +++--- target-s390x/translate.c | 24 ++++++++++++------------ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 0a2cd7c..84a46f5 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -101,7 +101,7 @@ 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_2(rrbe, TCG_CALL_CONST, i32, env, i64) -DEF_HELPER_3(csp, i32, env, i32, i32) +DEF_HELPER_3(csp, i32, env, i32, i64) DEF_HELPER_4(mvcs, i32, env, i64, i64, i64) DEF_HELPER_4(mvcp, i32, env, i64, i64, i64) DEF_HELPER_4(sigp, i32, env, i64, i32, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 8e457cb..12468a3 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -614,6 +614,8 @@ C(0xf300, UNPK, SS_a, Z, la1, a2, 0, 0, unpk, 0) #ifndef CONFIG_USER_ONLY +/* COMPARE AND SWAP AND PURGE */ + C(0xb250, CSP, RRE, Z, 0, ra2, 0, 0, csp, 0) /* DIAGNOSE (KVM hypercall) */ C(0x8300, DIAG, RX_a, Z, 0, 0, 0, 0, diag, 0) /* INSERT STORAGE KEY EXTENDED */ diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c index b8e4681..2d4da45 100644 --- a/target-s390x/mem_helper.c +++ b/target-s390x/mem_helper.c @@ -990,16 +990,16 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) } /* compare and swap and purge */ -uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint32_t r2) +uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint64_t r2) { uint32_t cc; uint32_t o1 = env->regs[r1]; - uint64_t a2 = get_address_31fix(env, r2) & ~3ULL; + uint64_t a2 = r2 & ~3ULL; uint32_t o2 = cpu_ldl_data(env, a2); if (o1 == o2) { cpu_stl_data(env, a2, env->regs[(r1 + 1) & 15]); - if (env->regs[r2] & 0x3) { + if (r2 & 0x3) { /* flush TLB / ALB */ tlb_flush(env, 1); } diff --git a/target-s390x/translate.c b/target-s390x/translate.c index f1546a7..585e739 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 0x50: /* CSP R1,R2 [RRE] */ - /* Compare And Swap And Purge */ - check_privileged(s); - r1 = (insn >> 4) & 0xf; - r2 = insn & 0xf; - tmp32_1 = tcg_const_i32(r1); - tmp32_2 = tcg_const_i32(r2); - gen_helper_csp(cc_op, cpu_env, tmp32_1, tmp32_2); - set_cc_static(s); - tcg_temp_free_i32(tmp32_1); - tcg_temp_free_i32(tmp32_2); - break; case 0x78: /* STCKE D2(B2) [S] */ /* Store Clock Extended */ decode_rs(s, insn, &r1, &r3, &b2, &d2); @@ -1901,6 +1889,18 @@ static ExitStatus op_csg(DisasContext *s, DisasOps *o) return NO_EXIT; } +#ifndef CONFIG_USER_ONLY +static ExitStatus op_csp(DisasContext *s, DisasOps *o) +{ + TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); + check_privileged(s); + gen_helper_csp(cc_op, cpu_env, r1, o->in2); + tcg_temp_free_i32(r1); + set_cc_static(s); + return NO_EXIT; +} +#endif + static ExitStatus op_cds(DisasContext *s, DisasOps *o) { int r3 = get_field(s->fields, r3);