From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YucRF-0006sJ-7Z for qemu-devel@nongnu.org; Tue, 19 May 2015 03:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YucRA-0006wG-80 for qemu-devel@nongnu.org; Tue, 19 May 2015 03:59:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37259) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YucRA-0006w8-04 for qemu-devel@nongnu.org; Tue, 19 May 2015 03:59:40 -0400 From: Paolo Bonzini Date: Tue, 19 May 2015 09:59:34 +0200 Message-Id: <1432022374-10496-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] tci: do not use CPUArchState in tcg-target.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de tcg-target.h does not use any QEMU-specific symbols, save for tci's usage of CPUArchState. Pull that up to tcg/tcg.h. This will make it possible to include tcg-target.h in cpu-defs.h. Signed-off-by: Paolo Bonzini --- tcg/tcg.h | 4 +++- tcg/tci/tcg-target.h | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tcg/tcg.h b/tcg/tcg.h index fbb3daf..647aa4e 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -876,7 +876,9 @@ static inline size_t tcg_current_code_size(TCGContext *s) #define TB_EXIT_ICOUNT_EXPIRED 2 #define TB_EXIT_REQUESTED 3 -#if !defined(tcg_qemu_tb_exec) +#ifdef HAVE_TCG_QEMU_TB_EXEC +uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr); +#else # define tcg_qemu_tb_exec(env, tb_ptr) \ ((uintptr_t (*)(void *, void *))tcg_ctx.code_gen_prologue)(env, tb_ptr) #endif diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index bd1e974..662d45c 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -175,8 +175,7 @@ typedef enum { void tci_disas(uint8_t opc); -uintptr_t tcg_qemu_tb_exec(CPUArchState *env, uint8_t *tb_ptr); -#define tcg_qemu_tb_exec tcg_qemu_tb_exec +#define HAVE_TCG_QEMU_TB_EXEC static inline void flush_icache_range(uintptr_t start, uintptr_t stop) { -- 2.4.0