Message ID | 20230903043030.20708-5-akihiko.odaki@daynix.com |
---|---|
State | New |
Headers | show |
Series | gdbstub and TCG plugin improvements | expand |
On 3/9/23 06:30, Akihiko Odaki wrote: > All implementations of gdb_arch_name() returns dynamic duplicates of > static strings. It's also unlikely that there will be an implementation > of gdb_arch_name() that returns a truly dynamic value due to the nature > of the function returning a well-known identifiers. Qualify the value > gdb_arch_name() with const and make all of its implementations return > static strings. > > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > include/hw/core/cpu.h | 2 +- > target/ppc/internal.h | 2 +- > gdbstub/gdbstub.c | 4 +--- > target/arm/cpu.c | 6 +++--- > target/arm/cpu64.c | 4 ++-- > target/i386/cpu.c | 6 +++--- > target/loongarch/cpu.c | 4 ++-- > target/ppc/gdbstub.c | 6 +++--- > target/riscv/cpu.c | 6 +++--- > target/s390x/cpu.c | 4 ++-- > target/tricore/cpu.c | 4 ++-- > 11 files changed, 23 insertions(+), 25 deletions(-) Nice. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
03.09.2023 07:30, Akihiko Odaki wrote: > All implementations of gdb_arch_name() returns dynamic duplicates of > static strings. It's also unlikely that there will be an implementation > of gdb_arch_name() that returns a truly dynamic value due to the nature > of the function returning a well-known identifiers. Qualify the value > gdb_arch_name() with const and make all of its implementations return > static strings. Why it needs to be a function, can't it be a char pointer initialized at the cpu init time? Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> (What a huge list of recipients in the Cc..) /mjt
On 2023/09/04 14:54, Michael Tokarev wrote: > 03.09.2023 07:30, Akihiko Odaki wrote: >> All implementations of gdb_arch_name() returns dynamic duplicates of >> static strings. It's also unlikely that there will be an implementation >> of gdb_arch_name() that returns a truly dynamic value due to the nature >> of the function returning a well-known identifiers. Qualify the value >> gdb_arch_name() with const and make all of its implementations return >> static strings. > > Why it needs to be a function, can't it be a char pointer > initialized at the cpu init time? There is no real reason I guess. Either is fine in my opinion. > > Reviewed-By: Michael Tokarev <mjt@tls.msk.ru> > > (What a huge list of recipients in the Cc..) > > /mjt
On 4/9/23 07:54, Michael Tokarev wrote: > 03.09.2023 07:30, Akihiko Odaki wrote: >> All implementations of gdb_arch_name() returns dynamic duplicates of >> static strings. It's also unlikely that there will be an implementation >> of gdb_arch_name() that returns a truly dynamic value due to the nature >> of the function returning a well-known identifiers. Qualify the value >> gdb_arch_name() with const and make all of its implementations return >> static strings. > > Why it needs to be a function, can't it be a char pointer > initialized at the cpu init time? For x86_gdb_arch_name() or ppc_gdb_arch_name() we could by moving the #ifdef'ry, but for arm_gdb_arch_name() we'd need to add a specific class for the iwMMXt CPU. Not sure worth it...
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index fdcbe87352..4f5c7eb04e 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -164,7 +164,7 @@ struct CPUClass { vaddr (*gdb_adjust_breakpoint)(CPUState *cpu, vaddr addr); const char *gdb_core_xml_file; - gchar * (*gdb_arch_name)(CPUState *cpu); + const gchar * (*gdb_arch_name)(CPUState *cpu); const char * (*gdb_get_dynamic_xml)(CPUState *cpu, const char *xmlname); void (*disas_set_info)(CPUState *cpu, disassemble_info *info); diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 57acb3212c..974b37aa60 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -221,7 +221,7 @@ void destroy_ppc_opcodes(PowerPCCPU *cpu); /* gdbstub.c */ void ppc_gdb_init(CPUState *cs, PowerPCCPUClass *ppc); -gchar *ppc_gdb_arch_name(CPUState *cs); +const gchar *ppc_gdb_arch_name(CPUState *cs); /** * prot_for_access_type: diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 2772f07bbe..78711801db 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -379,11 +379,9 @@ static const char *get_feature_xml(const char *p, const char **newp, "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">" "<target>"); if (cc->gdb_arch_name) { - gchar *arch = cc->gdb_arch_name(cpu); pstrcat(buf, buf_sz, "<architecture>"); - pstrcat(buf, buf_sz, arch); + pstrcat(buf, buf_sz, cc->gdb_arch_name(cpu)); pstrcat(buf, buf_sz, "</architecture>"); - g_free(arch); } pstrcat(buf, buf_sz, "<xi:include href=\""); pstrcat(buf, buf_sz, cc->gdb_core_xml_file); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index d71a162070..4147c19597 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2281,15 +2281,15 @@ static Property arm_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; -static gchar *arm_gdb_arch_name(CPUState *cs) +static const gchar *arm_gdb_arch_name(CPUState *cs) { ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; if (arm_feature(env, ARM_FEATURE_IWMMXT)) { - return g_strdup("iwmmxt"); + return "iwmmxt"; } - return g_strdup("arm"); + return "arm"; } #ifndef CONFIG_USER_ONLY diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 96158093cc..6b91aab6b7 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -743,9 +743,9 @@ static void aarch64_cpu_finalizefn(Object *obj) { } -static gchar *aarch64_gdb_arch_name(CPUState *cs) +static const gchar *aarch64_gdb_arch_name(CPUState *cs) { - return g_strdup("aarch64"); + return "aarch64"; } static void aarch64_cpu_class_init(ObjectClass *oc, void *data) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 97ad229d8b..68bea8d3f0 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5910,12 +5910,12 @@ static void x86_cpu_load_model(X86CPU *cpu, X86CPUModel *model) memset(&env->user_features, 0, sizeof(env->user_features)); } -static gchar *x86_gdb_arch_name(CPUState *cs) +static const gchar *x86_gdb_arch_name(CPUState *cs) { #ifdef TARGET_X86_64 - return g_strdup("i386:x86-64"); + return "i386:x86-64"; #else - return g_strdup("i386"); + return "i386"; #endif } diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index ad93ecac92..49565da3fa 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -692,9 +692,9 @@ static const struct SysemuCPUOps loongarch_sysemu_ops = { }; #endif -static gchar *loongarch_gdb_arch_name(CPUState *cs) +static const gchar *loongarch_gdb_arch_name(CPUState *cs) { - return g_strdup("loongarch64"); + return "loongarch64"; } static void loongarch_cpu_class_init(ObjectClass *c, void *data) diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c index ca39efdc35..72df36ca06 100644 --- a/target/ppc/gdbstub.c +++ b/target/ppc/gdbstub.c @@ -589,12 +589,12 @@ static int gdb_set_vsx_reg(CPUPPCState *env, uint8_t *mem_buf, int n) return 0; } -gchar *ppc_gdb_arch_name(CPUState *cs) +const gchar *ppc_gdb_arch_name(CPUState *cs) { #if defined(TARGET_PPC64) - return g_strdup("powerpc:common64"); + return "powerpc:common64"; #else - return g_strdup("powerpc:common"); + return "powerpc:common"; #endif } diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 6b93b04453..ef8faaaff5 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1939,17 +1939,17 @@ static Property riscv_cpu_properties[] = { DEFINE_PROP_END_OF_LIST(), }; -static gchar *riscv_gdb_arch_name(CPUState *cs) +static const gchar *riscv_gdb_arch_name(CPUState *cs) { RISCVCPU *cpu = RISCV_CPU(cs); CPURISCVState *env = &cpu->env; switch (riscv_cpu_mxl(env)) { case MXL_RV32: - return g_strdup("riscv:rv32"); + return "riscv:rv32"; case MXL_RV64: case MXL_RV128: - return g_strdup("riscv:rv64"); + return "riscv:rv64"; default: g_assert_not_reached(); } diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index df167493c3..cf4b5e43f2 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -284,9 +284,9 @@ static void s390_cpu_initfn(Object *obj) #endif } -static gchar *s390_gdb_arch_name(CPUState *cs) +static const gchar *s390_gdb_arch_name(CPUState *cs) { - return g_strdup("s390:64-bit"); + return "s390:64-bit"; } static Property s390x_cpu_properties[] = { diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 133a9ac70e..44e3ba6f0e 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -29,9 +29,9 @@ static inline void set_feature(CPUTriCoreState *env, int feature) env->features |= 1ULL << feature; } -static gchar *tricore_gdb_arch_name(CPUState *cs) +static const gchar *tricore_gdb_arch_name(CPUState *cs) { - return g_strdup("tricore"); + return "tricore"; } static void tricore_cpu_set_pc(CPUState *cs, vaddr value)