From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUNnE-0003ok-K9 for qemu-devel@nongnu.org; Thu, 10 Oct 2013 17:29:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VUNn8-0002Q6-QA for qemu-devel@nongnu.org; Thu, 10 Oct 2013 17:29:12 -0400 Received: from mail-pb0-x22d.google.com ([2607:f8b0:400e:c01::22d]:65467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VUNn8-0002Pr-JI for qemu-devel@nongnu.org; Thu, 10 Oct 2013 17:29:06 -0400 Received: by mail-pb0-f45.google.com with SMTP id mc17so3191529pbc.18 for ; Thu, 10 Oct 2013 14:29:05 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 10 Oct 2013 14:28:39 -0700 Message-Id: <1381440525-6666-12-git-send-email-rth@twiddle.net> In-Reply-To: <1381440525-6666-1-git-send-email-rth@twiddle.net> References: <1381440525-6666-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 11/17] exec: Delete is_tcg_gen_code and GETRA_EXT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aurelien@aurel32.net, anthony@codemonkey.ws All implementations now boil down to GETRA. Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 12 ------------ include/exec/softmmu_template.h | 4 ++-- translate-all.c | 12 ------------ 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 3ce80d1..6ad05ca 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 5bbc56a..5edac51 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) */ diff --git a/translate-all.c b/translate-all.c index e7aff92..aeda54d 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1318,18 +1318,6 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc, mmap_unlock(); } -#if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU) -/* check whether the given addr is in TCG generated code buffer or not */ -bool is_tcg_gen_code(uintptr_t tc_ptr) -{ - /* This can be called during code generation, code_gen_buffer_size - is used instead of code_gen_ptr for upper boundary checking */ - return (tc_ptr >= (uintptr_t)tcg_ctx.code_gen_buffer && - tc_ptr < (uintptr_t)(tcg_ctx.code_gen_buffer + - tcg_ctx.code_gen_buffer_size)); -} -#endif - /* find the TB 'tb' such that tb[0].tc_ptr <= tc_ptr < tb[1].tc_ptr. Return NULL if not found */ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr) -- 1.8.1.4