From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqo9N-0001wz-Sj for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:46:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqo9J-0004tP-CY for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:46:05 -0400 Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]:34711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqo9H-0004sr-Uc for qemu-devel@nongnu.org; Thu, 14 Apr 2016 16:46:01 -0400 Received: by mail-lf0-x234.google.com with SMTP id j11so123059872lfb.1 for ; Thu, 14 Apr 2016 13:45:59 -0700 (PDT) From: Sergey Fedorov Date: Thu, 14 Apr 2016 23:45:46 +0300 Message-Id: <1460666749-24452-2-git-send-email-sergey.fedorov@linaro.org> In-Reply-To: <1460666749-24452-1-git-send-email-sergey.fedorov@linaro.org> References: <1460666749-24452-1-git-send-email-sergey.fedorov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 1/4] tcg: code_bitmap is not used by user-mode emulation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Sergey Fedorov , Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Sergey Fedorov From: Paolo Bonzini Signed-off-by: Paolo Bonzini [Sergey Fedorov: eliminate the field entirely in user-mode] Signed-off-by: Sergey Fedorov Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée --- Changes in v2: * The field is eliminated entirely in user-mode translate-all.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/translate-all.c b/translate-all.c index 8329ea60eeda..0d5d9449dc6b 100644 --- a/translate-all.c +++ b/translate-all.c @@ -75,8 +75,9 @@ typedef struct PageDesc { /* in order to optimize self modifying code, we count the number of lookups we do to a given page to use a bitmap */ unsigned int code_write_count; +#ifdef CONFIG_SOFTMMU unsigned long *code_bitmap; -#if defined(CONFIG_USER_ONLY) +#else unsigned long flags; #endif } PageDesc; @@ -784,8 +785,10 @@ void tb_free(TranslationBlock *tb) static inline void invalidate_page_bitmap(PageDesc *p) { +#ifdef CONFIG_SOFTMMU g_free(p->code_bitmap); p->code_bitmap = NULL; +#endif p->code_write_count = 0; } @@ -1019,6 +1022,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) tcg_ctx.tb_ctx.tb_phys_invalidate_count++; } +#ifdef CONFIG_SOFTMMU static void build_page_bitmap(PageDesc *p) { int n, tb_start, tb_end; @@ -1047,6 +1051,7 @@ static void build_page_bitmap(PageDesc *p) tb = tb->page_next[n]; } } +#endif /* Called with mmap_lock held for user mode emulation. */ TranslationBlock *tb_gen_code(CPUState *cpu, @@ -1296,6 +1301,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, #endif } +#ifdef CONFIG_SOFTMMU /* len must be <= 8 and start must be a multiple of len */ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) { @@ -1333,8 +1339,7 @@ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) tb_invalidate_phys_page_range(start, start + len, 1); } } - -#if !defined(CONFIG_SOFTMMU) +#else /* Called with mmap_lock held. */ static void tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc, void *puc, -- 2.8.1