diff options
| author | David Hildenbrand | 2019-09-03 13:46:24 +0200 |
|---|---|---|
| committer | David Hildenbrand | 2019-09-23 09:28:29 +0200 |
| commit | 373290d8a8bd9457c40cb2ddcc8a87dd7f03bfe6 (patch) | |
| tree | 908b7b52005f1ff8f0cf26453bbeffc8e8173ce4 /target/s390x/mem_helper.c | |
| parent | s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode (diff) | |
| download | qemu-373290d8a8bd9457c40cb2ddcc8a87dd7f03bfe6.tar.gz qemu-373290d8a8bd9457c40cb2ddcc8a87dd7f03bfe6.tar.xz qemu-373290d8a8bd9457c40cb2ddcc8a87dd7f03bfe6.zip | |
s390x/tcg: MVCS/MVCP: Properly wrap the length
... and don't perform any move in case the length is zero.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Diffstat (limited to 'target/s390x/mem_helper.c')
| -rw-r--r-- | target/s390x/mem_helper.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 320e9ee65c..41d7336a1a 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1980,10 +1980,13 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) s390_program_interrupt(env, PGM_SPECIAL_OP, ILEN_AUTO, ra); } + l = wrap_length32(env, l); if (l > 256) { /* max 256 */ l = 256; cc = 3; + } else if (!l) { + return cc; } /* XXX replace w/ memcpy */ @@ -2009,10 +2012,13 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) s390_program_interrupt(env, PGM_SPECIAL_OP, ILEN_AUTO, ra); } + l = wrap_length32(env, l); if (l > 256) { /* max 256 */ l = 256; cc = 3; + } else if (!l) { + return cc; } /* XXX replace w/ memcpy */ |