From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9TPY-0001Fd-BZ for qemu-devel@nongnu.org; Mon, 29 Jun 2015 03:23:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9TPX-0004b3-9j for qemu-devel@nongnu.org; Mon, 29 Jun 2015 03:23:24 -0400 Received: from mail.ispras.ru ([83.149.199.45]:44815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9TPX-0004ap-33 for qemu-devel@nongnu.org; Mon, 29 Jun 2015 03:23:23 -0400 From: Pavel Dovgalyuk Date: Mon, 29 Jun 2015 10:23:22 +0300 Message-ID: <20150629072322.388.31566.stgit@PASHA-ISP> In-Reply-To: <20150629072310.388.48661.stgit@PASHA-ISP> References: <20150629072310.388.48661.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v4 2/5] cpu-exec: introduce loop exit with restore function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: rth7680@gmail.com, agraf@suse.de, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, leon.alrae@imgtec.com, aurelien@aurel32.net This patch introduces loop exit function, which also restores guest CPU state according to the value of host program counter. Signed-off-by: Pavel Dovgalyuk --- cpu-exec.c | 9 +++++++++ include/exec/exec-all.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 0734af2..0b5449e 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -134,6 +134,15 @@ void cpu_loop_exit(CPUState *cpu) siglongjmp(cpu->jmp_env, 1); } +void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc) +{ + if (pc) { + cpu_restore_state(cpu, pc); + } + cpu->current_tb = NULL; + siglongjmp(cpu->jmp_env, 1); +} + /* exit the current TB from a signal handler. The host registers are restored in a state compatible with the CPU emulator */ diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 47169c4..18fdc17 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -90,6 +90,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, int cflags); void cpu_exec_init(CPUArchState *env); void QEMU_NORETURN cpu_loop_exit(CPUState *cpu); +void QEMU_NORETURN cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc); int page_unprotect(target_ulong address, uintptr_t pc, void *puc); void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, int is_cpu_write_access);