auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target: Make use of str_enabled_disabled()

Browse Source 
The data type changes introduced in [1,2] lead to implicit casts from a
boolean to an integer value in the string selection between "enabled" and
"disabled".

Use str_enabled_disabled() to get rid of this implicit cast.

[1] https://review.openocd.org/c/openocd/+/8988
[2] https://review.openocd.org/c/openocd/+/8992

Change-Id: Ia98abdd43b42f394f5bf0aa845017dfbb0e087fd
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: https://review.openocd.org/c/openocd/+/9007
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Marc Schink
2025-07-20 11:33:38 +00:00
committed by Antonio Borneo
parent bd32290864
commit c2b8f994bf
6 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/target/armv7a.c
View File

@@ -18,6 +18,7 @@
#include "register.h"
#include <helper/binarybuffer.h>
#include <helper/string_choices.h>
#include <helper/command.h>
#include <stdlib.h>
@@ -480,10 +481,6 @@ int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a)
int armv7a_arch_state(struct target *target)
{
static const char *state[] = {
"disabled", "enabled"
};
struct armv7a_common *armv7a = target_to_armv7a(target);
struct arm *arm = &armv7a->arm;
@@ -496,13 +493,13 @@ int armv7a_arch_state(struct target *target)
if (armv7a->is_armv7r) {
LOG_TARGET_USER(target, "D-Cache: %s, I-Cache: %s",
state[armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled],
state[armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled]);
str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled),
str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled));
} else {
LOG_TARGET_USER(target, "MMU: %s, D-Cache: %s, I-Cache: %s",
state[armv7a->armv7a_mmu.mmu_enabled],
state[armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled],
state[armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled]);
str_enabled_disabled(armv7a->armv7a_mmu.mmu_enabled),
str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.d_u_cache_enabled),
str_enabled_disabled(armv7a->armv7a_mmu.armv7a_cache.i_cache_enabled));
}
if (arm->core_mode == ARM_MODE_ABT)