From patchwork Thu Jan 14 02:16:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 362802 Delivered-To: patch@linaro.org Received: by 2002:a02:ccad:0:0:0:0:0 with SMTP id t13csp70582jap; Wed, 13 Jan 2021 18:27:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyQlhNQISY78I2A3mstAbKS9wsXD5VC5q04Pa9fx0nkmj329g/rnAINiB9CLTV81Z0VE3V X-Received: by 2002:a25:adc5:: with SMTP id d5mr7312420ybe.401.1610591278849; Wed, 13 Jan 2021 18:27:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610591278; cv=none; d=google.com; s=arc-20160816; b=ggL/6BRgCgJjMv77jM+VtmZVW6Fzz978yA10H7X7L1xBe+RR5bWXNA12FO1PF2raK3 C4QfA4MW66URwU/IHFM7DDKlnBsyfDEbGFEsEpTof3zdZ8W3hl3qxh61X5T2pkbMsoke PjO7wu9u2q6QiJhc+Viq3CI0nBLvHR/eVb2/qCofw7lAcjZGIGrGUa6R4MC15fYM7n6L 9D62E7baLynVxvFv+qIv86rcXxEBFjNGSJIvbmVuR8/BUX36WFg73WZnOX47xv/euNeU 08uuxwqf9RX75mwJPaSNxmTJs6CeRiaewjyrd7bt+5Rm4UyDBGmtkPz6EtlQpdae5v9q Qeyw== 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=qXpykEtc7vaKX9QcxuT/1Uq7HaNn7jlaJj69OtcFcWE=; b=jZwtct4Xcl7D0vrIoikkKIRR82UzFnbo9epRDnZuutvAvOS6sbsz7XkV+xAjX8x/pn 2WxGCHfq8umjfKETBb9j8ADqXLOKfBcPD6Z7Ft6b9zkJPUDgap6E/iNpgaiBjqyywlBj ZsmqJ/bfxIIrnYvFFqxhGrYD9VQOZB3VYq+c5+Zw8i/4T6wU5k1kP2xdwWgBCdZ6XC3v XJBoVhxWi7ouKIVqLEGFxOyPc8ZY2f9GXLKnun6C5YgMAbsyo4Rax6t/WIK6wAyg8PmI Mc7l8VvuORh5yz6iK6aXFBfAP9DvaF/Y+lEeI7qdyXn0WiZ18a8Tu+YO/03w/iBcXhWA IZoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eHAB5yNR; 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 a9si3792797ybc.91.2021.01.13.18.27.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Jan 2021 18:27:58 -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=eHAB5yNR; 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]:37272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzsMg-0008HF-A5 for patch@linaro.org; Wed, 13 Jan 2021 21:27:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzsCF-0003RP-PS for qemu-devel@nongnu.org; Wed, 13 Jan 2021 21:17:11 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:43871) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzsCE-0003Pm-0u for qemu-devel@nongnu.org; Wed, 13 Jan 2021 21:17:11 -0500 Received: by mail-pf1-x42e.google.com with SMTP id c12so2447698pfo.10 for ; Wed, 13 Jan 2021 18:17:09 -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=qXpykEtc7vaKX9QcxuT/1Uq7HaNn7jlaJj69OtcFcWE=; b=eHAB5yNRSmzYV23tyKPFIXCzDNNBO7jyOFjJ3U53SBkBcS48ftXISiyn93yKOpeSTh PdTa0uZYhQLK5DOED1BUl2C/YWmXLlmOwHPXtcxiTyz8Z2luvk5tGFFxjt8Vc2zJ7WHq UJT13y0BZkbWP/NlLWmKx2KnitJ+hkig6wMuV/5SFql+xSUXg0m7TswiCBGKLR2xFd/I r1TBYbR5TVaFU4sLIfBA1A+k6kjOexFv/FmGwdatL9RUhd3oM9AUJbe9zXJJGh8uJWeC EdbgZ1t/lTS1he/4n7wh2GfE+x0KAXPiKJf0QRIVWH+VEfHEHmSwrgg7upT/foiPyQ7O l6Qg== 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=qXpykEtc7vaKX9QcxuT/1Uq7HaNn7jlaJj69OtcFcWE=; b=fT0HrZ+Apb/EUnsvjTcuPd/Pzy3Dts8yoEh6799Ang5J7iyTVd35rkwR+JNaGqBAqu CUm4CcJm09z4EpIGNF+HH63S+RDUIfORGM4ZEtzCk4rkFG089RyIuf1YITwsFk5UdrKJ +is3W3QQcVXTcq3sCSNj4maZDTwVO7y8OKTdbAnmlRYIRCB+JtJJzZhu8/9HyScX2m1x 7md1th7n8Ht7hKgI1W77kvg8xaBcjNKnu2wce+4EzjlnHrLB47tvwxZtsPcxJ6zYLnCC 6Svl+ogPQn7AKuyJoJsi6cpNrjQL8Ovg2WyO8E0D2V2cStixT7E0h+l+LdhPSmXE+S2H owNQ== X-Gm-Message-State: AOAM532J5OzK7eXrOuYxcZQiTAN0DMRfCfJgCYN/lqFlZNcFcemxWMXU MocFK9ZScHQQg875Ocoyoq7ojgstCEv+Og== X-Received: by 2002:a63:f512:: with SMTP id w18mr5064342pgh.154.1610590628506; Wed, 13 Jan 2021 18:17:08 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id i7sm3771687pfc.50.2021.01.13.18.17.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jan 2021 18:17:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 06/24] tcg: Rename struct tcg_temp_info to TempOptInfo Date: Wed, 13 Jan 2021 16:16:36 -1000 Message-Id: <20210114021654.647242-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210114021654.647242-1-richard.henderson@linaro.org> References: <20210114021654.647242-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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: peter.maydell@linaro.org, =?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 2f827a9d2d..0da9750b65 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;