From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj79O-0002Xu-1h for qemu-devel@nongnu.org; Thu, 24 Mar 2016 11:26:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aj79J-0005SZ-1t for qemu-devel@nongnu.org; Thu, 24 Mar 2016 11:26:17 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:33409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj79I-0005SG-S4 for qemu-devel@nongnu.org; Thu, 24 Mar 2016 11:26:12 -0400 Received: by mail-wm0-x231.google.com with SMTP id l68so279966275wml.0 for ; Thu, 24 Mar 2016 08:26:12 -0700 (PDT) References: <1458815961-31979-1-git-send-email-sergey.fedorov@linaro.org> <1458815961-31979-8-git-send-email-sergey.fedorov@linaro.org> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1458815961-31979-8-git-send-email-sergey.fedorov@linaro.org> Date: Thu, 24 Mar 2016 15:26:05 +0000 Message-ID: <87fuvfrj76.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 7/8] tcg: Extract removing of jumps to TB from tb_phys_invalidate() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: sergey.fedorov@linaro.org Cc: Sergey Fedorov , Richard Henderson , Peter Crosthwaite , qemu-devel@nongnu.org, Paolo Bonzini sergey.fedorov@linaro.org writes: > From: Sergey Fedorov > > Move the code for removing jumps to a TB out of tb_phys_invalidate() to > a separate static inline function tb_jmp_unlink(). This simplifies > tb_phys_invalidate() and improves code structure. > > Signed-off-by: Sergey Fedorov > Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée > --- > translate-all.c | 44 ++++++++++++++++++++++++++------------------ > 1 file changed, 26 insertions(+), 18 deletions(-) > > diff --git a/translate-all.c b/translate-all.c > index 28154ed75888..8b4bfa713bf7 100644 > --- a/translate-all.c > +++ b/translate-all.c > @@ -959,14 +959,37 @@ static inline void tb_reset_jump(TranslationBlock *tb, int n) > tb_set_jmp_target(tb, n, addr); > } > > +/* remove any jumps to the TB */ > +static inline void tb_jmp_unlink(TranslationBlock *tb) > +{ > + uintptr_t tb1, tb2; > + unsigned int n1; > + > + tb1 = tb->jmp_list_first; > + for (;;) { > + TranslationBlock *tmp_tb; > + n1 = tb1 & 3; > + if (n1 == 2) { > + break; > + } > + tmp_tb = (TranslationBlock *)(tb1 & ~3); > + tb2 = tmp_tb->jmp_list_next[n1]; > + tb_reset_jump(tmp_tb, n1); > + tmp_tb->jmp_list_next[n1] = (uintptr_t)NULL; > + tb1 = tb2; > + } > + > + assert(((uintptr_t)tb & 3) == 0); > + tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ > +} > + > /* invalidate one TB */ > void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) > { > CPUState *cpu; > PageDesc *p; > - unsigned int h, n1; > + unsigned int h; > tb_page_addr_t phys_pc; > - uintptr_t tb1, tb2; > > /* remove the TB from the hash list */ > phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); > @@ -1000,22 +1023,7 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) > tb_remove_from_jmp_list(tb, 1); > > /* suppress any remaining jumps to this TB */ > - tb1 = tb->jmp_list_first; > - for (;;) { > - TranslationBlock *tmp_tb; > - n1 = tb1 & 3; > - if (n1 == 2) { > - break; > - } > - tmp_tb = (TranslationBlock *)(tb1 & ~3); > - tb2 = tmp_tb->jmp_list_next[n1]; > - tb_reset_jump(tmp_tb, n1); > - tmp_tb->jmp_list_next[n1] = (uintptr_t)NULL; > - tb1 = tb2; > - } > - > - assert(((uintptr_t)tb & 3) == 0); > - tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ > + tb_jmp_unlink(tb); > > tcg_ctx.tb_ctx.tb_phys_invalidate_count++; > } -- Alex Bennée