From patchwork Tue Dec 25 20:55:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154487 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5216600ljp; Tue, 25 Dec 2018 13:09:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/XNBUorTgOGRViH6Y66jgIrwlYtHb+QIE3yEQ/MyKual4OCbqOxLekA2pmhfAybwiMKYq31 X-Received: by 2002:aed:29a6:: with SMTP id o35mr15946981qtd.257.1545772156578; Tue, 25 Dec 2018 13:09:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545772156; cv=none; d=google.com; s=arc-20160816; b=sAQv7+2mOZTzQ2SLUbP4h/6QqIESaNmR3kUNIBp5fXkiZnnqb7UYavn3QNfeHFdWEK vsMb/MxjWdK+iWmQAGxAoQYXBBanZIfr//FjozMV65tW/bopSA8UwMsP1mEhpFqlJPfs vqFOItWQ98HqVg0FvasXHbPZ29DLp71E7xvS8q7yT0cvzM+NPiCop+M15q7FIT5uom8x 9yqn94ViaaF3X7zF3FF56vkw40w9V/FSDqEXlg0aoT2arShY5lS6inZ9wUwK2njoX2Yo 9msxEghEjEx7YQZPRp9RNULDxv2tdsYfP9R4cz5L+mhGeZYS8QZ+IR2pjiQpnXWkvN/9 WYHw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=mxzZ7n1xMCyt822noYykoJDAt1ntOVQ2M5mtJJ43TvI=; b=ovq2WdPvr7ieaPXVPfi9p0H3ZQaznu74SywGkveuYWYKz4tOha4S3fXKS1US7w9hd0 ai6bY9i508QXA9MlP7hRo0tcEi3mebNPtoDbHrEfOyhdTH2T/G5HJCAWpV4K02SF/C4O SAJQQ/rKQ0ZgwC36dt/jvOlmx8HTMFoo8edhTTLWXuMz9bxkC6AUpONcGr28q54hte/d BG8VieQLJXC01n0p38bdeLQF3jShx6hhFVrhx5F+W/w5lckxWMRylTVF1Cfcb7VNVcXu 2jdMDd0d3SgmH/LlfiwFHAPEXTtqAsyVmPYv45/b1DZvOwz1Huu1RPZFGsyyA8WX4nBj IeAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WxN1Tq+o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 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. [208.118.235.17]) by mx.google.com with ESMTPS id h9si11644721qka.21.2018.12.25.13.09.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Dec 2018 13:09:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WxN1Tq+o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 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 ([127.0.0.1]:43127 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtwx-0002pX-V9 for patch@linaro.org; Tue, 25 Dec 2018 16:09:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbtnB-0007In-5A for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbtn8-0000vG-8b for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:09 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:41896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbtn8-0000uP-26 for qemu-devel@nongnu.org; Tue, 25 Dec 2018 15:59:06 -0500 Received: by mail-pl1-x631.google.com with SMTP id u6so6801994plm.8 for ; Tue, 25 Dec 2018 12:59:05 -0800 (PST) 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=mxzZ7n1xMCyt822noYykoJDAt1ntOVQ2M5mtJJ43TvI=; b=WxN1Tq+osk/yrVqwbiY5UHaOSvbEQxao6q2eZgqITpObcVNkZypVuwX62ntAqcrBDk zv2ONe0ZIahLwal1tbNElfBe0Lvl8m7nSiomWzsCtkYV0xiGNohL8SwX6niX7wbEp5hN inVU3K+x5Bfnt1JUMp8h/lm9gbNKgjsQz8ABI= 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; bh=mxzZ7n1xMCyt822noYykoJDAt1ntOVQ2M5mtJJ43TvI=; b=h/jw7L9q7NZjPM5/vrATZOIxBnNUb38Q9aItb9rl8fdjxnZlyoBSi6p4MD6daUSefI ptgx39B5jWsB+e/ZNerg9G44mgmgUSQvhWqhrEQienW2wbhPIGkqkY+OSFAXg+okxdNU egbTHpyi6sp1J/prLCTnHjHql3s+dlszAW+Wi+MJ96uAtDBPHZGASy7W5SrtLoPcYs85 jQeuRsW6VqmNcJo4FYWQ9NCHmiGhGGrQVzudOE2OvzXuNWVPHv9kWQxBkH50TaSHZYXe wY19+rPILTD3Oa6yb/Ecir0zoRF1fd53medcN8RtdfZxrsB0/yNhLqLPJf5Ae6+t8W3S zDvA== X-Gm-Message-State: AJcUuke2rnEHf7LfjWlchufFGLLcQOXHeHVN/909wnSpVn2mIWPl9BDT XP96/G1C2qOPAS4wnWtg2SviLU9ahz4= X-Received: by 2002:a17:902:ab92:: with SMTP id f18mr16835816plr.221.1545771544772; Tue, 25 Dec 2018 12:59:04 -0800 (PST) Received: from cloudburst.home (c211-28-135-144.sunsh3.vic.optusnet.com.au. [211.28.135.144]) by smtp.gmail.com with ESMTPSA id t21sm48501628pgg.24.2018.12.25.12.59.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Dec 2018 12:59:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 26 Dec 2018 07:55:15 +1100 Message-Id: <20181225205529.10874-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181225205529.10874-1-richard.henderson@linaro.org> References: <20181225205529.10874-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::631 Subject: [Qemu-devel] [PULL 28/42] 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Increment when adding branches, and decrement when removing them. Reviewed-by: Emilio G. Cota 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 492d8dcf10..db2d91867f 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -244,7 +244,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 38652db32c..1bd7ef24af 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 963cb37892..99afc65126 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2171,6 +2171,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--;