From patchwork Mon Nov 26 23:04:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 152099 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp494379ljp; Mon, 26 Nov 2018 15:07:41 -0800 (PST) X-Google-Smtp-Source: AFSGD/Waq69EgYrLjpDE8ZLaMAFvwPLXVCM3CmVOrc2YElsNz/0feHwh+gJepqBJ6ul4zzFVPAok X-Received: by 2002:a25:8b81:: with SMTP id j1-v6mr30737342ybl.256.1543273661101; Mon, 26 Nov 2018 15:07:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543273661; cv=none; d=google.com; s=arc-20160816; b=XhHjmQD4n4BK1iYYWLl8h+Dxu62Zy9mSVkjuWWoIQJIex/u1WAMu4Tk5qZ9vQ5d7jM B+KkS/u03sJgGstwXD94vBjVafAkj9ZSDBxhd3XXtJY0z8zjISkEg7rxDIZjaEokLsQO S/OdezHhcO4E8Hn/oAad59HTHok82WupGILFTzMhs7cr4dafk1Ar+LuYFdYmmNprnItU c5aDijZFdb9lQPao/UN2Ffqzaf1Zur12PxhrU2emEPxl1umlkeTG5fFGtI8yi6IubqVO q9L2T1w5ob8Ow6C3wtjOm6JLVHUWZJYzKxg77p2I956OjK0bzV5aPA60IajS9evr1Jbq z4pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=cSSRpXux8jrEAJrLH5pON8RbGB5i6xvuDyS55RcT4eY=; b=NdJno+mR5XOFgg1XUJZpdNzjPR7nYy1jtz9ebOt+LPXb8WmstoJzEakSaiPntTmkLT /TFOpWDs3T4l1j1ps3dbzVlcxJqPf+/WTmDKryCMnF8EiD0LaOh7/R/d3GWgLsLVrpN2 kpEzUspxSFzQJTJCiWlBqxloL3rbS0ElIFEAxxf5TRc8YNXJQyrYxqjI9YeQXTt/PakM c5knywvccGBVOkKSvpzQ3IOJkGSENxAuAp1nML5s6P82XwhqD7FWoiTnxVbTpBIq7nYL OxogNqjoCt7VJ7B3XviUlnxeHtVbVZs8QeJn7Y7N5s+yGFJtLgRfho/aiufLu7NA0K2r mtdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fMTfZX9F; 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 p62-v6si1338280ybb.157.2018.11.26.15.07.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 26 Nov 2018 15:07:41 -0800 (PST) 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=fMTfZX9F; 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]:39247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRPye-0005Dh-CY for patch@linaro.org; Mon, 26 Nov 2018 18:07:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRPwH-0002oC-G5 for qemu-devel@nongnu.org; Mon, 26 Nov 2018 18:05:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRPw7-0000I4-IT for qemu-devel@nongnu.org; Mon, 26 Nov 2018 18:05:07 -0500 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:39498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRPw3-0000H2-Pc for qemu-devel@nongnu.org; Mon, 26 Nov 2018 18:04:59 -0500 Received: by mail-pg1-x543.google.com with SMTP id w6so6877520pgl.6 for ; Mon, 26 Nov 2018 15:04:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=cSSRpXux8jrEAJrLH5pON8RbGB5i6xvuDyS55RcT4eY=; b=fMTfZX9FpsFESCixE//OJvf7YONSauAuLkMybk5knPxr63JsF7Mk5xWRI0XvqQgjQa VpB8bldmeRyppGjlDxHCZEpU3ABPt8J9+Xr1ykCrp0JsZdvsemlfmoxq/xFI7vAflXKE JjbGiaPgfMMAzLtbI/UrKCqvVhoAVJubp4Ct0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=cSSRpXux8jrEAJrLH5pON8RbGB5i6xvuDyS55RcT4eY=; b=HNGlpLvVRjavY8ioqWBPaCICRCDl2OoWhFDAHHZ3A6+DdfZrrNFG1KYRiKwCF3aIy5 BkVbzYGVYR2BpAkYZpMKpidfrm/A8YN2GAOf1cvJsxA80lj/eRcL15ENYZmak8V6v4vl viWNZSFNV/JsmoLXrcfeHa2rGw9GSSVa7HI08ozUAwCVTcyl0WUjnm8/HWmAjBiiffjH rRaVfQbkLPvndQjHfEEg/HGevo+nBSW7D9JSTm8RF7c0MN0soAdBozYq40GOYMcyIWpS HwLDMmk69halvtSYp4eJtuoSLIBSdG2wkvAedp9yDiziV6tLMjedCha1pbYcBVFC51tC 39eA== X-Gm-Message-State: AA+aEWZHg9t/63QqTqcU4xn+xEyC5AbN8Zv9M0xTnDgfb1OP5IGTUFQG 2dooeK/P+zwMmwMohmx03YjH706Lw3Q= X-Received: by 2002:a63:4f20:: with SMTP id d32mr26816250pgb.47.1543273497538; Mon, 26 Nov 2018 15:04:57 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-170-180.tukw.qwest.net. [97.113.170.180]) by smtp.gmail.com with ESMTPSA id o13sm1798703pfk.57.2018.11.26.15.04.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Nov 2018 15:04:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2018 15:04:49 -0800 Message-Id: <20181126230450.672-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181126230450.672-1-richard.henderson@linaro.org> References: <20181126230450.672-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH 3/4] tcg: Reference count labels 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Increment when adding branches, and decrement when removing them. Signed-off-by: Richard Henderson --- tcg/tcg-op.h | 1 + tcg/tcg.h | 3 ++- tcg/tcg-op.c | 2 ++ tcg/tcg.c | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) -- 2.17.2 diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index db4e9188f4..7007ec0d4d 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -260,6 +260,7 @@ static inline void gen_set_label(TCGLabel *l) static inline void tcg_gen_br(TCGLabel *l) { + l->refs++; tcg_gen_op1(INDEX_op_br, label_arg(l)); } diff --git a/tcg/tcg.h b/tcg/tcg.h index 6b6bc75c82..c6caeeb42b 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -246,7 +246,8 @@ typedef struct TCGRelocation { typedef struct TCGLabel { unsigned has_value : 1; - unsigned id : 31; + unsigned id : 15; + unsigned refs : 16; union { uintptr_t value; tcg_insn_unit *value_ptr; diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 1ad095cc35..bab889662d 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -240,6 +240,7 @@ void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, TCGv_i32 arg2, TCGLabel *l) if (cond == TCG_COND_ALWAYS) { tcg_gen_br(l); } else if (cond != TCG_COND_NEVER) { + l->refs++; tcg_gen_op4ii_i32(INDEX_op_brcond_i32, arg1, arg2, cond, label_arg(l)); } } @@ -1405,6 +1406,7 @@ void tcg_gen_brcond_i64(TCGCond cond, TCGv_i64 arg1, TCGv_i64 arg2, TCGLabel *l) if (cond == TCG_COND_ALWAYS) { tcg_gen_br(l); } else if (cond != TCG_COND_NEVER) { + l->refs++; if (TCG_TARGET_REG_BITS == 32) { tcg_gen_op6ii_i32(INDEX_op_brcond2_i32, TCGV_LOW(arg1), TCGV_HIGH(arg1), TCGV_LOW(arg2), diff --git a/tcg/tcg.c b/tcg/tcg.c index 17c193791f..31b9b58240 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2191,6 +2191,26 @@ static void process_op_defs(TCGContext *s) void tcg_op_remove(TCGContext *s, TCGOp *op) { + TCGLabel *label; + + switch (op->opc) { + case INDEX_op_br: + label = arg_label(op->args[0]); + label->refs--; + break; + case INDEX_op_brcond_i32: + case INDEX_op_brcond_i64: + label = arg_label(op->args[3]); + label->refs--; + break; + case INDEX_op_brcond2_i32: + label = arg_label(op->args[5]); + label->refs--; + break; + default: + break; + } + QTAILQ_REMOVE(&s->ops, op, link); QTAILQ_INSERT_TAIL(&s->free_ops, op, link); s->nb_ops--;