Received: from eggs.gnu.org ([2001:4830:134:3::10]:37760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO6lB-0006we-Ie for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:05:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VO6l3-0006sQ-IR for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:05:09 -0400 Received: from mail-pb0-x232.google.com ([2607:f8b0:400e:c01::232]:58131) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VO6l3-0006rZ-C3 for qemu-devel@nongnu.org; Mon, 23 Sep 2013 10:05:01 -0400 Received: by mail-pb0-f50.google.com with SMTP id uo5so3252320pbc.37 for ; Mon, 23 Sep 2013 07:05:00 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Mon, 23 Sep 2013 07:04:41 -0700 Message-Id: <1379945085-29086-7-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 06/10] target-s390: Implement EPSW 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/insn-data.def | 2 ++ target-s390x/translate.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index c528eb4..48850ff 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -287,6 +287,8 @@ C(0xb24f, EAR, RRE, Z, 0, 0, new, r1_32, ear, 0) /* EXTRACT FPC */ C(0xb38c, EFPC, RRE, Z, 0, 0, new, r1_32, efpc, 0) +/* EXTRACT PSW */ + C(0xb98d, EPSW, RRE, Z, 0, 0, 0, 0, epsw, 0) /* FIND LEFTMOST ONE */ C(0xb983, FLOGR, RRE, EI, 0, r2_o, r1_P, 0, flogr, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 6ca8f0b..192d54e 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2036,6 +2036,24 @@ static ExitStatus op_efpc(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_epsw(DisasContext *s, DisasOps *o) +{ + int r1 = get_field(s->fields, r1); + int r2 = get_field(s->fields, r2); + TCGv_i64 t = tcg_temp_new_i64(); + + /* Note the "subsequently" in the PoO, which implies a defined result + if r1 == r2. Thus we cannot defer these writes to an output hook. */ + tcg_gen_shri_i64(t, psw_mask, 32); + store_reg32_i64(r1, t); + if (r2 != 0) { + store_reg32_i64(r2, psw_mask); + } + + tcg_temp_free_i64(t); + return NO_EXIT; +} + static ExitStatus op_ex(DisasContext *s, DisasOps *o) { /* ??? Perhaps a better way to implement EXECUTE is to set a bit in -- 1.8.1.4