Fix BRASL and BRCL with large negative offsets
PATCH v3 1/3 s390x/tcg: Fix BRASL with a large negative offset
In reply to Ilya LeoshkevichWhen RI2 is 0x80000000, qemu enters an infinite loop instead of jumping backwards. Fix by adding a missing cast, like in in2_ri2().
--- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/tcg/translate.c +1 -1
@@ -1597,7 +1597,7 @@ static DisasJumpType op_bal(DisasContext *s, DisasOps *o)static DisasJumpType op_basi (DisasContext *s,DisasOps *o) {pc_to_link_info (o->out, s, s->pc_tmp); -return help_goto_direct (s, s->base.pc_next +2 *get_field (s, i2)); +return help_goto_direct (s, s->base.pc_next + (int64_t )get_field (s, i2) *2 ); }static DisasJumpType op_bc (DisasContext *s,DisasOps *o)
Signature · 1 line
2.35.1
v3 cover Fix BRASL and BRCL with large negative offsets
Hi,
I noticed that sometimes jumping backwards leads to crashes or hangs. The problem is a missing cast.
Patches 1 and 2 fix the problem, patch 3 adds a test.
v1: https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg03356.html
v1 -> v2:
- Skip the test if mmap() fails (Richard).
- Replace test opcodes with inline asm (David). Since we now want to skip the test if the code cannot be mapped (e.g. on a 31-bit host), we shouldn't be asking the loader to map the code right away. So the mmap() approach stays.
v2: https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg03387.html
v2 -> v3:
- Use MAP_NORESERVE (Christian / David).
- Unhardcode 0x100000006 (Richard).
Best regards,
Ilya
Ilya Leoshkevich (3):
s390x/tcg: Fix BRASL with a large negative offset s390x/tcg: Fix BRCL with a large negative offset tests/tcg/s390x: Test BRASL and BRCL with large negative offsets
target/s390x/tcg/translate.c | 4 +- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/branch-relative-long.c | 68 ++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 tests/tcg/s390x/branch-relative-long.c
Signature · 1 line
2.35.1
PATCH v3 3/3 tests/tcg/s390x: Test BRASL and BRCL with large negative offsets
Add a small test in order to prevent regressions.
--- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/branch-relative-long.c | 68 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 tests/tcg/s390x/branch-relative-long.c
tests/tcg/s390x/Makefile.target +1 -0
@@ -15,6 +15,7 @@ TESTS+=mvc TESTS+=shift TESTS+=trap TESTS+=signals-s390x +TESTS+=branch-relative-long ifneq ($(HAVE_GDB_BIN),) GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
tests/tcg/s390x/branch-relative-long.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v3 2/3 s390x/tcg: Fix BRCL with a large negative offset
In reply to Ilya LeoshkevichWhen RI2 is 0x80000000, qemu enters an infinite loop instead of jumping backwards. Fix by adding a missing cast, like in in2_ri2().
--- target/s390x/tcg/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/tcg/translate.c +1 -1
@@ -1201,7 +1201,7 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c, bool is_imm, int imm, TCGv_i64 cdest) { DisasJumpType ret; -uint64_t dest = s->base.pc_next +2 * imm; +uint64_t dest = s->base.pc_next + (int64_t )imm *2 ;TCGLabel *lab;/* Take care of the special cases first. */
Signature · 1 line
2.35.1
Quoted 28 lines · Ilya Leoshkevich
Hi,
I noticed that sometimes jumping backwards leads to crashes or hangs. The problem is a missing cast.
Patches 1 and 2 fix the problem, patch 3 adds a test.v1: https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg03356.html
v1 -> v2:
- Skip the test ifmmap()fails (Richard).
- Replace test opcodes with inline asm (David). Since we now want to skip the test if the code cannot be mapped (e.g. on a 31-bit host), we shouldn't be asking the loader to map the code right away. So themmap()approach stays.v2: https://lists.nongnu.org/archive/html/qemu-devel/2022-03/msg03387.html
v2 -> v3:
- UseMAP_NORESERVE(Christian / David).
- Unhardcode0x100000006(Richard).Best regards,
IlyaIlya Leoshkevich (3):
s390x/tcg: Fix BRASL with a large negative offset s390x/tcg: Fix BRCL with a large negative offset tests/tcg/s390x: Test BRASL and BRCL with large negative offsets
Quoted 5 lines
target/s390x/tcg/translate.c | 4 +- tests/tcg/s390x/Makefile.target | 1 + tests/tcg/s390x/branch-relative-long.c | 68 ++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 2 deletions(-)create mode 100644
tests/tcg/s390x/branch-relative-long.c
Thanks, queued to my s390x-next branch now:
https://gitlab.com/thuth/qemu/-/commits/s390x-next/
Thomas