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

target/armv4_5_cache: change prototype of armv4_5_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 armv4_5_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: Ib6ab3ec2fc6504c2a0635b654697a4b6e12a3750
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/5068
Tested-by: jenkins
bscan_optimization
Paul Fertser 2019-04-01 04:42:23 +02:00 committed by Tomas Vanek
parent cff570b22f
commit 54ecec2e85
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/arm920t.c
View File

@ -1585,7 +1585,7 @@ COMMAND_HANDLER(arm920t_handle_cache_info_command)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return armv4_5_handle_cache_info_command(CMD_CTX, return armv4_5_handle_cache_info_command(CMD,
&arm920t->armv4_5_mmu.armv4_5_cache); &arm920t->armv4_5_mmu.armv4_5_cache);
} }

2
src/target/arm926ejs.c
View File

@ -733,7 +733,7 @@ COMMAND_HANDLER(arm926ejs_handle_cache_info_command)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return armv4_5_handle_cache_info_command(CMD_CTX, &arm926ejs->armv4_5_mmu.armv4_5_cache); return armv4_5_handle_cache_info_command(CMD, &arm926ejs->armv4_5_mmu.armv4_5_cache);
} }
static int arm926ejs_virt2phys(struct target *target, target_addr_t virtual, target_addr_t *physical) static int arm926ejs_virt2phys(struct target *target, target_addr_t virtual, target_addr_t *physical)

10
src/target/armv4_5_cache.c
View File

@ -76,23 +76,23 @@ int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common
return ERROR_OK; return ERROR_OK;
} }
int armv4_5_handle_cache_info_command(struct command_context *cmd_ctx, struct armv4_5_cache_common *armv4_5_cache) int armv4_5_handle_cache_info_command(struct command_invocation *cmd, struct armv4_5_cache_common *armv4_5_cache)
{ {
if (armv4_5_cache->ctype == -1) { if (armv4_5_cache->ctype == -1) {
command_print(cmd_ctx, "cache not yet identified"); command_print(cmd->ctx, "cache not yet identified");
return ERROR_OK; return ERROR_OK;
} }
command_print(cmd_ctx, "cache type: 0x%1.1x, %s", armv4_5_cache->ctype, command_print(cmd->ctx, "cache type: 0x%1.1x, %s", armv4_5_cache->ctype,
(armv4_5_cache->separate) ? "separate caches" : "unified cache"); (armv4_5_cache->separate) ? "separate caches" : "unified cache");
command_print(cmd_ctx, "D-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x", command_print(cmd->ctx, "D-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
armv4_5_cache->d_u_size.linelen, armv4_5_cache->d_u_size.linelen,
armv4_5_cache->d_u_size.associativity, armv4_5_cache->d_u_size.associativity,
armv4_5_cache->d_u_size.nsets, armv4_5_cache->d_u_size.nsets,
armv4_5_cache->d_u_size.cachesize); armv4_5_cache->d_u_size.cachesize);
command_print(cmd_ctx, "I-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x", command_print(cmd->ctx, "I-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
armv4_5_cache->i_size.linelen, armv4_5_cache->i_size.linelen,
armv4_5_cache->i_size.associativity, armv4_5_cache->i_size.associativity,
armv4_5_cache->i_size.nsets, armv4_5_cache->i_size.nsets,

4
src/target/armv4_5_cache.h
View File

@ -19,7 +19,7 @@
#ifndef OPENOCD_TARGET_ARMV4_5_CACHE_H #ifndef OPENOCD_TARGET_ARMV4_5_CACHE_H
#define OPENOCD_TARGET_ARMV4_5_CACHE_H #define OPENOCD_TARGET_ARMV4_5_CACHE_H
struct command_context; struct command_invocation;
struct armv4_5_cachesize { struct armv4_5_cachesize {
int linelen; int linelen;
@ -42,7 +42,7 @@ int armv4_5_identify_cache(uint32_t cache_type_reg,
int armv4_5_cache_state(uint32_t cp15_control_reg, int armv4_5_cache_state(uint32_t cp15_control_reg,
struct armv4_5_cache_common *cache); struct armv4_5_cache_common *cache);
int armv4_5_handle_cache_info_command(struct command_context *cmd_ctx, int armv4_5_handle_cache_info_command(struct command_invocation *cmd,
struct armv4_5_cache_common *armv4_5_cache); struct armv4_5_cache_common *armv4_5_cache);
enum { enum {

2
src/target/xscale.c
View File

@ -3090,7 +3090,7 @@ COMMAND_HANDLER(xscale_handle_cache_info_command)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
return armv4_5_handle_cache_info_command(CMD_CTX, &xscale->armv4_5_mmu.armv4_5_cache); return armv4_5_handle_cache_info_command(CMD, &xscale->armv4_5_mmu.armv4_5_cache);
} }
static int xscale_virt2phys(struct target *target, static int xscale_virt2phys(struct target *target,