[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/10] target-s390: Implement SAM specification excep
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 01/10] target-s390: Implement SAM specification exception |
Date: |
Tue, 3 Feb 2015 12:42:52 -0800 |
Also, these are user-mode instructions; allow their use
in CONFIG_USER_ONLY.
Signed-off-by: Richard Henderson <address@hidden>
---
target-s390x/insn-data.def | 8 ++++----
target-s390x/translate.c | 31 +++++++++++++++++++++++++++----
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def
index 4d2feb6..42b99b2 100644
--- a/target-s390x/insn-data.def
+++ b/target-s390x/insn-data.def
@@ -566,6 +566,10 @@
/* SET ACCESS */
C(0xb24e, SAR, RRE, Z, 0, r2_o, 0, 0, sar, 0)
+/* SET ADDRESSING MODE */
+ D(0x010c, SAM24, E, Z, 0, 0, 0, 0, sam, 0, 0)
+ D(0x010d, SAM31, E, Z, 0, 0, 0, 0, sam, 0, 1)
+ D(0x010e, SAM64, E, Z, 0, 0, 0, 0, sam, 0, 3)
/* SET FPC */
C(0xb384, SFPC, RRE, Z, 0, r1_o, 0, 0, sfpc, 0)
/* SET FPC AND SIGNAL */
@@ -743,10 +747,6 @@
C(0xb22a, RRBE, RRE, Z, 0, r2_o, 0, 0, rrbe, 0)
/* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */
C(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0)
-/* SET ADDRESSING MODE */
- D(0x010c, SAM24, E, Z, 0, 0, 0, 0, sam, 0, 0)
- D(0x010d, SAM31, E, Z, 0, 0, 0, 0, sam, 0, 1)
- D(0x010e, SAM64, E, Z, 0, 0, 0, 0, sam, 0, 3)
/* SET ADDRESS SPACE CONTROL FAST */
C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0)
/* SET CLOCK */
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index ab01bc0..1338bb5 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -2925,19 +2925,42 @@ static ExitStatus op_sacf(DisasContext *s, DisasOps *o)
/* Addressing mode has changed, so end the block. */
return EXIT_PC_STALE;
}
+#endif
static ExitStatus op_sam(DisasContext *s, DisasOps *o)
{
int sam = s->insn->data;
- TCGv_i64 tsam = tcg_const_i64(sam);
+ TCGv_i64 tsam;
+ uint64_t mask;
- /* Overwrite PSW_MASK_64 and PSW_MASK_32 */
- tcg_gen_deposit_i64(psw_mask, psw_mask, tsam, 31, 2);
+ switch (sam) {
+ case 0:
+ mask = 0xffffff;
+ break;
+ case 1:
+ mask = 0x7fffffff;
+ break;
+ default:
+ mask = -1;
+ break;
+ }
+
+ /* Bizzare but true, we check the address of the current insn for the
+ specification exception, not the next to be executed. Thus the PoO
+ documents that Bad Things Happen two bytes before the end. */
+ if (s->pc & ~mask) {
+ gen_program_exception(s, PGM_SPECIFICATION);
+ return EXIT_NORETURN;
+ }
+ s->next_pc &= mask;
+ tsam = tcg_const_i64(sam);
+ tcg_gen_deposit_i64(psw_mask, psw_mask, tsam, 31, 2);
tcg_temp_free_i64(tsam);
+
+ /* Always exit the TB, since we (may have) changed execution mode. */
return EXIT_PC_STALE;
}
-#endif
static ExitStatus op_sar(DisasContext *s, DisasOps *o)
{
--
2.1.0
- [Qemu-devel] [PULL 00/10] s390x translator bug fixes, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 02/10] target-s390: Implement EPSW, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 03/10] target-s390: Fix STIDP, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 01/10] target-s390: Implement SAM specification exception,
Richard Henderson <=
- [Qemu-devel] [PULL 04/10] target-s390: Fix STURA, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 05/10] target-s390: Implement LURA, LURAG, STURG, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 08/10] disas/s390.c: Remove unused variables, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 06/10] target-s390: Implement ECAG, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 09/10] target-s390x: support OC and NC in the EX instruction, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 10/10] target-s390x: fix and optimize slb* and slbg* computation of carry/borrow flag, Richard Henderson, 2015/02/03
- [Qemu-devel] [PULL 07/10] target-s390x: Mark check_privileged() as !CONFIG_USER_ONLY, Richard Henderson, 2015/02/03
- Re: [Qemu-devel] [PULL 00/10] s390x translator bug fixes, Peter Maydell, 2015/02/03