From patchwork Wed Oct 25 09:35:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 117086 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp659843qgn; Wed, 25 Oct 2017 03:07:57 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RZd9kHmRHLS/DUgdBOqGco+3puBjIhn5jMXfKagLc6eqv2skic/BLImrKL5ZDtW1zzV039 X-Received: by 10.13.219.75 with SMTP id d72mr13137276ywe.17.1508926077210; Wed, 25 Oct 2017 03:07:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508926077; cv=none; d=google.com; s=arc-20160816; b=Hh+HH7q4S5khI+Ov794l9eXqVWruxDPYlmS+x8epsdc6SspTXJgmII6pCllD0SehNX MjTp6kTzv3viqZbKOFDBxN/gUokXtZaozkJF2vg7GOltr0dNxa+v7rPln++evBT/DthP N18zMGG2tfNhhxGfAkm7BIEpmRnPA1hnKe1fybA9++mvddgeaDfSpGvKgjXEFH3V3xz9 rjFqO339hNSvEAW6e+EVqtpdpHS8XqtHs0u6w7qjr+sYpXcGDhxeRxoGcR1nWk8QDSlc hnaoh9nIsDcKmLGSy9/Nero3M9W9rrdz0tKIxiSdPZDCya8T6/GaIUnBMdtFtyCSfdMe /mKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=z9z5nFyzQ+zfNbGl4DmTzRfqXkhjB25qxgQRhQXHqNQ=; b=CKQE9cqj3gurxyZ+6dIYSdZJBuhJhvt16B1Ruif76KlS/c+r4O18TQi3B3i1E/wPEN +6BuIBnUGoGZxiC/Z7KkxJjDH3SJKCmmLQKV+GnzPucwESFXeQL3UB+gtmzSUg5sJkp7 hq8w1azp9bBy1rQ9tkwGlLIQGjbVl2uytEd0tQbsiTt+AxnCwCSs1QGSJ2UHdcV8YBjN Ec8SrdrIq72oicTIiqo9efjAlQJe7A3JV1moZvbX5lvGV5m9d1VNKh/EiVmVAC58l6pO VEZoyR3T96NN9YdTqOhZ8rSFBcKu6JNvCMrij9TBG5S1V4EO9R9ULkhbii7Jn/bUo7Ks A25g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RmdK6mj3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x40si399237ywj.361.2017.10.25.03.07.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 25 Oct 2017 03:07:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RmdK6mj3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7IbM-00021u-Oq for patch@linaro.org; Wed, 25 Oct 2017 06:07:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7I6v-0000FM-7O for qemu-devel@nongnu.org; Wed, 25 Oct 2017 05:36:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7I6t-00008g-FL for qemu-devel@nongnu.org; Wed, 25 Oct 2017 05:36:29 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:56390) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7I6t-00007p-95 for qemu-devel@nongnu.org; Wed, 25 Oct 2017 05:36:27 -0400 Received: by mail-wr0-x243.google.com with SMTP id r79so23326216wrb.13 for ; Wed, 25 Oct 2017 02:36:27 -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=z9z5nFyzQ+zfNbGl4DmTzRfqXkhjB25qxgQRhQXHqNQ=; b=RmdK6mj3R54yLLUm/cLRkHtr3FVFslnclpQWX6ZYXxEXR53X1ZhLbazVbhYBV3sGc3 U6fCP/3AGWcIZN0bp2h3l58TLxZpU9O5pspirjNIgEUxbh+12Dw9EmIMOydykzYFt+Zf pt7H9SZYJJvgsm7fPAX6g9yI2vS2CNpe/jntE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z9z5nFyzQ+zfNbGl4DmTzRfqXkhjB25qxgQRhQXHqNQ=; b=Fqd2kMoDWlHwXbeJWHwwpcitUKvS+L3aL00UTqpuw6samRPigfnRT28MZsUTm6STj3 b4+ijblMM5sweVdddg2CiDCnTuFlUBEB8RG1TENbxbhlTGFc96Z7HBm5uPteznJsPv5W QZIA/qcpyvYjGekuvO1lEwiBpi8ECWEKNj9ds8F0ARzY4lOReil/t2kN88CKp6WeeEzR D0GXhxdFX5hfe6xE0xrGVKi+ahKRtNcGVMEH19Lg63kHiHfglSavk07oJHvg3pAGvX42 0nuuG+rSZm2D/YVXQNIH+O6fUumOKseBpNU+hrTc0LV3vI/85Odfj7BtaTYU12aDyLLe 8PmA== X-Gm-Message-State: AMCzsaWNmXHNlxivGcAd5QtJABHMe0Db638L/dwgcohV36Sa39Ik5RW/ T5vDPQ/9nnIo+UmRO80G1TUgUnE4Au8= X-Received: by 10.223.160.86 with SMTP id l22mr1487413wrl.187.1508924185943; Wed, 25 Oct 2017 02:36:25 -0700 (PDT) Received: from cloudburst.twiddle.net ([62.168.35.107]) by smtp.gmail.com with ESMTPSA id v23sm2751025wmh.8.2017.10.25.02.36.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2017 02:36:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 25 Oct 2017 11:35:22 +0200 Message-Id: <20171025093535.10175-39-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171025093535.10175-1-richard.henderson@linaro.org> References: <20171025093535.10175-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 38/51] exec-all: rename tb_free to tb_remove X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, "Emilio G. Cota" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" We don't really free anything in this function anymore; we just remove the TB from the binary search tree. Suggested-by: Alex Bennée Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/translate-all.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.13.6 diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index e2d598082e..923ece3e9b 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -388,7 +388,7 @@ static inline uint32_t curr_cflags(void) | (use_icount ? CF_USE_ICOUNT : 0); } -void tb_free(TranslationBlock *tb); +void tb_remove(TranslationBlock *tb); void tb_flush(CPUState *cpu); void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr); TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index b44c7941aa..9b58cdee28 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -220,7 +220,7 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles, tb_lock(); tb_phys_invalidate(tb, -1); - tb_free(tb); + tb_remove(tb); tb_unlock(); } #endif diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 678e5ab61e..e929ccb30b 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -373,7 +373,7 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t retaddr) if (tb->cflags & CF_NOCACHE) { /* one-shot translation, invalidate it immediately */ tb_phys_invalidate(tb, -1); - tb_free(tb); + tb_remove(tb); } r = true; } @@ -872,7 +872,7 @@ static TranslationBlock *tb_alloc(target_ulong pc) } /* Called with tb_lock held. */ -void tb_free(TranslationBlock *tb) +void tb_remove(TranslationBlock *tb) { assert_tb_locked(); @@ -1811,7 +1811,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) * cpu_exec_nocache() */ tb_phys_invalidate(tb->orig_tb, -1); } - tb_free(tb); + tb_remove(tb); } /* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not