| Message ID | 20230718213531.117976-6-iii@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/s390x: Miscellaneous TCG fixes, part 2 | expand |
On 18.07.23 23:21, Ilya Leoshkevich wrote: > 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") > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > --- > target/s390x/tcg/excp_helper.c | 2 +- > 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 228aa9f2373..3da337f7c72 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 2d7cc8963b4..4b32c2333c2 100644 > --- a/target/s390x/tcg/translate.c > +++ b/target/s390x/tcg/translate.c > @@ -3184,9 +3184,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; > } Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 228aa9f2373..3da337f7c72 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 2d7cc8963b4..4b32c2333c2 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -3184,9 +3184,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; }
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") Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> --- target/s390x/tcg/excp_helper.c | 2 +- target/s390x/tcg/translate.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)