[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/33] s390x/tcg: implement spm (SET PROGRAM MASK)
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 01/33] s390x/tcg: implement spm (SET PROGRAM MASK) |
Date: |
Fri, 6 Oct 2017 11:59:24 +0200 |
From: David Hildenbrand <address@hidden>
Missing and is used inside Linux in the context of CPACF.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/cpu.h | 2 ++
target/s390x/insn-data.def | 2 ++
target/s390x/translate.c | 11 +++++++++++
3 files changed, 15 insertions(+)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 9b549dc491..4414485089 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -292,6 +292,7 @@ extern const struct VMStateDescription vmstate_s390_cpu;
#undef PSW_SHIFT_ASC
#undef PSW_MASK_CC
#undef PSW_MASK_PM
+#undef PSW_SHIFT_MASK_PM
#undef PSW_MASK_64
#undef PSW_MASK_32
#undef PSW_MASK_ESA_ADDR
@@ -309,6 +310,7 @@ extern const struct VMStateDescription vmstate_s390_cpu;
#define PSW_SHIFT_ASC 46
#define PSW_MASK_CC 0x0000300000000000ULL
#define PSW_MASK_PM 0x00000F0000000000ULL
+#define PSW_SHIFT_MASK_PM 40
#define PSW_MASK_64 0x0000000100000000ULL
#define PSW_MASK_32 0x0000000080000000ULL
#define PSW_MASK_ESA_ADDR 0x000000007fffffffULL
diff --git a/target/s390x/insn-data.def b/target/s390x/insn-data.def
index ad84c748e3..84233a456d 100644
--- a/target/s390x/insn-data.def
+++ b/target/s390x/insn-data.def
@@ -755,6 +755,8 @@
C(0xb2b8, SRNMB, S, FPE, 0, 0, 0, 0, srnm, 0)
/* SET DFP ROUNDING MODE */
C(0xb2b9, SRNMT, S, DFPR, 0, 0, 0, 0, srnm, 0)
+/* SET PROGRAM MASK */
+ C(0x0400, SPM, RR_a, Z, r1, 0, 0, 0, spm, 0)
/* SHIFT LEFT SINGLE */
D(0x8b00, SLA, RS_a, Z, r1, sh32, new, r1_32, sla, 0, 31)
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index 5abd34fb34..59fde44d55 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -3796,6 +3796,17 @@ static ExitStatus op_srnm(DisasContext *s, DisasOps *o)
return NO_EXIT;
}
+static ExitStatus op_spm(DisasContext *s, DisasOps *o)
+{
+ tcg_gen_extrl_i64_i32(cc_op, o->in1);
+ tcg_gen_extract_i32(cc_op, cc_op, 28, 2);
+ set_cc_static(s);
+
+ tcg_gen_shri_i64(o->in1, o->in1, 24);
+ tcg_gen_deposit_i64(psw_mask, psw_mask, o->in1, PSW_SHIFT_MASK_PM, 4);
+ return NO_EXIT;
+}
+
#ifndef CONFIG_USER_ONLY
static ExitStatus op_spka(DisasContext *s, DisasOps *o)
{
--
2.13.6
- [Qemu-devel] [PULL 00/33] next batch of s390x patches, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 02/33] s390x/tcg: move wrap_address() to internal.h, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 01/33] s390x/tcg: implement spm (SET PROGRAM MASK),
Cornelia Huck <=
- [Qemu-devel] [PULL 03/33] s390x/tcg: add basic MSA features, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 06/33] s390x/css: introduce css data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 04/33] s390x: use generic cpu_model parsing, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 05/33] s390x/kvm: fix and cleanup storing CPU status, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 07/33] s390x/css: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 08/33] virtio-ccw: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 09/33] 390x/css: introduce maximum data address checking, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 11/33] s390x/tcg: fix checking for invalid memory check, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 10/33] s390x/css: support ccw IDA, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 14/33] s390x/tcg: make stora(g) use the new _real mmu, Cornelia Huck, 2017/10/06