diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-26 03:41:01 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:20:46 +0100 |
| commit | 93afeade09680c657e109bf192dbf70233e4ebbe (patch) | |
| tree | e46da9240df5e131dc8efade6f5a1067df42d51b /include/exec/softmmu_template.h | |
| parent | 7510454e3e74aafa2e6c50388bf24904644b6a96 (diff) | |
| download | qemu-93afeade09680c657e109bf192dbf70233e4ebbe.zip qemu-93afeade09680c657e109bf192dbf70233e4ebbe.tar.gz qemu-93afeade09680c657e109bf192dbf70233e4ebbe.tar.bz2 | |
cpu: Move mem_io_{pc,vaddr} fields from CPU_COMMON to CPUState
Reset them.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/exec/softmmu_template.h')
| -rw-r--r-- | include/exec/softmmu_template.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index c14a04d..c7cd937 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -126,12 +126,12 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env, MemoryRegion *mr = iotlb_to_region(cpu->as, physaddr); physaddr = (physaddr & TARGET_PAGE_MASK) + addr; - env->mem_io_pc = retaddr; + cpu->mem_io_pc = retaddr; if (mr != &io_mem_rom && mr != &io_mem_notdirty && !can_do_io(env)) { cpu_io_recompile(env, retaddr); } - env->mem_io_vaddr = addr; + cpu->mem_io_vaddr = addr; io_mem_read(mr, physaddr, &val, 1 << SHIFT); return val; } @@ -337,8 +337,8 @@ static inline void glue(io_write, SUFFIX)(CPUArchState *env, cpu_io_recompile(env, retaddr); } - env->mem_io_vaddr = addr; - env->mem_io_pc = retaddr; + cpu->mem_io_vaddr = addr; + cpu->mem_io_pc = retaddr; io_mem_write(mr, physaddr, val, 1 << SHIFT); } |