Skip to content

Commit

Permalink
target/m68k: Use generic cpu_list()
Browse files Browse the repository at this point in the history
Before it's applied:

[gshan@gshan q]$ ./build/qemu-system-m68k -cpu ?
cfv4e
m5206
m5208
m68000
m68010
m68020
m68030
m68040
m68060
any

After it's applied:

[gshan@gshan q]$ ./build/qemu-system-m68k -cpu ?
Available CPUs:
  any
  cfv4e
  m5206
  m5208
  m68000
  m68010
  m68020
  m68030
  m68040
  m68060

Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231114235628.534334-15-gshan@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
  • Loading branch information
Gavin Shan authored and philmd committed Jan 5, 2024
1 parent 979bf44 commit 261f406
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 44 deletions.
4 changes: 0 additions & 4 deletions target/m68k/cpu.h
Original file line number Diff line number Diff line change
Expand Up @@ -556,8 +556,6 @@ static inline bool m68k_feature(CPUM68KState *env, int feature)
return (env->features & BIT_ULL(feature)) != 0;
}

void m68k_cpu_list(void);

void register_m68k_insns (CPUM68KState *env);

enum {
Expand All @@ -576,8 +574,6 @@ enum {

#define CPU_RESOLVING_TYPE TYPE_M68K_CPU

#define cpu_list m68k_cpu_list

/* MMU modes definitions */
#define MMU_KERNEL_IDX 0
#define MMU_USER_IDX 1
Expand Down
40 changes: 0 additions & 40 deletions target/m68k/helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,46 +29,6 @@

#define SIGNBIT (1u << 31)

/* Sort alphabetically, except for "any". */
static gint m68k_cpu_list_compare(gconstpointer a, gconstpointer b)
{
ObjectClass *class_a = (ObjectClass *)a;
ObjectClass *class_b = (ObjectClass *)b;
const char *name_a, *name_b;

name_a = object_class_get_name(class_a);
name_b = object_class_get_name(class_b);
if (strcmp(name_a, "any-" TYPE_M68K_CPU) == 0) {
return 1;
} else if (strcmp(name_b, "any-" TYPE_M68K_CPU) == 0) {
return -1;
} else {
return strcasecmp(name_a, name_b);
}
}

static void m68k_cpu_list_entry(gpointer data, gpointer user_data)
{
ObjectClass *c = data;
const char *typename;
char *name;

typename = object_class_get_name(c);
name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_M68K_CPU));
qemu_printf("%s\n", name);
g_free(name);
}

void m68k_cpu_list(void)
{
GSList *list;

list = object_class_get_list(TYPE_M68K_CPU, false);
list = g_slist_sort(list, m68k_cpu_list_compare);
g_slist_foreach(list, m68k_cpu_list_entry, NULL);
g_slist_free(list);
}

static int cf_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n)
{
if (n < 8) {
Expand Down

0 comments on commit 261f406

Please sign in to comment.