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: Thomas Huth <thuth@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Reviewed-by: Alexander Graf <agraf@suse.de> Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
parent
9898370497
commit
422f32c5b1
@ -170,6 +170,20 @@ static void trigger_page_fault(CPUS390XState *env, target_ulong vaddr,
|
|||||||
trigger_pgm_exception(env, type, ilen);
|
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,
|
static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr,
|
||||||
uint64_t asc, uint64_t asce, int level,
|
uint64_t asc, uint64_t asce, int level,
|
||||||
target_ulong *raddr, int *flags, int rw)
|
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:
|
out:
|
||||||
/* Convert real address -> absolute address */
|
/* Convert real address -> absolute address */
|
||||||
if (*raddr < 0x2000) {
|
*raddr = mmu_real2abs(env, *raddr);
|
||||||
*raddr = *raddr + env->psa;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*raddr <= ram_size) {
|
if (*raddr <= ram_size) {
|
||||||
sk = &env->storage_keys[*raddr / TARGET_PAGE_SIZE];
|
sk = &env->storage_keys[*raddr / TARGET_PAGE_SIZE];
|
||||||
|
Loading…
Reference in New Issue
Block a user