lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make s390x skey work

Browse Source
This commit is contained in:
mio
2021-12-27 23:19:17 +01:00
parent e977f81813
commit a38151bf77
9 changed files with 144 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qemu/target/s390x/mmu_helper.c
View File

@@ -282,7 +282,7 @@ static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr,
return 0;
}
static void mmu_handle_skey(target_ulong addr, int rw, int *flags)
static void mmu_handle_skey(uc_engine *uc, target_ulong addr, int rw, int *flags)
{
static S390SKeysClass *skeyclass;
static S390SKeysState *ss;
@@ -296,8 +296,8 @@ static void mmu_handle_skey(target_ulong addr, int rw, int *flags)
#endif
if (unlikely(!ss)) {
// ss = s390_get_skeys_device();
// skeyclass = S390_SKEYS_GET_CLASS(ss);
ss = s390_get_skeys_device(uc);
skeyclass = S390_SKEYS_GET_CLASS(ss);
}
/*
@@ -437,7 +437,7 @@ nodat:
/* Convert real address -> absolute address */
*raddr = mmu_real2abs(env, *raddr);
mmu_handle_skey(*raddr, rw, flags);
mmu_handle_skey(env->uc, *raddr, rw, flags);
return 0;
}
@@ -549,6 +549,6 @@ int mmu_translate_real(CPUS390XState *env, target_ulong raddr, int rw,
*addr = mmu_real2abs(env, raddr & TARGET_PAGE_MASK);
mmu_handle_skey(*addr, rw, flags);
mmu_handle_skey(env->uc, *addr, rw, flags);
return 0;
}