From nobody Mon Feb 9 04:59:19 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; 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 1504099754892973.2224362580213; Wed, 30 Aug 2017 06:29:14 -0700 (PDT) Received: from localhost ([::1]:50584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn33Q-0005GQ-LH for importer@patchew.org; Wed, 30 Aug 2017 09:29:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn2z8-0001on-Rc for qemu-devel@nongnu.org; Wed, 30 Aug 2017 09:24:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dn2z7-0003Xy-PB for qemu-devel@nongnu.org; Wed, 30 Aug 2017 09:24:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dn2z7-0003XV-GQ; Wed, 30 Aug 2017 09:24:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 87AD55F739; Wed, 30 Aug 2017 13:24:44 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F10177DEE; Wed, 30 Aug 2017 13:24:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 87AD55F739 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=imammedo@redhat.com From: Igor Mammedov To: qemu-devel@nongnu.org Date: Wed, 30 Aug 2017 15:24:32 +0200 Message-Id: <1504099475-241036-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1504099475-241036-1-git-send-email-imammedo@redhat.com> References: <1504099475-241036-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 30 Aug 2017 13:24:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 5/8] 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-ppc@nongnu.org, Alexander Graf , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- v2: s/g_ascii_strup/g_ascii_strdown/ due to switch to lower-cased model names --- 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 0325226..cf0d795 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -10176,22 +10176,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) @@ -10216,8 +10200,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 @@ -10238,21 +10222,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.7.4