target: get_gdb_arch() accepts target via const pointer

The function in question does not need to change target state. It is a
target-type-dependant function, however, IMHO, it is safe to assume that
any target type would not need to change type-independant state of a
target to figure out the arch.

Change-Id: I607cb3aee6529cd5a97bc1200a0226cf6ef43caf
Signed-off-by: Evgeniy Naydanov <evgeniy.naydanov@syntacore.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/8093
Tested-by: jenkins
Reviewed-by: Jan Matyas <jan.matyas@codasip.com>
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/src/target/arm.h b/src/target/arm.h
index d5053afb814d2d61fc8114af2f3a9d58e661b56d..486666b5c6b0abd07d96afb012cc7c8500847384 100644 (file)
--- a/src/target/arm.h
+++ b/src/target/arm.h
@@ -257,7 +257,7 @@ struct arm {
 };
 
 /** Convert target handle to generic ARM target state handle. */
-static inline struct arm *target_to_arm(struct target *target)
+static inline struct arm *target_to_arm(const struct target *target)
 {
        assert(target);
        return target->arch_info;
@@ -293,11 +293,11 @@ extern const struct command_registration arm_command_handlers[];
 extern const struct command_registration arm_all_profiles_command_handlers[];
 
 int arm_arch_state(struct target *target);
-const char *arm_get_gdb_arch(struct target *target);
+const char *arm_get_gdb_arch(const struct target *target);
 int arm_get_gdb_reg_list(struct target *target,
                struct reg **reg_list[], int *reg_list_size,
                enum target_register_class reg_class);
-const char *armv8_get_gdb_arch(struct target *target);
+const char *armv8_get_gdb_arch(const struct target *target);
 int armv8_get_gdb_reg_list(struct target *target,
                struct reg **reg_list[], int *reg_list_size,
                enum target_register_class reg_class);

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 7debb94984882b02ab4269efc7fa70293c9d6da1..1886d5e1f6a612847402446d7dd40cfe44e2e12a 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -1264,7 +1264,7 @@ const struct command_registration arm_command_handlers[] = {
  * same way as a gdb for arm. This can be changed later on. User can still
  * set the specific architecture variant with the gdb command.
  */
-const char *arm_get_gdb_arch(struct target *target)
+const char *arm_get_gdb_arch(const struct target *target)
 {
        return "arm";
 }

diff --git a/src/target/armv8.c b/src/target/armv8.c
index daf1ffca387e6f6cfb5f20e9413e74f61ea28d61..bf582ff801287a8f4585581ccd5619170d10b863 100644 (file)
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1865,7 +1865,7 @@ const struct command_registration armv8_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-const char *armv8_get_gdb_arch(struct target *target)
+const char *armv8_get_gdb_arch(const struct target *target)
 {
        struct arm *arm = target_to_arm(target);
        return arm->core_state == ARM_STATE_AARCH64 ? "aarch64" : "arm";

diff --git a/src/target/esirisc.c b/src/target/esirisc.c
index 561edb255a766e18497cdc1e8efe87af247b4c3d..c9ac1d606c3873aebf4687f699c51fd678fd49da 100644 (file)
--- a/src/target/esirisc.c
+++ b/src/target/esirisc.c
@@ -1248,7 +1248,7 @@ static int esirisc_arch_state(struct target *target)
        return ERROR_OK;
 }
 
-static const char *esirisc_get_gdb_arch(struct target *target)
+static const char *esirisc_get_gdb_arch(const struct target *target)
 {
        struct esirisc_common *esirisc = target_to_esirisc(target);
 

diff --git a/src/target/esirisc.h b/src/target/esirisc.h
index 7496b1eda7a51ffab7d3a30761860bb7e6b3311b..6f8cd147223a4b8dc4f1f2af1694b0e9c934cc52 100644 (file)
--- a/src/target/esirisc.h
+++ b/src/target/esirisc.h
@@ -106,7 +106,7 @@ struct esirisc_reg {
        int (*write)(struct reg *reg);
 };
 
-static inline struct esirisc_common *target_to_esirisc(struct target *target)
+static inline struct esirisc_common *target_to_esirisc(const struct target *target)
 {
        return (struct esirisc_common *)target->arch_info;
 }

diff --git a/src/target/mem_ap.c b/src/target/mem_ap.c
index 50dc91c7b77215a3d70d89330eeb20c7da3270e9..5c81e3a75f5f37d01279c2237bfc0c3a7268f095 100644 (file)
--- a/src/target/mem_ap.c
+++ b/src/target/mem_ap.c
@@ -182,7 +182,7 @@ static struct reg_arch_type mem_ap_reg_arch_type = {
        .set = mem_ap_reg_set,
 };
 
-static const char *mem_ap_get_gdb_arch(struct target *target)
+static const char *mem_ap_get_gdb_arch(const struct target *target)
 {
        return "arm";
 }

diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index cb8d04f20176c49fe3e63839ae9c1a73bb048b6c..d895ca3726c063e0d529f71e513bd00632c63fb1 100644 (file)
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -1744,7 +1744,7 @@ static int riscv_write_memory(struct target *target, target_addr_t address,
        return tt->write_memory(target, address, size, count, buffer);
 }
 
-static const char *riscv_get_gdb_arch(struct target *target)
+static const char *riscv_get_gdb_arch(const struct target *target)
 {
        switch (riscv_xlen(target)) {
                case 32:

diff --git a/src/target/stm8.c b/src/target/stm8.c
index ad4a45298106103c684d450ca79361adbee0c57b..227101b6f08b102389774f0c831467a82b70ceed 100644 (file)
--- a/src/target/stm8.c
+++ b/src/target/stm8.c
@@ -1158,7 +1158,7 @@ static int stm8_write_core_reg(struct target *target, unsigned int num)
        return ERROR_OK;
 }
 
-static const char *stm8_get_gdb_arch(struct target *target)
+static const char *stm8_get_gdb_arch(const struct target *target)
 {
        return "stm8";
 }

diff --git a/src/target/target.c b/src/target/target.c
index a411270e2299bd82a9d74d497fe78799afc94401..45698a66c59879a6221ddb4b2b3ee32d2583922c 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1358,7 +1358,7 @@ int target_hit_watchpoint(struct target *target,
        return target->type->hit_watchpoint(target, hit_watchpoint);
 }
 
-const char *target_get_gdb_arch(struct target *target)
+const char *target_get_gdb_arch(const struct target *target)
 {
        if (!target->type->get_gdb_arch)
                return NULL;

diff --git a/src/target/target.h b/src/target/target.h
index bd01f5eb6859752ecf1e8db2b1d889a82a5897d6..1713448ce868e019da64bc614168ac56522df2b1 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -501,7 +501,7 @@ int target_hit_watchpoint(struct target *target,
  *
  * This routine is a wrapper for target->type->get_gdb_arch.
  */
-const char *target_get_gdb_arch(struct target *target);
+const char *target_get_gdb_arch(const struct target *target);
 
 /**
  * Obtain the registers for GDB.

diff --git a/src/target/target_type.h b/src/target/target_type.h
index 678ce0f466ec0e30f4d257292430d714dddc842a..bc42c2d16e630a3516868cb7033a6679c127e669 100644 (file)
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -83,7 +83,7 @@ struct target_type {
         * if dynamic allocation is used for this value, it must be managed by
         * the target, ideally by caching the result for subsequent calls.
         */
-       const char *(*get_gdb_arch)(struct target *target);
+       const char *(*get_gdb_arch)(const struct target *target);
 
        /**
         * Target register access for GDB.  Do @b not call this function

diff --git a/src/target/xtensa/xtensa.c b/src/target/xtensa/xtensa.c
index b516c17ab886f093a80c6284b198c7d906489c9c..fb7748aa2d10b75016270f2091d201ce5dde208a 100644 (file)
--- a/src/target/xtensa/xtensa.c
+++ b/src/target/xtensa/xtensa.c
@@ -3442,7 +3442,7 @@ void xtensa_target_deinit(struct target *target)
        free(xtensa->core_config);
 }
 
-const char *xtensa_get_gdb_arch(struct target *target)
+const char *xtensa_get_gdb_arch(const struct target *target)
 {
        return "xtensa";
 }

diff --git a/src/target/xtensa/xtensa.h b/src/target/xtensa/xtensa.h
index f799208f0bb605ac3109dd7329ca8424e5313b91..a220021a68d9edf805d5e9edd98c5ce9e8ade468 100644 (file)
--- a/src/target/xtensa/xtensa.h
+++ b/src/target/xtensa/xtensa.h
@@ -422,7 +422,7 @@ int xtensa_run_algorithm(struct target *target,
        target_addr_t entry_point, target_addr_t exit_point,
        unsigned int timeout_ms, void *arch_info);
 void xtensa_set_permissive_mode(struct target *target, bool state);
-const char *xtensa_get_gdb_arch(struct target *target);
+const char *xtensa_get_gdb_arch(const struct target *target);
 int xtensa_gdb_query_custom(struct target *target, const char *packet, char **response_p);
 
 COMMAND_HELPER(xtensa_cmd_xtdef_do, struct xtensa *xtensa);