Commit 422f32c5 authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

s390x/helper: Fixed real-to-absolute address translation 



The real-to-absolute address translation in mmu_translate() was
missing the second part for translating the page at the prefix
address back to the 0 page. And while we're at it, also moved the
code into a separate helper function since this might come in
handy for other parts of the code, too.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent 98983704

target-s390x/helper.c

+15 −3
Original line number Diff line number Diff line
@@ -170,6 +170,20 @@ static void trigger_page_fault(CPUS390XState *env, target_ulong vaddr, 
    trigger_pgm_exception(env, type, ilen);

}



/**

 * Translate real address to absolute (= physical)

 * address by taking care of the prefix mapping.

 */

static target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr)

{

    if (raddr < 0x2000) {

        return raddr + env->psa;    /* Map the lowcore. */

    } else if (raddr >= env->psa && raddr < env->psa + 0x2000) {

        return raddr - env->psa;    /* Map the 0 page. */

    }

    return raddr;

}



static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr,

                              uint64_t asc, uint64_t asce, int level,

                              target_ulong *raddr, int *flags, int rw)
@@ -363,9 +377,7 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, 


 out:

    /* Convert real address -> absolute address */

    if (*raddr < 0x2000) {

        *raddr = *raddr + env->psa;

    }

    *raddr = mmu_real2abs(env, *raddr);



    if (*raddr <= ram_size) {

        sk = &env->storage_keys[*raddr / TARGET_PAGE_SIZE];