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/microblaze/op_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c index b8365b3b1d2..f07d795bdf3 100644 --- a/target/microblaze/op_helper.c +++ b/target/microblaze/op_helper.c @@ -448,8 +448,9 @@ void mb_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, uint32_t HELPER(NAME)(CPUMBState *env, uint64_t ea) \ { \ CPUState *cs = env_cpu(env); \ + AddressSpace *as = cpu_get_address_space(cs, 0); \ MemTxResult txres; \ - TYPE ret = FUNC(cs->as, ea, MEMTXATTRS_UNSPECIFIED, &txres); \ + TYPE ret = FUNC(as, ea, MEMTXATTRS_UNSPECIFIED, &txres); \ if (unlikely(txres != MEMTX_OK)) { \ mb_transaction_failed_internal(cs, ea, ea, sizeof(TYPE), \ MMU_DATA_LOAD, GETPC()); \ @@ -467,8 +468,9 @@ LD_EA(lwea_le, uint32_t, address_space_ldl_le) void HELPER(NAME)(CPUMBState *env, uint32_t data, uint64_t ea) \ { \ CPUState *cs = env_cpu(env); \ + AddressSpace *as = cpu_get_address_space(cs, 0); \ MemTxResult txres; \ - FUNC(cs->as, ea, data, MEMTXATTRS_UNSPECIFIED, &txres); \ + FUNC(as, ea, data, MEMTXATTRS_UNSPECIFIED, &txres); \ if (unlikely(txres != MEMTX_OK)) { \ mb_transaction_failed_internal(cs, ea, ea, sizeof(TYPE), \ MMU_DATA_STORE, GETPC()); \ -- 2.51.0
