In order to remove the convenient CPUState::as field, access the vcpu first address space using the cpu_get_address_space() helper.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/m68k/helper.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 15f110fa7a2..0f8512af72c 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -491,6 +491,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) int32_t size; int last_attr = -1, attr = -1; CPUState *cs = env_cpu(env); + AddressSpace *as = cpu_get_address_space(cs, 0); MemTxResult txres; if (env->mmu.tcr & M68K_TCR_PAGE_8K) { @@ -505,25 +506,25 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) tib_mask = M68K_4K_PAGE_MASK; } for (unsigned i = 0; i < M68K_ROOT_POINTER_ENTRIES; i++) { - tia = address_space_ldl(cs->as, M68K_POINTER_BASE(root_pointer) + i * 4, + tia = address_space_ldl(as, M68K_POINTER_BASE(root_pointer) + i * 4, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK || !M68K_UDT_VALID(tia)) { continue; } for (unsigned j = 0; j < M68K_ROOT_POINTER_ENTRIES; j++) { - tib = address_space_ldl(cs->as, M68K_POINTER_BASE(tia) + j * 4, + tib = address_space_ldl(as, M68K_POINTER_BASE(tia) + j * 4, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK || !M68K_UDT_VALID(tib)) { continue; } for (unsigned k = 0; k < tic_size; k++) { - tic = address_space_ldl(cs->as, (tib & tib_mask) + k * 4, + tic = address_space_ldl(as, (tib & tib_mask) + k * 4, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK || !M68K_PDT_VALID(tic)) { continue; } if (M68K_PDT_INDIRECT(tic)) { - tic = address_space_ldl(cs->as, M68K_INDIRECT_POINTER(tic), + tic = address_space_ldl(as, M68K_INDIRECT_POINTER(tic), MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { continue; @@ -732,6 +733,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, int access_type, target_ulong *page_size) { CPUState *cs = env_cpu(env); + AddressSpace *as = cpu_get_address_space(cs, 0); uint32_t entry; uint32_t next; target_ulong page_mask; @@ -768,7 +770,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, /* Root Index */ entry = M68K_POINTER_BASE(next) | M68K_ROOT_INDEX(address); - next = address_space_ldl(cs->as, entry, MEMTXATTRS_UNSPECIFIED, &txres); + next = address_space_ldl(as, entry, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; } @@ -776,7 +778,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, return -1; } if (!(next & M68K_DESC_USED) && !debug) { - address_space_stl(cs->as, entry, next | M68K_DESC_USED, + address_space_stl(as, entry, next | M68K_DESC_USED, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; @@ -795,7 +797,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, /* Pointer Index */ entry = M68K_POINTER_BASE(next) | M68K_POINTER_INDEX(address); - next = address_space_ldl(cs->as, entry, MEMTXATTRS_UNSPECIFIED, &txres); + next = address_space_ldl(as, entry, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; } @@ -803,7 +805,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, return -1; } if (!(next & M68K_DESC_USED) && !debug) { - address_space_stl(cs->as, entry, next | M68K_DESC_USED, + address_space_stl(as, entry, next | M68K_DESC_USED, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; @@ -826,7 +828,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, entry = M68K_4K_PAGE_BASE(next) | M68K_4K_PAGE_INDEX(address); } - next = address_space_ldl(cs->as, entry, MEMTXATTRS_UNSPECIFIED, &txres); + next = address_space_ldl(as, entry, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; } @@ -835,7 +837,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, return -1; } if (M68K_PDT_INDIRECT(next)) { - next = address_space_ldl(cs->as, M68K_INDIRECT_POINTER(next), + next = address_space_ldl(as, M68K_INDIRECT_POINTER(next), MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; @@ -844,7 +846,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, if (access_type & ACCESS_STORE) { if (next & M68K_DESC_WRITEPROT) { if (!(next & M68K_DESC_USED) && !debug) { - address_space_stl(cs->as, entry, next | M68K_DESC_USED, + address_space_stl(as, entry, next | M68K_DESC_USED, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; @@ -852,7 +854,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, } } else if ((next & (M68K_DESC_MODIFIED | M68K_DESC_USED)) != (M68K_DESC_MODIFIED | M68K_DESC_USED) && !debug) { - address_space_stl(cs->as, entry, + address_space_stl(as, entry, next | (M68K_DESC_MODIFIED | M68K_DESC_USED), MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { @@ -861,7 +863,7 @@ static int get_physical_address(CPUM68KState *env, hwaddr *physical, } } else { if (!(next & M68K_DESC_USED) && !debug) { - address_space_stl(cs->as, entry, next | M68K_DESC_USED, + address_space_stl(as, entry, next | M68K_DESC_USED, MEMTXATTRS_UNSPECIFIED, &txres); if (txres != MEMTX_OK) { goto txfail; -- 2.51.0
