diff options
| author | Paolo Bonzini | 2015-05-19 09:59:34 +0200 |
|---|---|---|
| committer | Alexander Graf | 2015-06-03 23:56:55 +0200 |
| commit | 5a58e884d1d9905a835de2889c8cd73327fe2a94 (patch) | |
| tree | 7536fa6b96b41c6204e0a20b2beb49e768081fa0 /tcg | |
| parent | Add David Gibson for sPAPR in MAINTAINERS file (diff) | |
| download | qemu-5a58e884d1d9905a835de2889c8cd73327fe2a94.tar.gz qemu-5a58e884d1d9905a835de2889c8cd73327fe2a94.tar.xz qemu-5a58e884d1d9905a835de2889c8cd73327fe2a94.zip | |
tci: do not use CPUArchState in tcg-target.h
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 <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'tcg')
| -rw-r--r-- | tcg/tcg.h | 4 | ||||
| -rw-r--r-- | tcg/tci/tcg-target.h | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -927,7 +927,9 @@ static inline unsigned get_mmuidx(TCGMemOpIdx oi) #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 bd1e97468c..662d45c22f 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) { |