From dbdbe0cd3124a3e9afa2d1c11da7c6476097bb9d Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 3 Sep 2013 14:24:58 -0700 Subject: exec: Delete is_tcg_gen_code and GETRA_EXT All implementations now boil down to GETRA. Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 12 ------------ include/exec/softmmu_template.h | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 3ce80d1587..6ad05cacf5 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -320,18 +320,6 @@ extern uintptr_t tci_tb_ptr; #define GETPC() (GETRA() - GETPC_ADJ) -/* ??? Delete these once they are no longer used. */ -bool is_tcg_gen_code(uintptr_t pc_ptr); -#ifdef GETRA_LDST -# define GETRA_EXT() tcg_getra_ext(GETRA()) -static inline uintptr_t tcg_getra_ext(uintptr_t ra) -{ - return is_tcg_gen_code(ra) ? GETRA_LDST(ra) : ra; -} -#else -# define GETRA_EXT() GETRA() -#endif - #if !defined(CONFIG_USER_ONLY) void phys_mem_set_alloc(void *(*alloc)(ram_addr_t)); diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h index 5bbc56afd5..5edac51709 100644 --- a/include/exec/softmmu_template.h +++ b/include/exec/softmmu_template.h @@ -172,7 +172,7 @@ glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, int mmu_idx) { return glue(glue(helper_ret_ld, USUFFIX), MMUSUFFIX)(env, addr, mmu_idx, - GETRA_EXT()); + GETRA()); } #ifndef SOFTMMU_CODE_ACCESS @@ -285,7 +285,7 @@ glue(glue(helper_st, SUFFIX), MMUSUFFIX)(CPUArchState *env, target_ulong addr, DATA_TYPE val, int mmu_idx) { glue(glue(helper_ret_st, SUFFIX), MMUSUFFIX)(env, addr, val, mmu_idx, - GETRA_EXT()); + GETRA()); } #endif /* !defined(SOFTMMU_CODE_ACCESS) */ -- cgit v1.2.3