From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOm7-0001W4-Bn for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOm6-0003au-7O for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:49:51 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:54221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOm6-0003ak-0r for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:49:50 -0400 Received: by pbbrp2 with SMTP id rp2so4376638pbb.4 for ; Thu, 27 Sep 2012 17:49:49 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 27 Sep 2012 17:49:46 -0700 Message-Id: <1348793386-27615-1-git-send-email-rth@twiddle.net> In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 114/147] target-s390: Convert STFL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf Signed-off-by: Richard Henderson --- target-s390x/insn-data.def | 2 ++ target-s390x/translate.c | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 5de3256..ba070f1 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -678,6 +678,8 @@ C(0xb202, STIDP, S, Z, la2, 0, new, m1_64, stidp, 0) /* STORE CPU TIMER */ C(0xb209, STPT, S, Z, la2, 0, new, m1_64, stpt, 0) +/* STORE FACILITY LIST */ + C(0xb2b1, STFL, S, Z, 0, 0, 0, 0, stfl, 0) /* STORE PREFIX */ C(0xb211, STPX, S, Z, la2, 0, new, m1_32, stpx, 0) /* STORE SYSTEM INFORMATION */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 2bb6ac1..63d4be6 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,15 +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 0xb1: /* STFL D2(B2) [S] */ - /* Store Facility List (CPU features) at 200 */ - check_privileged(s); - tmp2 = tcg_const_i64(0xc0000000); - tmp = tcg_const_i64(200); - tcg_gen_qemu_st32(tmp2, tmp, get_mem_index(s)); - tcg_temp_free_i64(tmp2); - tcg_temp_free_i64(tmp); - break; case 0xb2: /* LPSWE D2(B2) [S] */ /* Load PSW Extended */ check_privileged(s); @@ -2875,6 +2866,20 @@ static ExitStatus op_spt(DisasContext *s, DisasOps *o) return NO_EXIT; } +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); + return NO_EXIT; +} + static ExitStatus op_stpt(DisasContext *s, DisasOps *o) { check_privileged(s); -- 1.7.11.4