Bug 417281 - s390x: Fix register usage of conditional moves

The s390x register usage callback marks the target register of a
conditional move as HRmWrite only.  It fails to mention the fact that the
target register is also an input to the insn (unless the condition is
"never" or "always").

This was discovered while investigating "grail" failures on s390x and
fixes the majority of them.
This commit is contained in:
Andreas Arnez 2020-03-18 12:24:25 +01:00
parent 95df121886
commit 942a48c1db
3 changed files with 13 additions and 5 deletions

1
NEWS
View File

@ -127,6 +127,7 @@ where XXXXXX is the bug number as listed below.
417906 clone with CLONE_VFORK and no CLONE_VM fails
418435 s390x: memcmp test yields extra "Conditional jump or move depends on
uninitialised value(s)"
417281 s390x: /bin/true segfaults with "grail" enabled
n-i-bz Fix minor one time leaks in dhat.
n-i-bz Add --run-cxx-freeres=no in outer args to avoid inner crashes.
n-i-bz Add support for the Linux io_uring system calls

View File

@ -676,8 +676,18 @@ s390_insn_get_reg_usage(HRegUsage *u, const s390_insn *insn)
break;
case S390_INSN_COND_MOVE:
s390_opnd_RMI_get_reg_usage(u, insn->variant.cond_move.src);
addHRegUse(u, HRmWrite, insn->variant.cond_move.dst);
switch (insn->variant.cond_move.cond) {
case S390_CC_NEVER:
break;
case S390_CC_ALWAYS:
s390_opnd_RMI_get_reg_usage(u, insn->variant.cond_move.src);
addHRegUse(u, HRmWrite, insn->variant.cond_move.dst);
break;
default:
s390_opnd_RMI_get_reg_usage(u, insn->variant.cond_move.src);
addHRegUse(u, HRmModify, insn->variant.cond_move.dst);
break;
}
break;
case S390_INSN_ALU:

View File

@ -204,9 +204,6 @@ Uhmm, MUSL
.417266 Make memcheck/tests/linux/sigqueue usable with musl
Uhmm, MUSL
.417281 s390x: /bin/true segfaults with "grail" enabled
Ongoing
.417377 False-positive "uninitialised value(s)" reports from memcheck
.417572 unhandled instruction bytes: 0xC5 0x79 0xD6 0xED 0xC5 0xF9 0x51