From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aM-0004FT-LV for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VR3aG-0000Dt-OQ for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:10 -0400 Received: from mail-qc0-x234.google.com ([2607:f8b0:400d:c01::234]:40372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aG-0000Do-Jz for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:04 -0400 Received: by mail-qc0-f180.google.com with SMTP id p19so4864446qcv.25 for ; Tue, 01 Oct 2013 10:18:04 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 1 Oct 2013 10:17:18 -0700 Message-Id: <1380647845-16793-3-git-send-email-rth@twiddle.net> In-Reply-To: <1380647845-16793-1-git-send-email-rth@twiddle.net> References: <1380647845-16793-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH v2 2/9] target-s390: Implement STFLE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de Signed-off-by: Richard Henderson --- target-s390x/helper.h | 1 + target-s390x/insn-data.def | 2 ++ target-s390x/misc_helper.c | 13 +++++++++++++ target-s390x/translate.c | 8 ++++++++ 4 files changed, 24 insertions(+) diff --git a/target-s390x/helper.h b/target-s390x/helper.h index 0d80aa0..fc2a54a 100644 --- a/target-s390x/helper.h +++ b/target-s390x/helper.h @@ -85,6 +85,7 @@ DEF_HELPER_FLAGS_5(calc_cc, TCG_CALL_NO_RWG_SE, i32, env, i32, i64, i64, i64) DEF_HELPER_FLAGS_2(sfpc, TCG_CALL_NO_RWG, void, env, i64) DEF_HELPER_FLAGS_2(sfas, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_1(popcnt, TCG_CALL_NO_RWG_SE, i64, i64) +DEF_HELPER_FLAGS_2(stfle, TCG_CALL_NO_WG, i32, env, i64) #ifndef CONFIG_USER_ONLY DEF_HELPER_3(servc, i32, env, i64, i64) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index b42ebb6..4b462d4 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -639,6 +639,8 @@ C(0xe33e, STRV, RXY_a, Z, la2, r1_32u, new, m1_32, rev32, 0) C(0xe32f, STRVG, RXY_a, Z, la2, r1_o, new, m1_64, rev64, 0) +/* STORE FACILITY LIST EXTENDED */ + C(0xb2b0, STFLE, S, SFLE, 0, a2, 0, 0, stfle, 0) /* STORE FPC */ C(0xb29c, STFPC, S, Z, 0, a2, new, m2_32, efpc, 0) diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index 10d0425..3cb987c 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -465,3 +465,16 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, return cc; } #endif + +uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr) +{ + int max_m1 = (env->facilities[1] != 0); + int count_m1 = env->regs[0] & 0xff; + + cpu_stq_data(env, addr, env->facilities[0]); + if (count_m1 > 0) { + cpu_stq_data(env, addr + 8, env->facilities[1]); + } + env->regs[0] = max_m1; + return (count_m1 >= max_m1 ? 0 : 3); +} diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 2d555e2..7356625 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -3291,6 +3291,14 @@ static ExitStatus op_stura(DisasContext *s, DisasOps *o) } #endif +static ExitStatus op_stfle(DisasContext *s, DisasOps *o) +{ + potential_page_fault(s); + gen_helper_stfle(cc_op, cpu_env, o->in2); + set_cc_static(s); + return NO_EXIT; +} + static ExitStatus op_st8(DisasContext *s, DisasOps *o) { tcg_gen_qemu_st8(o->in1, o->in2, get_mem_index(s)); -- 1.8.1.4