From patchwork Thu Mar 24 21:56:47 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: 8665051 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 76E8BC0553 for ; Thu, 24 Mar 2016 22:01:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD07B2022A for ; Thu, 24 Mar 2016 22:01:22 +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 0C08C2021F for ; Thu, 24 Mar 2016 22:01:22 +0000 (UTC) Received: from localhost ([::1]:52997 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDJh-0006gK-IS for patchwork-qemu-devel@patchwork.kernel.org; Thu, 24 Mar 2016 18:01:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDGI-0000MW-Jd for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ajDGH-0008UK-KN for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:50 -0400 Received: from mail-lf0-x22f.google.com ([2a00:1450:4010:c07::22f]:36004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ajDGH-0008U8-DI for qemu-devel@nongnu.org; Thu, 24 Mar 2016 17:57:49 -0400 Received: by mail-lf0-x22f.google.com with SMTP id d82so44672325lfe.3 for ; Thu, 24 Mar 2016 14:57:49 -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 :mime-version:content-transfer-encoding; bh=qSOoiUe771YRCLswaakzXn+1tHLwGnzHCnEgj9EwbSs=; b=BfKrYVvIcUNENyJpMYIykHhrFxaKkla+D9d+z1xm1LOjeq5Xf+GTa7uS3Y3JehP9N8 IpXAyQ6Rno6gtYOqLADYVxCuBzesWwaUkBJg1T6tkP608ZYKb5YE4TiRu+BgCRZmleLX AZTXFkgapKBVM8Utg/4nVEzi8CNbt4mIbtQWA= 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:mime-version:content-transfer-encoding; bh=qSOoiUe771YRCLswaakzXn+1tHLwGnzHCnEgj9EwbSs=; b=eAcRawzxaSCDksQ8b9+/qBV9zf62xbCq86m/z4gzwo+pk9dou71Sunc8fFKGISeGee HbQdqXBEu/j9vL2EFifkz4Lrb8cVvxefE2Y9iT3ZHr1YGrJOl2AlwcGjLEvuAf2jnKnj fxcHb2zy8N/156JfyYvw5RIxFGOgqEVSaLSHMmlRZhK+DltPwYO7bvvKA72iEtcvYvpp 71Z/N5HNcr30oFDSU75cSMUbd9WH0gZJKriS8lRGPruyPB70vnczG4EVuXG38I40kNTs X5aJft84PN/h4GKZzcBitiUkOhm+bmoZCrEh7Fv2Jb3HhIbmb1YkXMD6ANQlIz8dX8j5 B5lw== X-Gm-Message-State: AD7BkJKP2rCLctZd/89s+cYvq8hKnMyb064FLBZz5d8uWD/EDiXOaKg+r92RAEbmnHs/4t7I X-Received: by 10.25.21.151 with SMTP id 23mr4360467lfv.89.1458856668613; Thu, 24 Mar 2016 14:57:48 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-121-115.2com.net. [46.188.121.115]) by smtp.gmail.com with ESMTPSA id a14sm1547144lfe.7.2016.03.24.14.57.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Mar 2016 14:57:47 -0700 (PDT) From: sergey.fedorov@linaro.org To: qemu-devel@nongnu.org Date: Fri, 25 Mar 2016 00:56:47 +0300 Message-Id: <1458856607-3275-9-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1458856607-3275-1-git-send-email-sergey.fedorov@linaro.org> References: <1458856607-3275-1-git-send-email-sergey.fedorov@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22f Cc: Sergey Fedorov , Peter Crosthwaite , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [Qemu-devel] [PATCH v2 8/8] tcg: Clean up tb_jmp_unlink() 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 Unify the code of this function with tb_jmp_remove_from_list(). Making these functions similar improves their readability. Also this could be a step towards making this function thread-safe. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée --- Notes: Changes in v2: * Tweaked a comment to better describe jmp_list_{next|first} usage * Eliminated duplicate dereference of 'ptb' in tb_jmp_unlink() translate-all.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/translate-all.c b/translate-all.c index 80f0714fbb84..39aef48741e1 100644 --- a/translate-all.c +++ b/translate-all.c @@ -963,25 +963,22 @@ static inline void tb_reset_jump(TranslationBlock *tb, int n) /* remove any jumps to the TB */ static inline void tb_jmp_unlink(TranslationBlock *tb) { - uintptr_t tb1, tb2; + TranslationBlock *tb1; + uintptr_t *ptb, ntb; unsigned int n1; - tb1 = tb->jmp_list_first; + ptb = &tb->jmp_list_first; for (;;) { - TranslationBlock *tmp_tb; - n1 = tb1 & 3; + ntb = *ptb; + n1 = ntb & 3; + tb1 = (TranslationBlock *)(ntb & ~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; + tb_reset_jump(tb1, n1); + *ptb = tb1->jmp_list_next[n1]; + tb1->jmp_list_next[n1] = (uintptr_t)NULL; } - - assert(((uintptr_t)tb & 3) == 0); - tb->jmp_list_first = (uintptr_t)tb | 2; /* fail safe */ } /* invalidate one TB */