mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc: replace inter-function cyclic dependency/recurssion with 2 simple lookups

Browse Source 
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 <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2017-08-30 15:24:32 +02:00 committed by David Gibson
parent 6ea707e9d1
commit 03c9141d75
1 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
target/ppc/translate_init.c
View File

@ -10252,22 +10252,6 @@ PowerPCCPUClass *ppc_cpu_class_by_pvr_mask(uint32_t pvr)
return pcc; return pcc;
} }
static gint ppc_cpu_compare_class_name(gconstpointer a, gconstpointer b)
{
ObjectClass *oc = (ObjectClass *)a;
const char *name = b;
PowerPCCPUClass *pcc = POWERPC_CPU_CLASS(oc);
if (strncasecmp(name, object_class_get_name(oc), strlen(name)) == 0 &&
ppc_cpu_is_valid(pcc) &&
strcmp(object_class_get_name(oc) + strlen(name),
POWERPC_CPU_TYPE_SUFFIX) == 0) {
return 0;
}
return -1;
}
static ObjectClass *ppc_cpu_class_by_name(const char *name); static ObjectClass *ppc_cpu_class_by_name(const char *name);
static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias) static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
@ -10292,8 +10276,8 @@ static ObjectClass *ppc_cpu_class_by_alias(PowerPCCPUAlias *alias)
static ObjectClass *ppc_cpu_class_by_name(const char *name) static ObjectClass *ppc_cpu_class_by_name(const char *name)
{ {
GSList *list, *item; char *cpu_model, *typename;
ObjectClass *ret = NULL; ObjectClass *oc;
const char *p; const char *p;
int i, len; int i, len;
@ -10314,21 +10298,20 @@ static ObjectClass *ppc_cpu_class_by_name(const char *name)
} }
} }
list = object_class_get_list(TYPE_POWERPC_CPU, false); cpu_model = g_ascii_strdown(name, -1);
item = g_slist_find_custom(list, name, ppc_cpu_compare_class_name); p = ppc_cpu_lookup_alias(cpu_model);
if (item != NULL) { if (p) {
ret = OBJECT_CLASS(item->data); g_free(cpu_model);
} cpu_model = g_strdup(p);
g_slist_free(list);
if (ret) {
return ret;
} }
for (i = 0; ppc_cpu_aliases[i].alias != NULL; i++) { typename = g_strdup_printf("%s" POWERPC_CPU_TYPE_SUFFIX, cpu_model);
if (strcasecmp(ppc_cpu_aliases[i].alias, name) == 0) { oc = object_class_by_name(typename);
return ppc_cpu_class_by_alias(&ppc_cpu_aliases[i]); g_free(typename);
} g_free(cpu_model);
if (oc && ppc_cpu_is_valid(POWERPC_CPU_CLASS(oc))) {
return oc;
} }
return NULL; return NULL;