From patchwork Thu Mar 24 10:39:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 8659511 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 329899F44D for ; Thu, 24 Mar 2016 10:40:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BBA12038A for ; Thu, 24 Mar 2016 10:40:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C6C9E2037F for ; Thu, 24 Mar 2016 10:40:20 +0000 (UTC) Received: from localhost ([::1]:49139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj2ge-0001Uo-0v for patchwork-qemu-devel@patchwork.kernel.org; Thu, 24 Mar 2016 06:40:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj2gH-0001HE-Aj for qemu-devel@nongnu.org; Thu, 24 Mar 2016 06:40:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aj2gG-0007uT-AH for qemu-devel@nongnu.org; Thu, 24 Mar 2016 06:39:57 -0400 Received: from mail-lf0-x22c.google.com ([2a00:1450:4010:c07::22c]:35761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj2gG-0007uK-2E for qemu-devel@nongnu.org; Thu, 24 Mar 2016 06:39:56 -0400 Received: by mail-lf0-x22c.google.com with SMTP id q73so28622294lfe.2 for ; Thu, 24 Mar 2016 03:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/jsN8NCD2Wi+U1vXmYwLrSGIHVSfGtIyMklNlPy+TOk=; b=aO7rNa7DIHOlKk3FX+rJ189D5xfzKuHCBrgbwDbQnuCqwn+RFEkW2b4AeQwZE1MyLm MkFWmvBpL9Uxhu3QsEfbR8VeARLfi5Rmg0qaKnEkdXPbDYtQ2nLh/5sWgIupmhbEaRNz 27NyDYSHNdSiyjfbrm4E2EjXaTVsWHju2bSS8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/jsN8NCD2Wi+U1vXmYwLrSGIHVSfGtIyMklNlPy+TOk=; b=W96NQZ9Uhc6zIkmcTxB+pOEPdS2bO6Je4AuCIfaTS/HLeS6PqHd/tpTfO0kuhr+QiD pqIYXiCWoHoaJoAPG1I12KWCjyy9v1n3lnfkWtrC/plzUYDNA0VATWJpNdS2B8PX+/mo fDkLc6ZHxW3ZH2P11UGqHNJgLWf8EZHPmWYE7KdfK2TNYXbBVgAKRTRH0AzG+n7OW4ug z0IMj4Ict/KaOGSkhByH1hMdxlNtFwb90GXbvdieaSxZSzzxZkVWhV1v3yG9yQxDwuE2 MHA9CBxMhzXFMD28UpNPixlGbgH9eeVHjZ1ADnESNqOED0IpeShfWESp+uxAlsEpok9R rW7w== X-Gm-Message-State: AD7BkJKyafkTVJFCcKehYUSAdmAdka36rHHc80fHtG5/UpzBU87YBZp2Ivst+Q5UqkkkhuUS X-Received: by 10.25.77.204 with SMTP id a195mr3084837lfb.111.1458815995349; Thu, 24 Mar 2016 03:39:55 -0700 (PDT) Received: from localhost.localdomain ([195.91.132.170]) by smtp.gmail.com with ESMTPSA id jm10sm1069454lbc.34.2016.03.24.03.39.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 03:39:54 -0700 (PDT) From: sergey.fedorov@linaro.org To: qemu-devel@nongnu.org Date: Thu, 24 Mar 2016 13:39:20 +0300 Message-Id: <1458815961-31979-8-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1458815961-31979-1-git-send-email-sergey.fedorov@linaro.org> References: <1458815961-31979-1-git-send-email-sergey.fedorov@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22c Cc: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [Qemu-devel] [PATCH 7/8] tcg: Extract removing of jumps to TB from tb_phys_invalidate() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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++; }