Skip to content

Commit

Permalink
s390x/tcg: MVCIN: Fault-safe handling
Browse files Browse the repository at this point in the history
We can process a maximum of 256 bytes, crossing two pages. Calculate the
accessed range upfront - src is accessed right-to-left.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
  • Loading branch information
davidhildenbrand committed Sep 23, 2019
1 parent 4d78c68 commit 65a27df
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions target/s390x/mem_helper.c
Expand Up @@ -479,12 +479,21 @@ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
/* move inverse */
void HELPER(mvcin)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
{
const int mmu_idx = cpu_mmu_index(env, false);
S390Access srca, desta;
uintptr_t ra = GETPC();
int i;

for (i = 0; i <= l; i++) {
uint8_t v = cpu_ldub_data_ra(env, src - i, ra);
cpu_stb_data_ra(env, dest + i, v, ra);
/* MVCIN always copies one more byte than specified - maximum is 256 */
l++;

src = wrap_address(env, src - l + 1);
srca = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < l; i++) {
const uint8_t x = access_get_byte(env, &srca, l - i - 1, ra);

access_set_byte(env, &desta, i, x, ra);
}
}

Expand Down

0 comments on commit 65a27df

Please sign in to comment.