zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target/armv7a: change prototype of armv7a_handle_cache_info_command() 

To prepare for handling TCL return values consistently, all calls
to command_print/command_print_sameline should be ready to switch
to CMD as first parameter.

Change prototype of armv7a_handle_cache_info_command() to pass CMD
instead of CMD_CTX.

This change was part of http://openocd.zylin.com/1815 from Paul
Fertser and has been extracted and rebased to simplify the review.

Change-Id: I27f507869cb41c74722a759e69dfd45658fcd4be
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5069
Tested-by: jenkins
bscan_optimization
Paul Fertser 2019-04-01 04:50:47 +02:00 committed by Tomas Vanek
parent 54ecec2e85
commit 95caf7714d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/target/armv7a.c
View File

@ -239,7 +239,7 @@ COMMAND_HANDLER(handle_cache_l2x)
return ERROR_OK; return ERROR_OK;
} }
int armv7a_handle_cache_info_command(struct command_context *cmd_ctx, int armv7a_handle_cache_info_command(struct command_invocation *cmd,
struct armv7a_cache_common *armv7a_cache) struct armv7a_cache_common *armv7a_cache)
{ {
struct armv7a_l2x_cache *l2x_cache = (struct armv7a_l2x_cache *) struct armv7a_l2x_cache *l2x_cache = (struct armv7a_l2x_cache *)
@ -248,7 +248,7 @@ int armv7a_handle_cache_info_command(struct command_context *cmd_ctx,
int cl; int cl;
if (armv7a_cache->info == -1) { if (armv7a_cache->info == -1) {
command_print(cmd_ctx, "cache not yet identified"); command_print(cmd->ctx, "cache not yet identified");
return ERROR_OK; return ERROR_OK;
} }
@ -256,7 +256,7 @@ int armv7a_handle_cache_info_command(struct command_context *cmd_ctx,
struct armv7a_arch_cache *arch = &(armv7a_cache->arch[cl]); struct armv7a_arch_cache *arch = &(armv7a_cache->arch[cl]);
if (arch->ctype & 1) { if (arch->ctype & 1) {
command_print(cmd_ctx, command_print(cmd->ctx,
"L%d I-Cache: linelen %" PRIi32 "L%d I-Cache: linelen %" PRIi32
", associativity %" PRIi32 ", associativity %" PRIi32
", nsets %" PRIi32 ", nsets %" PRIi32
@ -269,7 +269,7 @@ int armv7a_handle_cache_info_command(struct command_context *cmd_ctx,
} }
if (arch->ctype >= 2) { if (arch->ctype >= 2) {
command_print(cmd_ctx, command_print(cmd->ctx,
"L%d D-Cache: linelen %" PRIi32 "L%d D-Cache: linelen %" PRIi32
", associativity %" PRIi32 ", associativity %" PRIi32
", nsets %" PRIi32 ", nsets %" PRIi32
@ -283,7 +283,7 @@ int armv7a_handle_cache_info_command(struct command_context *cmd_ctx,
} }
if (l2x_cache != NULL) if (l2x_cache != NULL)
command_print(cmd_ctx, "Outer unified cache Base Address 0x%" PRIx32 ", %" PRId32 " ways", command_print(cmd->ctx, "Outer unified cache Base Address 0x%" PRIx32 ", %" PRId32 " ways",
l2x_cache->base, l2x_cache->way); l2x_cache->base, l2x_cache->way);
return ERROR_OK; return ERROR_OK;

2
src/target/armv7a.h
View File

@ -192,7 +192,7 @@ int armv7a_arch_state(struct target *target);
int armv7a_identify_cache(struct target *target); int armv7a_identify_cache(struct target *target);
int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a); int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a);
int armv7a_handle_cache_info_command(struct command_context *cmd_ctx, int armv7a_handle_cache_info_command(struct command_invocation *cmd,
struct armv7a_cache_common *armv7a_cache); struct armv7a_cache_common *armv7a_cache);
int armv7a_read_ttbcr(struct target *target); int armv7a_read_ttbcr(struct target *target);

2
src/target/armv7a_cache.c
View File

@ -431,7 +431,7 @@ COMMAND_HANDLER(arm7a_l1_cache_info_cmd)
struct target *target = get_current_target(CMD_CTX); struct target *target = get_current_target(CMD_CTX);
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
return armv7a_handle_cache_info_command(CMD_CTX, return armv7a_handle_cache_info_command(CMD,
&armv7a->armv7a_mmu.armv7a_cache); &armv7a->armv7a_mmu.armv7a_cache);
} }

2
src/target/cortex_a.c
View File

@ -2930,7 +2930,7 @@ COMMAND_HANDLER(cortex_a_handle_cache_info_command)
struct target *target = get_current_target(CMD_CTX); struct target *target = get_current_target(CMD_CTX);
struct armv7a_common *armv7a = target_to_armv7a(target); struct armv7a_common *armv7a = target_to_armv7a(target);
return armv7a_handle_cache_info_command(CMD_CTX, return armv7a_handle_cache_info_command(CMD,
&armv7a->armv7a_mmu.armv7a_cache); &armv7a->armv7a_mmu.armv7a_cache);
} }