From nobody Tue Feb 10 03:39:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504868117223935.3232041451583; Fri, 8 Sep 2017 03:55:17 -0700 (PDT) Received: from localhost ([::1]:44533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqGwK-0002lZ-Ux for importer@patchew.org; Fri, 08 Sep 2017 06:55:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dqGeE-0002GH-CA for qemu-devel@nongnu.org; Fri, 08 Sep 2017 06:36:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dqGe6-0003ME-81 for qemu-devel@nongnu.org; Fri, 08 Sep 2017 06:36:30 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:38375) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dqGe5-0003JF-Tx; Fri, 08 Sep 2017 06:36:22 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3xpYdQ14Qyz9t67; Fri, 8 Sep 2017 20:36:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1504866970; bh=YFB0SJok8k2L2cQ/uSZriHNbTlDQ5H9cGr+hFP4XMMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AFi4ZIz9VU8m/Kxrho/5xfergROViiiwJLV2rUEp/hsjlReX5bi4Z6MqlhoJkPAHb Bb2ejQcVVT1D0ksvcgexwctuZdovv6MbQacAACOIB/68+j8n5X+PYlezcThi/kkmu6 d9I8S5HV7cSAFN4zFSNH1vTtStBouSbCmGV6Yrck= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 8 Sep 2017 20:35:54 +1000 Message-Id: <20170908103558.31632-37-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170908103558.31632-1-david@gibson.dropbear.id.au> References: <20170908103558.31632-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 36/40] ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups 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: qemu-devel@nongnu.org, aik@ozlabs.ru, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, imammedo@redhat.com, sam.bobroff@au1.ibm.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov previous patches cleaned up cpu model/alias naming which allows to simplify cpu model/alias to cpu type lookup a bit byt removing recurssion and dependency of ppc_cpu_class_by_name() / ppc_cpu_class_by_alias() on each other. Besides of simplifying code it reduces it by ~15LOC. Signed-off-by: Igor Mammedov Reviewed-by: David Gibson Signed-off-by: David Gibson --- target/ppc/translate_init.c | 43 +++++++++++++----------------------------= -- 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index f392fa6ea9..4092310c83 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -10252,22 +10252,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_= t pvr) return pcc; } =20 -static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b) -{ - ObjectClass *oc =3D (ObjectClass *)a; - const char *name =3D b; - PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - - if (strncasecmp(name, object_class_get_name(oc), strlen(name)) =3D=3D = 0 && - ppc_cpu_is_valid(pcc) && - strcmp(object_class_get_name(oc) + strlen(name), - POWERPC_CPU_TYPE_SUFFIX) =3D=3D 0) { - return 0; - } - return -1; -} - - static ObjectClass *ppc_cpu_class_by_name(const char *name); =20 static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias) @@ -10292,8 +10276,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCC= PUAlias *alias) =20 static ObjectClass *ppc_cpu_class_by_name(const char *name) { - GSList *list, *item; - ObjectClass *ret =3D NULL; + char *cpu_model, *typename; + ObjectClass *oc; const char *p; int i, len; =20 @@ -10314,21 +10298,20 @@ static ObjectClass *ppc_cpu_class_by_name(const c= har *name) } } =20 - list =3D object_class_get_list(TYPE_POWERPC_CPU, false); - item =3D g_slist_find_custom(list, name, ppc_cpu_compare_class_name); - if (item !=3D NULL) { - ret =3D OBJECT_CLASS(item->data); + cpu_model =3D g_ascii_strdown(name, -1); + p =3D ppc_cpu_lookup_alias(cpu_model); + if (p) { + g_free(cpu_model); + cpu_model =3D g_strdup(p); } - g_slist_free(list); =20 - if (ret) { - return ret; - } + typename =3D g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model); + oc =3D object_class_by_name(typename); + g_free(typename); + g_free(cpu_model); =20 - for (i =3D 0; ppc_cpu_aliases[i].alias !=3D NULL; i++) { - if (strcasecmp(ppc_cpu_aliases[i].alias, name) =3D=3D 0) { - return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]); - } + if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) { + return oc; } =20 return NULL; --=20 2.13.5