Received: from eggs.gnu.org ([2001:4830:134:3::10]:37728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO6l8-0006up-Qr for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:05:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VO6kw-0006qN-69 for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:05:06 -0400 Received: from mail-pb0-x234.google.com ([2607:f8b0:400e:c01::234]:57967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO6kv-0006pz-VZ for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:04:54 -0400 Received: by mail-pb0-f52.google.com with SMTP id wz12so3233638pbc.25 for ; Mon, 23 Sep 2013 07:04:53 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 23 Sep 2013 07:04:36 -0700 Message-Id: <1379945085-29086-2-git-send-email-rth@twiddle.net> In-Reply-To: <1379945085-29086-1-git-send-email-rth@twiddle.net> References: <1379945085-29086-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 01/10] target-s390: Move facilities bits to env List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de Rather than simply hard-coding them in STFL instruction. Signed-off-by: Richard Henderson --- target-s390x/cpu.c | 3 +++ target-s390x/cpu.h | 1 + target-s390x/translate.c | 10 +++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 3c89f8a..ff691df 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -181,6 +181,9 @@ static void s390_cpu_initfn(Object *obj) env->cpu_num = cpu_num++; env->ext_index = -1; + env->facilities[0] = 0xc000000000000000ull; + env->facilities[1] = 0; + if (tcg_enabled() && !inited) { inited = true; s390x_translate_init(); diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 8be5648..746aec8 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -136,6 +136,7 @@ typedef struct CPUS390XState { CPU_COMMON /* reset does memset(0) up to here */ + uint64_t facilities[2]; int cpu_num; uint8_t *storage_keys; diff --git a/target-s390x/translate.c b/target-s390x/translate.c index afe90eb..d4dc8ea 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -3230,12 +3230,12 @@ 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. */ + TCGv_i64 f = tcg_temp_new_i64(); + TCGv_i64 a = tcg_const_i64(200); + check_privileged(s); - f = tcg_const_i64(0xc0000000); - a = tcg_const_i64(200); + tcg_gen_ld_i64(f, cpu_env, offsetof(CPUS390XState, facilities[0])); + tcg_gen_shri_i64(f, f, 32); tcg_gen_qemu_st32(f, a, get_mem_index(s)); tcg_temp_free_i64(f); tcg_temp_free_i64(a); -- 1.8.1.4