From patchwork Fri May 8 18:26:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 186428 Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp230036ill; Fri, 8 May 2020 11:32:48 -0700 (PDT) X-Google-Smtp-Source: APiQypKVJ2dL7nEerG07B4jVqbRyipOSmTILtSdbdguStLDTMBqZkEoiEmYgXo7No3YslobvUtP1 X-Received: by 2002:a05:620a:110d:: with SMTP id o13mr4180472qkk.212.1588962768013; Fri, 08 May 2020 11:32:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588962768; cv=none; d=google.com; s=arc-20160816; b=Bn1tQ87YX9iQv4W9Mhe6Jc4Ju9kQlaWpHPOwd0AFQCP3rXNhQds6J0zev55OyiLTbg Veyl/7yj2H0hjV8pKtjjx5Obof3RjRq8oHuOD70lkojWMhsD+dKwXbI1ZXNO/k2ebKAe dOn8+CCIivF/FGcRKI4+d4wkv0p2SjRY8FM1QM1WMibfFi7ueDUmZy/QgiBVWbEt54Pj ok+CezNjfMe94wsLo8st/aP1IscxXLekNJhzShuegldxlUtTzMnH2u+s226apvIGDAo0 xtoKwfKbAub41evBUoBe0Ae5ix8x27Qc28MPo9+pcTpd55XtZdsfzG5bV+WWf+WUab17 Yebw== 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=MaLMndUgO42sLP84CXPM/Cp6vzOBQfg+XnMcWTaB1Gk=; b=NrJ19LKh0+Rai162LTS4x0mAIkWxaCUuZv1YVzTg8pps2IYJTjVRTYZu9CVlHuPmyF GO2+agtoNjtMauirX8J2KfRcEqqRjUx4xWBR/FMQNPvRkxcDX3dp3NLxyEEOJdR+AY7T Ds2kdx1MjXaaT52IK9e1tew6bOdy+WbINQSKwlkQ2Bb+6MG+yzSmg7QoXLax7fVHfL4/ j2qb5yz1XiHIOt7U0xcVtT1ntzoSHMA4ysKRBwREznTnze8oB0eVCGeWGDvre5xg7a/f wYxKx1srp/qF7li6qUmJQiuQgwk5P534abrOIHQNVP5DdNG5kEY1YfPyqDM8F0VshOLu FO0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mqqncLRP; 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 x13si1363696qka.4.2020.05.08.11.32.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 May 2020 11:32:48 -0700 (PDT) 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=mqqncLRP; 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]:36218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jX7nj-0000ih-Fw for patch@linaro.org; Fri, 08 May 2020 14:32:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jX7hg-0006t5-Op for qemu-devel@nongnu.org; Fri, 08 May 2020 14:26:34 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:37069) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jX7hf-0006Zq-My for qemu-devel@nongnu.org; Fri, 08 May 2020 14:26:32 -0400 Received: by mail-pg1-x544.google.com with SMTP id f23so569266pgj.4 for ; Fri, 08 May 2020 11:26:31 -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=MaLMndUgO42sLP84CXPM/Cp6vzOBQfg+XnMcWTaB1Gk=; b=mqqncLRPYvyju8cLXYia9ld2LJtHJQ8AhmJaJ+stdhdYo2ZWNoMgP4hvoJx++gwrxv 4s0rsTbcs6d5j++vKkjT9VsnDmwQ7cUsL/lH2Cv8YY4mgtXjrPQjuu8Nmkbg2fcaZPtJ kCnWDhOngFVhRkDliKMYKM6heiiNPvg2roZMedqMQNAEH6jQtIu1NcWzokOlmiY5OY0Q IJcQQPC0Bs/Sa67qw+VGVdrOK+Y3/Rc1/8WVlxmNvhBOrAcQVI6oOFpGFTVMMCL950J4 PcIRg9gY86+n7rm0+IRCm8GlLadnnSaunJdXA6eV8oJrIC7amrD/5PWzzgQ7F5fxICWt lglQ== 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=MaLMndUgO42sLP84CXPM/Cp6vzOBQfg+XnMcWTaB1Gk=; b=Hpj8eRqsA7TTfZJ/ngOB0tNnj9LkTrllS9nNDVRHEqPs8npKG3FmbJ11oIfEcGB1Pt qXWtKmd6reX0hc9qiqbyl807oWL/UpWIxuQpdbz0AQi2NvsJb0FhmEoUTTYyecrMG4hS hthbEvdwHQLRjoakLgWrAEsaxrTgCK2t+If/emKa3t5FX7YZ6HVXqVVu/wM78ENXexD2 rhLEqkp0aEO+xYaHm+Yw9ahob7itJ6rwOBaNY/yuRFZ3Fa0eMqlX7EujEcSmfiM00OnG 0aktiXkqo3h6w6PdRq8a5hKhTr4OQU3/pmo93OAazByqSRM/NaPgt5+8o3apFm9VwuAA wnag== X-Gm-Message-State: AGi0PuaSdDswMRiwwwuWE2kv/6BHFnZz8cLm4oGSxuH2fn1QHI1S6O8C McY9pxbH4l+PQmT7z2ElBCrwOhKG27M= X-Received: by 2002:a62:68c1:: with SMTP id d184mr4228895pfc.138.1588962389918; Fri, 08 May 2020 11:26:29 -0700 (PDT) Received: from localhost.localdomain (174-21-149-226.tukw.qwest.net. [174.21.149.226]) by smtp.gmail.com with ESMTPSA id u9sm2421775pfn.197.2020.05.08.11.26.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 11:26:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 09/19] tcg: Rename struct tcg_temp_info to TempOptInfo Date: Fri, 8 May 2020 11:26:06 -0700 Message-Id: <20200508182616.18318-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200508182616.18318-1-richard.henderson@linaro.org> References: <20200508182616.18318-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::544; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: alex.bennee@linaro.org, =?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.20.1 diff --git a/tcg/optimize.c b/tcg/optimize.c index 8f3bd99ff4..c0fc5e3da6 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; @@ -114,7 +114,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)); @@ -180,7 +180,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) { @@ -211,8 +211,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; @@ -245,7 +245,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; @@ -608,7 +608,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. @@ -619,7 +619,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;