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/hppa/int_helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 191ae19404b..4dd281e6c95 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -160,6 +160,7 @@ void hppa_cpu_do_interrupt(CPUState *cs) /* ??? An alternate fool-proof method would be to store the instruction data into the unwind info. That's probably a bit too much in the way of extra storage required. */ + AddressSpace *as = cpu_get_address_space(cs, 0); vaddr vaddr = env->iaoq_f & -4; hwaddr paddr = vaddr; @@ -176,7 +177,7 @@ void hppa_cpu_do_interrupt(CPUState *cs) break; } } - env->cr[CR_IIR] = ldl_phys(cs->as, paddr); + env->cr[CR_IIR] = ldl_phys(as, paddr); if (i == EXCP_ASSIST) { /* stuff insn code into bits of FP exception register #1 */ env->fr[0] |= (env->cr[CR_IIR] & 0x03ffffff); -- 2.51.0
