diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-24 23:43:18 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-12-25 02:09:17 -0500 |
| commit | fb749760444f6570fa03bc91aa36024b7e4b4e55 (patch) | |
| tree | 4681995a26b927d89199fc2df5070872f5ed8155 /sim | |
| parent | 23ddbd2f2bfc6ab17afb805a70f145ee7af524ea (diff) | |
| download | gdb-fb749760444f6570fa03bc91aa36024b7e4b4e55.zip gdb-fb749760444f6570fa03bc91aa36024b7e4b4e55.tar.gz gdb-fb749760444f6570fa03bc91aa36024b7e4b4e55.tar.bz2 | |
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.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/common/sim-utils.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sim/common/sim-utils.c b/sim/common/sim-utils.c index 259b14c..d4a624c 100644 --- a/sim/common/sim-utils.c +++ b/sim/common/sim-utils.c @@ -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. */ |