[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/6] target/s390x: Implement STORE FACILITIES LIST E
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 1/6] target/s390x: Implement STORE FACILITIES LIST EXTENDED |
Date: |
Thu, 2 Mar 2017 13:41:05 +1100 |
At the same time, improve STORE FACILITIES LIST
so that we don't hard-code the list for all cpus.
Signed-off-by: Richard Henderson <address@hidden>
---
target/s390x/helper.h | 2 ++
target/s390x/insn-data.def | 2 ++
target/s390x/misc_helper.c | 41 +++++++++++++++++++++++++++++++++++++++++
target/s390x/translate.c | 17 +++++++++--------
4 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/target/s390x/helper.h b/target/s390x/helper.h
index 9102071..01adb50 100644
--- a/target/s390x/helper.h
+++ b/target/s390x/helper.h
@@ -83,6 +83,8 @@ 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_1(stfl, TCG_CALL_NO_RWG, void, env)
+DEF_HELPER_2(stfle, 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 075ff59..b6702da 100644
--- a/target/s390x/insn-data.def
+++ b/target/s390x/insn-data.def
@@ -747,6 +747,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 3cb942e..fa51b29 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -654,3 +654,44 @@ void HELPER(per_ifetch)(CPUS390XState *env, uint64_t addr)
}
}
#endif
+
+void HELPER(stfl)(CPUS390XState *env)
+{
+ S390CPU *cpu = s390_env_get_cpu(env);
+ S390FeatInit buf = { };
+ uint32_t feat32;
+
+ s390_fill_feat_block(cpu->model->features, S390_FEAT_TYPE_STFL,
+ (uint8_t *) &buf);
+ feat32 = be64_to_cpu(buf[0]) >> 32;
+
+ cpu_stl_data(env, 200, feat32);
+}
+
+uint32_t HELPER(stfle)(CPUS390XState *env, uint64_t addr)
+{
+ S390CPU *cpu = s390_env_get_cpu(env);
+ S390FeatInit buf = { };
+ int count_m1 = env->regs[0] & 0xff;
+ int max_m1, i;
+
+ s390_fill_feat_block(cpu->model->features, S390_FEAT_TYPE_STFL,
+ (uint8_t *) &buf);
+
+ /* Find out how many 64-bit quantities are non-zero. */
+ for (max_m1 = ARRAY_SIZE (buf) - 1; max_m1 > 0; --max_m1) {
+ if (buf[max_m1] != 0) {
+ break;
+ }
+ }
+
+ /* Note that s390_fill_feat_block already filled in big-endian.
+ But since cpu_stq_data will swap from host, we need to convert
+ back to host-endian first. */
+ for (i = 0; i <= count_m1; ++i) {
+ cpu_stq_data(env, addr + 8 * i, be64_to_cpu(buf[i]));
+ }
+
+ env->regs[0] = deposit64(env->regs[0], 0, 8, max_m1);
+ return (count_m1 >= max_m1 ? 0 : 3);
+}
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 01c6217..69940e3 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3628,15 +3628,8 @@ static ExitStatus op_spt(DisasContext *s, DisasOps *o)
static ExitStatus op_stfl(DisasContext *s, DisasOps *o)
{
- TCGv_i64 f, a;
- /* We really ought to have more complete indication of facilities
- that we implement. Address this when STFLE is implemented. */
check_privileged(s);
- f = tcg_const_i64(0xc0000000);
- a = tcg_const_i64(200);
- tcg_gen_qemu_st32(f, a, get_mem_index(s));
- tcg_temp_free_i64(f);
- tcg_temp_free_i64(a);
+ gen_helper_stfl(cpu_env);
return NO_EXIT;
}
@@ -3802,6 +3795,14 @@ static ExitStatus op_sturg(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));
--
2.9.3
- [Qemu-devel] [PATCH 0/6] target/s390x patches, Richard Henderson, 2017/03/01
- [Qemu-devel] [PATCH 1/6] target/s390x: Implement STORE FACILITIES LIST EXTENDED,
Richard Henderson <=
- [Qemu-devel] [PATCH 2/6] target/s390x: Implement LOAD PROGRAM PARAMETER, Richard Henderson, 2017/03/01
- [Qemu-devel] [PATCH 3/6] target/s390x: Diagnose specification exception for atomics, Richard Henderson, 2017/03/01
- [Qemu-devel] [PATCH 4/6] target/s390x: Implement LOAD PAIR DISJOINT, Richard Henderson, 2017/03/01
- [Qemu-devel] [PATCH 5/6] target/s390x: Use atomic operations for COMPARE SWAP, Richard Henderson, 2017/03/01
- [Qemu-devel] [PATCH 6/6] target/s390x: Use atomic operations for LOAD AND OP, Richard Henderson, 2017/03/01
- Re: [Qemu-devel] [PATCH 0/6] target/s390x patches, no-reply, 2017/03/01
- Re: [Qemu-devel] [PATCH 0/6] target/s390x patches, no-reply, 2017/03/01