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

smp: move sub-command "smp_gdb" in file smp.c 

The code for this command is currently replicated in cortex_a and
in mips_m4k and is going to be added again for cortex_m.
Plus, it is going to be obsoleted by the HW thread pseudo RTOS.

Consolidate in smp.c a single instance of the command. This will
simplify both obsoleting it and adding it to cortex_m, whatever
change comes first.

Change-Id: I03cd857e21fa3f7202fdcee36bcbd5aae30a609d
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4991
Tested-by: jenkins
Reviewed-by: Tarek BOCHKATI <tarek.bouchkati@gmail.com>
Reviewed-by: Matthias Welwarsky <matthias@welwarsky.de>
reverse-resume-order
Antonio Borneo 2019-03-07 22:34:29 +01:00 committed by Matthias Welwarsky
parent 246782229f
commit 84a2cab596
3 changed files with 28 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/target/cortex_a.c
View File

@ -2968,27 +2968,6 @@ COMMAND_HANDLER(cortex_a_handle_dbginit_command)
return cortex_a_init_debug_access(target); return cortex_a_init_debug_access(target);
} }
COMMAND_HANDLER(cortex_a_handle_smp_gdb_command)
{
struct target *target = get_current_target(CMD_CTX);
int retval = ERROR_OK;
struct target_list *head;
head = target->head;
if (head != (struct target_list *)NULL) {
if (CMD_ARGC == 1) {
int coreid = 0;
COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
if (ERROR_OK != retval)
return retval;
target->gdb_service->core[1] = coreid;
}
command_print(CMD_CTX, "gdb coreid %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
, target->gdb_service->core[1]);
}
return ERROR_OK;
}
COMMAND_HANDLER(handle_cortex_a_mask_interrupts_command) COMMAND_HANDLER(handle_cortex_a_mask_interrupts_command)
{ {
struct target *target = get_current_target(CMD_CTX); struct target *target = get_current_target(CMD_CTX);
@ -3058,13 +3037,6 @@ static const struct command_registration cortex_a_exec_command_handlers[] = {
.help = "Initialize core debug", .help = "Initialize core debug",
.usage = "", .usage = "",
}, },
{
.name = "smp_gdb",
.handler = cortex_a_handle_smp_gdb_command,
.mode = COMMAND_EXEC,
.help = "display/fix current core played to gdb",
.usage = "",
},
{ {
.name = "maskisr", .name = "maskisr",
.handler = handle_cortex_a_mask_interrupts_command, .handler = handle_cortex_a_mask_interrupts_command,

28
src/target/mips_m4k.c
View File

@ -1334,27 +1334,6 @@ COMMAND_HANDLER(mips_m4k_handle_cp0_command)
return ERROR_OK; return ERROR_OK;
} }
COMMAND_HANDLER(mips_m4k_handle_smp_gdb_command)
{
struct target *target = get_current_target(CMD_CTX);
int retval = ERROR_OK;
struct target_list *head;
head = target->head;
if (head != (struct target_list *)NULL) {
if (CMD_ARGC == 1) {
int coreid = 0;
COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
if (ERROR_OK != retval)
return retval;
target->gdb_service->core[1] = coreid;
}
command_print(CMD_CTX, "gdb coreid %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
, target->gdb_service->core[1]);
}
return ERROR_OK;
}
COMMAND_HANDLER(mips_m4k_handle_scan_delay_command) COMMAND_HANDLER(mips_m4k_handle_scan_delay_command)
{ {
struct target *target = get_current_target(CMD_CTX); struct target *target = get_current_target(CMD_CTX);
@ -1386,13 +1365,6 @@ static const struct command_registration mips_m4k_exec_command_handlers[] = {
.usage = "regnum [value]", .usage = "regnum [value]",
.help = "display/modify cp0 register", .help = "display/modify cp0 register",
}, },
{
.name = "smp_gdb",
.handler = mips_m4k_handle_smp_gdb_command,
.mode = COMMAND_EXEC,
.help = "display/fix current core played to gdb",
.usage = "",
},
{ {
.name = "scan_delay", .name = "scan_delay",
.handler = mips_m4k_handle_scan_delay_command, .handler = mips_m4k_handle_scan_delay_command,

28
src/target/smp.c
View File

@ -151,6 +151,27 @@ COMMAND_HANDLER(deprecated_handle_smp_off_command)
return CALL_COMMAND_HANDLER(default_handle_smp_command); return CALL_COMMAND_HANDLER(default_handle_smp_command);
} }
COMMAND_HANDLER(handle_smp_gdb_command)
{
struct target *target = get_current_target(CMD_CTX);
int retval = ERROR_OK;
struct target_list *head;
head = target->head;
if (head != (struct target_list *)NULL) {
if (CMD_ARGC == 1) {
int coreid = 0;
COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], coreid);
if (ERROR_OK != retval)
return retval;
target->gdb_service->core[1] = coreid;
}
command_print(CMD_CTX, "gdb coreid %" PRId32 " -> %" PRId32, target->gdb_service->core[0]
, target->gdb_service->core[1]);
}
return ERROR_OK;
}
const struct command_registration smp_command_handlers[] = { const struct command_registration smp_command_handlers[] = {
{ {
.name = "smp", .name = "smp",
@ -173,5 +194,12 @@ const struct command_registration smp_command_handlers[] = {
.help = "Stop smp handling", .help = "Stop smp handling",
.usage = "", .usage = "",
}, },
{
.name = "smp_gdb",
.handler = handle_smp_gdb_command,
.mode = COMMAND_EXEC,
.help = "display/fix current core played to gdb",
.usage = "",
},
COMMAND_REGISTRATION_DONE COMMAND_REGISTRATION_DONE
}; };