From patchwork Fri Oct 20 23:20:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 116581 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2240221qgn; Fri, 20 Oct 2017 16:52:45 -0700 (PDT) X-Received: by 10.200.42.104 with SMTP id l37mr9602610qtl.73.1508543565039; Fri, 20 Oct 2017 16:52:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508543565; cv=none; d=google.com; s=arc-20160816; b=weejx/jrdIGEFxjK0xy+anojFwf3BNn6UePQMz2bzxFoxICh+HVgSIrAdRwRqc8p0w pq+PsLqY5GTFPMm0FNjjzcSctkSgXlW4KWwhcAMJlYCuEqFRitKWMpX26TM/viEneDLa 0H819nf9YajH17wGuNWPU535QR8ZJYTswRpk2ulj9lVwIRFNLAAEnz78/jZbBS8nDKto AgKSyEufVsV6STcNjqgFwdvPU0zItUFiB4PMZpT2P25nKbvgtk3DJpKQqiRnQCdmoyNV cN1WnBq2hv6jtOhAXQwtkQKM4IB8y5IM692TLyKI6pzXDdvM/0KQYMrWU9Z7OW/y6dEh UVYw== 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=Ei5EZzeBBT1gyqauTMD+SzCbS240zf4C8B4ZhFIKACY=; b=w8pCxewixIWec9HXkoU9tkzGEOfRw8fy3L6k3gukiJHZ5m4cCyR2efObwlEnSP5GZ6 ciFk3hNzjazBcZzfetkb606uRF1oPjStOBzfUGst4gdEZ4UUTxjIJTsmfngaNstdhwW2 IyZxPTcbV5A8E7M6xITL2bILqytGh7MBcHHrbSq+mHI+L+HEzHai/b4m5JXNBVGAdmAy izUMAk+OBkUD+ywLcvm988lh2RAZ4PE2n3qNBwypFWRR6yonnrNEJm3mJhgp604Wrd7c UM5pPARvb7McWK6DYYvguV8akVi6ot71WtlV+MRqEyOVZLge/lgnvf1hHyz2AxquMUA7 JOqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ejs1CfK2; 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 m68si1326593qke.147.2017.10.20.16.52.44 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 20 Oct 2017 16:52:45 -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=Ejs1CfK2; 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]:56111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5h5m-0000Jz-Un for patch@linaro.org; Fri, 20 Oct 2017 19:52:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5gbc-0006Zy-KM for qemu-devel@nongnu.org; Fri, 20 Oct 2017 19:21:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5gbZ-0007yx-CB for qemu-devel@nongnu.org; Fri, 20 Oct 2017 19:21:32 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:47295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e5gbZ-0007yX-0O for qemu-devel@nongnu.org; Fri, 20 Oct 2017 19:21:29 -0400 Received: by mail-pf0-x244.google.com with SMTP id z11so13061239pfk.4 for ; Fri, 20 Oct 2017 16:21:28 -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=Ei5EZzeBBT1gyqauTMD+SzCbS240zf4C8B4ZhFIKACY=; b=Ejs1CfK2XR1o1TDf0XsaRcTd3xx2+QO8zJa39g/Xz6NxC+xYVf8kda8+P5SH35d02h T5FHUDVH9jisQRzaASYiad0/EAuf4sIRcm4rmcS9WzpPMNn0227INnblCsBg/ifcuM4V 1ntSPwxfP0VRNNZM20RyKM2gTRNaSxDnb/abM= 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=Ei5EZzeBBT1gyqauTMD+SzCbS240zf4C8B4ZhFIKACY=; b=TvvaWkNrEBfOuF4ZVGQj2R4nA+1hFYL/PU4YsE8q7O4+4TighdPEwZKoPq4z53MP3t opoLkYvz60PrTXJgtolYdc8rNx1BkxluJNxKFwiv+86vbeTV+Y6YM7VxJIYNvG5ua0JX Rw0hnk1h58yU6Uz/MF3gFjX1k6G2JnAQQQvnlsKlhxF7ZGiKp3QZ1sOQAePknBoCWd6U 6zwylnkHBeo5EnLZK58+oRvb/lr7VNJowWDOqHRauJaPaf2GHQUATLzNbR0IX+2WUkXt G7rGBWZA3umkwHLEms6PEbKzU7A59JQ2URy1ct3aOwsLiFo5/Rk5sMstldNTfVCzM13q 1Gmg== X-Gm-Message-State: AMCzsaX2E+WaUsvjMvS62aaNCge0UHgLZxTLTUWzY+2JtDjzo9nNZF56 7dlfl7vrnBURVz6VZ86VRifrGOAlRVA= X-Google-Smtp-Source: ABhQp+SdmjJ1v1MZS0CoPLPDbWhsxGPXQdtd3HB6M5lxHEPO+g2ipVK8dtAxnbYtHatHKFevx5M8Bg== X-Received: by 10.98.212.91 with SMTP id u27mr3036849pfl.201.1508541687825; Fri, 20 Oct 2017 16:21:27 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-165-104.tukw.qwest.net. [97.113.165.104]) by smtp.gmail.com with ESMTPSA id a17sm3532594pfk.173.2017.10.20.16.21.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2017 16:21:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 16:20:14 -0700 Message-Id: <20171020232023.15010-44-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171020232023.15010-1-richard.henderson@linaro.org> References: <20171020232023.15010-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: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH v7 43/52] gen-icount: fold exitreq_label into TCGContext 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: pbonzini@redhat.com, cota@braap.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Groundwork for supporting multiple TCG contexts. Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Signed-off-by: Emilio G. Cota Signed-off-by: Richard Henderson --- include/exec/gen-icount.h | 7 +++---- tcg/tcg.h | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) -- 2.13.6 diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index c58b0b2585..fe80176462 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -6,13 +6,12 @@ /* Helpers for instruction counting code generation. */ static int icount_start_insn_idx; -static TCGLabel *exitreq_label; static inline void gen_tb_start(TranslationBlock *tb) { TCGv_i32 count, imm; - exitreq_label = gen_new_label(); + tcg_ctx->exitreq_label = gen_new_label(); if (tb_cflags(tb) & CF_USE_ICOUNT) { count = tcg_temp_local_new_i32(); } else { @@ -34,7 +33,7 @@ static inline void gen_tb_start(TranslationBlock *tb) tcg_temp_free_i32(imm); } - tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, exitreq_label); + tcg_gen_brcondi_i32(TCG_COND_LT, count, 0, tcg_ctx->exitreq_label); if (tb_cflags(tb) & CF_USE_ICOUNT) { tcg_gen_st16_i32(count, tcg_ctx->tcg_env, @@ -52,7 +51,7 @@ static inline void gen_tb_end(TranslationBlock *tb, int num_insns) tcg_set_insn_param(icount_start_insn_idx, 1, num_insns); } - gen_set_label(exitreq_label); + gen_set_label(tcg_ctx->exitreq_label); tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED); /* Terminate the linked list. */ diff --git a/tcg/tcg.h b/tcg/tcg.h index 6741f06200..d468c076b1 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -675,6 +675,8 @@ struct TCGContext { struct TCGLabelPoolData *pool_labels; #endif + TCGLabel *exitreq_label; + TCGTempSet free_temps[TCG_TYPE_COUNT * 2]; TCGTemp temps[TCG_MAX_TEMPS]; /* globals first, temps after */