sim: cpu: fix SMP msg prefix helper

This code fails to compile when SMP is enabled due to some obvious
errors.  Fix those and change the logic to avoid CPP to prevent any
future rot from creeping back in.
This commit is contained in:
Mike Frysinger
2022-12-24 23:43:18 -05:00
parent 23ddbd2f2b
commit fb74976044

View File

@@ -123,14 +123,17 @@ sim_cpu_lookup (SIM_DESC sd, const char *cpu_name)
const char *
sim_cpu_msg_prefix (sim_cpu *cpu)
{
#if MAX_NR_PROCESSORS == 1
return "";
#else
static char *prefix;
if (MAX_NR_PROCESSORS == 1)
return "";
if (prefix == NULL)
{
SIM_DESC sd = CPU_STATE (cpu);
int maxlen = 0;
int i;
for (i = 0; i < MAX_NR_PROCESSORS; ++i)
{
int len = strlen (CPU_NAME (STATE_CPU (sd, i)));
@@ -140,8 +143,8 @@ sim_cpu_msg_prefix (sim_cpu *cpu)
prefix = (char *) xmalloc (maxlen + 5);
}
sprintf (prefix, "%s: ", CPU_NAME (cpu));
return prefix;
#endif
}
/* Cover fn to sim_io_eprintf. */