From patchwork Thu Dec 17 14:51:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 344940 Delivered-To: patch@linaro.org Received: by 2002:a17:906:4755:0:0:0:0 with SMTP id j21csp1290894ejs; Thu, 17 Dec 2020 06:58:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvaPd4ne5Rm4UAbNWaL4zVk/KVhhnLMhMgMhhQpOo+D1QHs4hLQLFy48sHUKzn1Ehzdng0 X-Received: by 2002:a25:4b42:: with SMTP id y63mr53523031yba.10.1608217130909; Thu, 17 Dec 2020 06:58:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608217130; cv=none; d=google.com; s=arc-20160816; b=dmkn4MeMCOen/tClEtFuyzXPnuLC/QerLuhZC+Oe8PfdLV4IeA+S0D5rmpOR5WSG+R alMVd/SqDYlqSuBBDUXzRdamh3kUUwJVAkczS+wEqo1EJopDQGsrTwiJSnnBPDRLO3YD Xs9yjyTMvlcOp2RMNxlG5KEAknM3RXUciVkLZ6esd52gOvgRkH4UkUrIxEzfLoHP975a SqIiSqi+8xcyUN1w/bAO4wS+/PI2tl5/Fo1R0toIgdCt2cmoEDvcnvZzPybGFZF6g1m2 B/R789esJcs0JqnBWQgFJEpekrxiKKT+g24B22NOlKlrm71UMUl1Tid7C6bMa7OU5rfj PhBw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=bBAAD2EsIW/155GIjaU48r4O2esHCcXs+AbT7vfXmho=; b=vV45b8LiQa8hwyvanYCqC14GfOfHDBvXfLoIuedhVeDHZA+He8FDEoG2qx/Yyj1QxU k+x+WfAR6xOFDH1lfB4AaII8iHO+QbQPIvJrnct1UvF/1ygSPQcHNt18sR4FxOx5hjmu RTFEKCOnGMrE0dt3hZcMISQLv1nXyt8VcNgpWDaACxldo4cio0BuWXDNApA4u53NKknj +kisqPkvSkL+JDTi+PPKeRLLd0GdxqWEDj370DPcyT6cZYsFr+Qt5RFRM6yDHCJ+yl1N Po6yiM/jKeRgpBtbvIw1Rj5DlXpOMWnLhxRrBHzJHFJZNX8BQIYnXYfEE4VNfUEJ29+z 6wrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="O/+k+KSr"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h5si5659584ybj.423.2020.12.17.06.58.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Dec 2020 06:58:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="O/+k+KSr"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpujx-00025h-Kz for patch@linaro.org; Thu, 17 Dec 2020 09:58:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpudp-0003Ls-SD for qemu-devel@nongnu.org; Thu, 17 Dec 2020 09:52:30 -0500 Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]:40704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpudm-0004uN-8c for qemu-devel@nongnu.org; Thu, 17 Dec 2020 09:52:29 -0500 Received: by mail-ot1-x334.google.com with SMTP id j12so27484861ota.7 for ; Thu, 17 Dec 2020 06:52:25 -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 :mime-version:content-transfer-encoding; bh=bBAAD2EsIW/155GIjaU48r4O2esHCcXs+AbT7vfXmho=; b=O/+k+KSr9hvaCLLhNFSRZoTnmppJsZP+iKhkMRFeOFLZJqY26DarRxtegaaKIqR4Gg oUDWgneg0fssO7iZiPNDR7XghhU6asWG6eEhc5LhbARpH2yhIw5HhEb6eHgtV3zLXhjR ZYw6vWPt+/Gy2f6xOxfgz0q29sjPwb0aFWoZ0Ro84C+CSwFXQ0LAEXxUwrTAQMRQn5m3 W3JmIcXrjThbe+55Gf9FqJafueB9wzagg6Q+yuJ04GhWbZu/fHLDlwSfOxe8ryg1MWjE RgPNEwSUB4ghqiAU5nbj5QhDOMZARPPiIQCLKuomyc73nezOFywBjUte5cKa5a2O+pQg 2UQQ== 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=bBAAD2EsIW/155GIjaU48r4O2esHCcXs+AbT7vfXmho=; b=aC8FXCVFhlib+JW/ANN+mtDFPyEw74VZoROVGWWJJagvj2lz9qySiOyVDuHDwJNSsI qlZH5YNyjkOL+R02yXazDZtWh/hmOec6z/sYtRVXFrQNOCpLva5SSTdoR9u7/GGbQC+/ FmUYhVySMKIb0C04d9Ic407W6uEklCfvGZVinUjHoXXjozvaeWT6LLMUVZxVYe3adAJW fh+gJ38CTiYH5UKGJHi1rbjUAUwUOd5f8FlwgVxCNXkQ/XwCx3NcpXhFfs+pIe5Na+3D S3VjYHLcZwJZQjFfgPs7xwXz0cShXYdvLQrqfcMcMpJrL4qmxXVf8tCeQVgCotbQTzMR pTUw== X-Gm-Message-State: AOAM5334gYGC51LNlydlDWzis8d048bmrezvUN2hXJzfvj88PMdHbn9k HvVDgh+v0ADiMefLBhooYcICg1ElJtFXUaTC X-Received: by 2002:a9d:a4e:: with SMTP id 72mr30361815otg.267.1608216744212; Thu, 17 Dec 2020 06:52:24 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id x130sm1136342oif.3.2020.12.17.06.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 06:52:23 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 06/23] tcg: Rename struct tcg_temp_info to TempOptInfo Date: Thu, 17 Dec 2020 08:51:58 -0600 Message-Id: <20201217145215.534637-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201217145215.534637-1-richard.henderson@linaro.org> References: <20201217145215.534637-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::334; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Fix this name vs our coding style. Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/optimize.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) -- 2.25.1 diff --git a/tcg/optimize.c b/tcg/optimize.c index 3cffd941bd..81faf7cf10 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -35,20 +35,20 @@ glue(glue(case INDEX_op_, x), _i64): \ glue(glue(case INDEX_op_, x), _vec) -struct tcg_temp_info { +typedef struct TempOptInfo { bool is_const; TCGTemp *prev_copy; TCGTemp *next_copy; tcg_target_ulong val; tcg_target_ulong mask; -}; +} TempOptInfo; -static inline struct tcg_temp_info *ts_info(TCGTemp *ts) +static inline TempOptInfo *ts_info(TCGTemp *ts) { return ts->state_ptr; } -static inline struct tcg_temp_info *arg_info(TCGArg arg) +static inline TempOptInfo *arg_info(TCGArg arg) { return ts_info(arg_temp(arg)); } @@ -71,9 +71,9 @@ static inline bool ts_is_copy(TCGTemp *ts) /* Reset TEMP's state, possibly removing the temp for the list of copies. */ static void reset_ts(TCGTemp *ts) { - struct tcg_temp_info *ti = ts_info(ts); - struct tcg_temp_info *pi = ts_info(ti->prev_copy); - struct tcg_temp_info *ni = ts_info(ti->next_copy); + TempOptInfo *ti = ts_info(ts); + TempOptInfo *pi = ts_info(ti->prev_copy); + TempOptInfo *ni = ts_info(ti->next_copy); ni->prev_copy = ti->prev_copy; pi->next_copy = ti->next_copy; @@ -89,12 +89,12 @@ static void reset_temp(TCGArg arg) } /* Initialize and activate a temporary. */ -static void init_ts_info(struct tcg_temp_info *infos, +static void init_ts_info(TempOptInfo *infos, TCGTempSet *temps_used, TCGTemp *ts) { size_t idx = temp_idx(ts); if (!test_bit(idx, temps_used->l)) { - struct tcg_temp_info *ti = &infos[idx]; + TempOptInfo *ti = &infos[idx]; ts->state_ptr = ti; ti->next_copy = ts; @@ -105,7 +105,7 @@ static void init_ts_info(struct tcg_temp_info *infos, } } -static void init_arg_info(struct tcg_temp_info *infos, +static void init_arg_info(TempOptInfo *infos, TCGTempSet *temps_used, TCGArg arg) { init_ts_info(infos, temps_used, arg_temp(arg)); @@ -171,7 +171,7 @@ static void tcg_opt_gen_movi(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg val) const TCGOpDef *def; TCGOpcode new_op; tcg_target_ulong mask; - struct tcg_temp_info *di = arg_info(dst); + TempOptInfo *di = arg_info(dst); def = &tcg_op_defs[op->opc]; if (def->flags & TCG_OPF_VECTOR) { @@ -202,8 +202,8 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src) TCGTemp *dst_ts = arg_temp(dst); TCGTemp *src_ts = arg_temp(src); const TCGOpDef *def; - struct tcg_temp_info *di; - struct tcg_temp_info *si; + TempOptInfo *di; + TempOptInfo *si; tcg_target_ulong mask; TCGOpcode new_op; @@ -236,7 +236,7 @@ static void tcg_opt_gen_mov(TCGContext *s, TCGOp *op, TCGArg dst, TCGArg src) di->mask = mask; if (src_ts->type == dst_ts->type) { - struct tcg_temp_info *ni = ts_info(si->next_copy); + TempOptInfo *ni = ts_info(si->next_copy); di->next_copy = si->next_copy; di->prev_copy = src_ts; @@ -599,7 +599,7 @@ void tcg_optimize(TCGContext *s) { int nb_temps, nb_globals; TCGOp *op, *op_next, *prev_mb = NULL; - struct tcg_temp_info *infos; + TempOptInfo *infos; TCGTempSet temps_used; /* Array VALS has an element for each temp. @@ -610,7 +610,7 @@ void tcg_optimize(TCGContext *s) nb_temps = s->nb_temps; nb_globals = s->nb_globals; bitmap_zero(temps_used.l, nb_temps); - infos = tcg_malloc(sizeof(struct tcg_temp_info) * nb_temps); + infos = tcg_malloc(sizeof(TempOptInfo) * nb_temps); QTAILQ_FOREACH_SAFE(op, &s->ops, link, op_next) { tcg_target_ulong mask, partmask, affected;