[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/12] target/s390x: Handle branching to odd addresses
From: |
Ilya Leoshkevich |
Subject: |
[PATCH v2 01/12] target/s390x: Handle branching to odd addresses |
Date: |
Mon, 13 Mar 2023 16:38:33 +0100 |
Let branching happen and try to generate a new translation block with
an odd address. Generate a specification exception in
cpu_get_tb_cpu_state().
Reported-by: Harold Grovesteen <h.grovsteen@tx.rr.com>
Reported-by: Nina Schoetterl-Glausch <nsg@linux.ibm.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
target/s390x/cpu.h | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 7d6d01325b2..0a76e96e078 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -29,6 +29,7 @@
#include "cpu_models.h"
#include "exec/cpu-defs.h"
#include "qemu/cpu-float.h"
+#include "tcg/tcg_s390x.h"
#define ELF_MACHINE_UNAME "S390X"
@@ -381,6 +382,14 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool
ifetch)
static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc,
target_ulong *cs_base, uint32_t *flags)
{
+ if (env->psw.addr & 1) {
+ /*
+ * Instructions must be at even addresses.
+ * This needs to be checked before address translation.
+ */
+ env->int_pgm_ilen = 2; /* see s390_cpu_tlb_fill() */
+ tcg_s390_program_interrupt(env, PGM_SPECIFICATION, 0);
+ }
*pc = env->psw.addr;
*cs_base = env->ex_value;
*flags = (env->psw.mask >> FLAG_MASK_PSW_SHIFT) & FLAG_MASK_PSW;
--
2.39.2
- [PATCH v2 00/12] target/s390x: Handle unaligned accesses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 02/12] target/s390x: Handle EXECUTE of odd addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 01/12] target/s390x: Handle branching to odd addresses,
Ilya Leoshkevich <=
- [PATCH v2 07/12] target/s390x: Handle CGRL and CLGRL with non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 06/12] target/s390x: Handle CRL and CGFRL with non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 03/12] target/s390x: Handle LGRL from non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 04/12] target/s390x: Handle LRL and LGFRL from non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 05/12] target/s390x: Handle LLGFRL from non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 08/12] target/s390x: Handle CLRL and CLGFRL with non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 11/12] target/s390x: Update do_unaligned_access() comment, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 09/12] target/s390x: Handle STRL to non-aligned addresses, Ilya Leoshkevich, 2023/03/13
- [PATCH v2 10/12] target/s390x: Handle STGRL to non-aligned addresses, Ilya Leoshkevich, 2023/03/13