From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZCqt-0006uf-TO for qemu-devel@nongnu.org; Sat, 21 Mar 2015 02:25:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZCqq-0002Un-4S for qemu-devel@nongnu.org; Sat, 21 Mar 2015 02:25:43 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:39804) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZCqp-0002Uh-WB for qemu-devel@nongnu.org; Sat, 21 Mar 2015 02:25:40 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 8947E206A7 for ; Sat, 21 Mar 2015 02:25:37 -0400 (EDT) Received: from localhost (unknown [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 8D780680089 for ; Sat, 21 Mar 2015 02:25:39 -0400 (EDT) From: "Emilio G. Cota" Date: Sat, 21 Mar 2015 02:25:42 -0400 Message-Id: <1426919142-20770-1-git-send-email-cota@braap.org> Subject: [Qemu-devel] [PATCH] translate-all: use bitmap helpers for PageDesc's bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Note that this test if (b & ((1 << len) - 1)) can be simplified to if (b & 1) , since we know that iff the first bit of a tb is set, all other bits from that tb are set too. Signed-off-by: Emilio G. Cota --- translate-all.c | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/translate-all.c b/translate-all.c index 11763c6..749d0f6 100644 --- a/translate-all.c +++ b/translate-all.c @@ -59,6 +59,7 @@ #include "exec/cputlb.h" #include "translate-all.h" +#include "qemu/bitmap.h" #include "qemu/timer.h" //#define DEBUG_TB_INVALIDATE @@ -79,7 +80,7 @@ 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; - uint8_t *code_bitmap; + unsigned long *code_bitmap; #if defined(CONFIG_USER_ONLY) unsigned long flags; #endif @@ -978,39 +979,12 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) tcg_ctx.tb_ctx.tb_phys_invalidate_count++; } -static inline void set_bits(uint8_t *tab, int start, int len) -{ - int end, mask, end1; - - end = start + len; - tab += start >> 3; - mask = 0xff << (start & 7); - if ((start & ~7) == (end & ~7)) { - if (start < end) { - mask &= ~(0xff << (end & 7)); - *tab |= mask; - } - } else { - *tab++ |= mask; - start = (start + 8) & ~7; - end1 = end & ~7; - while (start < end1) { - *tab++ = 0xff; - start += 8; - } - if (start < end) { - mask = ~(0xff << (end & 7)); - *tab |= mask; - } - } -} - static void build_page_bitmap(PageDesc *p) { int n, tb_start, tb_end; TranslationBlock *tb; - p->code_bitmap = g_malloc0(TARGET_PAGE_SIZE / 8); + p->code_bitmap = bitmap_new(TARGET_PAGE_SIZE); tb = p->first_tb; while (tb != NULL) { @@ -1029,7 +1003,7 @@ static void build_page_bitmap(PageDesc *p) tb_start = 0; tb_end = ((tb->pc + tb->size) & ~TARGET_PAGE_MASK); } - set_bits(p->code_bitmap, tb_start, tb_end - tb_start); + bitmap_set(p->code_bitmap, tb_start, tb_end - tb_start); tb = tb->page_next[n]; } } @@ -1219,7 +1193,6 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) { PageDesc *p; - int offset, b; #if 0 if (1) { @@ -1235,9 +1208,7 @@ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) return; } if (p->code_bitmap) { - offset = start & ~TARGET_PAGE_MASK; - b = p->code_bitmap[offset >> 3] >> (offset & 7); - if (b & ((1 << len) - 1)) { + if (test_bit(start & ~TARGET_PAGE_MASK, p->code_bitmap)) { goto do_invalidate; } } else { -- 1.9.1