From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMntO-0001KL-4U for qemu-devel@nongnu.org; Sun, 09 Mar 2014 20:16:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WMntH-0005Ey-CA for qemu-devel@nongnu.org; Sun, 09 Mar 2014 20:16:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42291 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WMntH-0005En-71 for qemu-devel@nongnu.org; Sun, 09 Mar 2014 20:16:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 10 Mar 2014 01:15:34 +0100 Message-Id: <1394410549-13751-26-git-send-email-afaerber@suse.de> In-Reply-To: <1394410549-13751-1-git-send-email-afaerber@suse.de> References: <1394410549-13751-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-cpu v2 25/40] translate-all: Change cpu_io_recompile() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- include/exec/exec-all.h | 2 +- include/exec/softmmu_template.h | 4 ++-- translate-all.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index cf5cd71..727dc3c 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -84,7 +84,7 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t searche= d_pc); void page_size_init(void); =20 void QEMU_NORETURN cpu_resume_from_signal(CPUArchState *env1, void *puc)= ; -void QEMU_NORETURN cpu_io_recompile(CPUArchState *env, uintptr_t retaddr= ); +void QEMU_NORETURN cpu_io_recompile(CPUState *cpu, uintptr_t retaddr); TranslationBlock *tb_gen_code(CPUArchState *env,=20 target_ulong pc, target_ulong cs_base, int= flags, int cflags); diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_templ= ate.h index 8603933..73ed7cf 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -128,7 +128,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArch= State *env, physaddr =3D (physaddr & TARGET_PAGE_MASK) + addr; cpu->mem_io_pc =3D retaddr; if (mr !=3D &io_mem_rom && mr !=3D &io_mem_notdirty && !cpu_can_do_i= o(cpu)) { - cpu_io_recompile(env, retaddr); + cpu_io_recompile(cpu, retaddr); } =20 cpu->mem_io_vaddr =3D addr; @@ -334,7 +334,7 @@ static inline void glue(io_write, SUFFIX)(CPUArchStat= e *env, =20 physaddr =3D (physaddr & TARGET_PAGE_MASK) + addr; if (mr !=3D &io_mem_rom && mr !=3D &io_mem_notdirty && !cpu_can_do_i= o(cpu)) { - cpu_io_recompile(env, retaddr); + cpu_io_recompile(cpu, retaddr); } =20 cpu->mem_io_vaddr =3D addr; diff --git a/translate-all.c b/translate-all.c index 82d5fa4..83c7907 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1419,9 +1419,9 @@ CPUInterruptHandler cpu_interrupt_handler =3D tcg_h= andle_interrupt; =20 /* in deterministic execution mode, instructions doing device I/Os must be at the end of the TB */ -void cpu_io_recompile(CPUArchState *env, uintptr_t retaddr) +void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) { - CPUState *cpu =3D ENV_GET_CPU(env); + CPUArchState *env =3D cpu->env_ptr; TranslationBlock *tb; uint32_t n, cflags; target_ulong pc, cs_base; --=20 1.8.4.5