diff options
| author | David Hildenbrand <david@redhat.com> | 2021-09-03 17:55:02 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2021-09-06 16:24:04 +0200 |
| commit | 634a0b51cb25800ebc585862121f764d02de7a28 (patch) | |
| tree | e69c53beea4256454da542413e0ef869729a9ab1 | |
| parent | 0dd05d0606c880200d1683364c5eb558898e50de (diff) | |
| download | focaccia-qemu-634a0b51cb25800ebc585862121f764d02de7a28.tar.gz focaccia-qemu-634a0b51cb25800ebc585862121f764d02de7a28.zip | |
s390x/tcg: wrap address for RRBE
Let's wrap the address just like for SSKE and ISKE. Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20210903155514.44772-2-david@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | target/s390x/tcg/mem_helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 21a4de4067..e0befd0f03 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -2223,11 +2223,12 @@ void HELPER(sske)(CPUS390XState *env, uint64_t r1, uint64_t r2) uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) { MachineState *ms = MACHINE(qdev_get_machine()); + uint64_t addr = wrap_address(env, r2); static S390SKeysState *ss; static S390SKeysClass *skeyclass; uint8_t re, key; - if (r2 > ms->ram_size) { + if (addr > ms->ram_size) { return 0; } @@ -2236,14 +2237,14 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) skeyclass = S390_SKEYS_GET_CLASS(ss); } - if (skeyclass->get_skeys(ss, r2 / TARGET_PAGE_SIZE, 1, &key)) { + if (skeyclass->get_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key)) { return 0; } re = key & (SK_R | SK_C); key &= ~SK_R; - if (skeyclass->set_skeys(ss, r2 / TARGET_PAGE_SIZE, 1, &key)) { + if (skeyclass->set_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key)) { return 0; } /* |