diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2023-07-24 10:15:58 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-07-24 18:44:47 +0200 |
| commit | 9c028c057adce49304c6e4a51f6b426bd4f8f6b8 (patch) | |
| tree | cc64480adb344260905a9ab368df7d77cd67ff90 | |
| parent | a2025557ed4d8d5e6a4d0dd681717c390f51f5be (diff) | |
| download | focaccia-qemu-9c028c057adce49304c6e4a51f6b426bd4f8f6b8.tar.gz focaccia-qemu-9c028c057adce49304c6e4a51f6b426bd4f8f6b8.zip | |
target/s390x: Make MC raise specification exception when class >= 16
MC requires bit positions 8-11 (upper 4 bits of class) to be zeros,
otherwise it must raise a specification exception.
Cc: qemu-stable@nongnu.org
Fixes: 20d143e2cab8 ("s390x/tcg: Implement MONITOR CALL")
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-Id: <20230724082032.66864-6-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | target/s390x/tcg/excp_helper.c | 2 | ||||
| -rw-r--r-- | target/s390x/tcg/translate.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 228aa9f237..3da337f7c7 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -639,7 +639,7 @@ void monitor_event(CPUS390XState *env, void HELPER(monitor_call)(CPUS390XState *env, uint64_t monitor_code, uint32_t monitor_class) { - g_assert(monitor_class <= 0xff); + g_assert(monitor_class <= 0xf); if (env->cregs[8] & (0x8000 >> monitor_class)) { monitor_event(env, monitor_code, monitor_class, GETPC()); diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 244e61ad2e..84d76f1cea 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -3177,9 +3177,9 @@ static DisasJumpType op_lcbb(DisasContext *s, DisasOps *o) static DisasJumpType op_mc(DisasContext *s, DisasOps *o) { - const uint16_t monitor_class = get_field(s, i2); + const uint8_t monitor_class = get_field(s, i2); - if (monitor_class & 0xff00) { + if (monitor_class & 0xf0) { gen_program_exception(s, PGM_SPECIFICATION); return DISAS_NORETURN; } |