Skip to content

Commit

Permalink
target/s390x: Make MC raise specification exception when class >= 16
Browse files Browse the repository at this point in the history
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: 20d143e ("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>
(cherry picked from commit 9c028c0)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
iii-i authored and Michael Tokarev committed Jul 31, 2023
1 parent 76507ab commit c5498fd
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion target/s390x/tcg/excp_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions target/s390x/tcg/translate.c
Original file line number Diff line number Diff line change
Expand Up @@ -3192,9 +3192,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;
}
Expand Down

0 comments on commit c5498fd

Please sign in to comment.