For target/sh4, the registered CPU type name is always the combination of the CPU model name and suffix. Use cpu_model_from_type() to show the CPU model names.
Besides, superh_cpu_class_by_name() is improved by avoiding "goto out" tag and renaming @s to @model since it points to CPU model name. Signed-off-by: Gavin Shan <[email protected]> --- target/sh4/cpu.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index a8ec98b134..6097ddd52d 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -125,9 +125,10 @@ static void superh_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) static void superh_cpu_list_entry(gpointer data, gpointer user_data) { const char *typename = object_class_get_name(OBJECT_CLASS(data)); - int len = strlen(typename) - strlen(SUPERH_CPU_TYPE_SUFFIX); + char *model = cpu_model_from_type(typename); - qemu_printf("%.*s\n", len, typename); + qemu_printf(" %s\n", model); + g_free(model); } void sh4_cpu_list(void) @@ -135,6 +136,7 @@ void sh4_cpu_list(void) GSList *list; list = object_class_get_list_sorted(TYPE_SUPERH_CPU, false); + qemu_printf("Available CPUs:\n"); g_slist_foreach(list, superh_cpu_list_entry, NULL); g_slist_free(list); } @@ -142,20 +144,19 @@ void sh4_cpu_list(void) static ObjectClass *superh_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; - char *s, *typename = NULL; + char *model, *typename; - s = g_ascii_strdown(cpu_model, -1); - if (strcmp(s, "any") == 0) { - oc = object_class_by_name(TYPE_SH7750R_CPU); - goto out; + model = g_ascii_strdown(cpu_model, -1); + if (strcmp(model, "any") == 0) { + typename = g_strdup(TYPE_SH7750R_CPU); + } else { + typename = g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), model); } - typename = g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), s); oc = object_class_by_name(typename); - -out: - g_free(s); + g_free(model); g_free(typename); + return oc; } -- 2.41.0
