interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #219 from riscv/propagate_errors 

Only propagate register errors on some targets
This commit is contained in:
Tim Newsome 2018-03-02 12:07:55 -08:00 committed by GitHub
parent 0c8235d11f 1d9418fbb0
commit 5767fa8e04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/gdb_server.c
View File

@ -1174,7 +1174,7 @@ static int gdb_get_registers_packet(struct connection *connection,
for (i = 0; i < reg_list_size; i++) { for (i = 0; i < reg_list_size; i++) {
if (!reg_list[i]->valid) { if (!reg_list[i]->valid) {
retval = reg_list[i]->type->get(reg_list[i]); retval = reg_list[i]->type->get(reg_list[i]);
if (retval != ERROR_OK) { if (retval != ERROR_OK && target->propagate_register_errors) {
LOG_DEBUG("Couldn't get register %s.", reg_list[i]->name); LOG_DEBUG("Couldn't get register %s.", reg_list[i]->name);
free(reg_packet); free(reg_packet);
free(reg_list); free(reg_list);
@ -1242,7 +1242,7 @@ static int gdb_set_registers_packet(struct connection *connection,
gdb_target_to_reg(target, packet_p, chars, bin_buf); gdb_target_to_reg(target, packet_p, chars, bin_buf);
retval = reg_list[i]->type->set(reg_list[i], bin_buf); retval = reg_list[i]->type->set(reg_list[i], bin_buf);
if (retval != ERROR_OK) { if (retval != ERROR_OK && target->propagate_register_errors) {
LOG_DEBUG("Couldn't set register %s.", reg_list[i]->name); LOG_DEBUG("Couldn't set register %s.", reg_list[i]->name);
free(reg_list); free(reg_list);
free(bin_buf); free(bin_buf);
@ -1289,7 +1289,7 @@ static int gdb_get_register_packet(struct connection *connection,
if (!reg_list[reg_num]->valid) { if (!reg_list[reg_num]->valid) {
retval = reg_list[reg_num]->type->get(reg_list[reg_num]); retval = reg_list[reg_num]->type->get(reg_list[reg_num]);
if (retval != ERROR_OK) { if (retval != ERROR_OK && target->propagate_register_errors) {
LOG_DEBUG("Couldn't get register %s.", reg_list[reg_num]->name); LOG_DEBUG("Couldn't get register %s.", reg_list[reg_num]->name);
free(reg_list); free(reg_list);
return gdb_error(connection, retval); return gdb_error(connection, retval);
@ -1349,7 +1349,7 @@ static int gdb_set_register_packet(struct connection *connection,
gdb_target_to_reg(target, separator + 1, chars, bin_buf); gdb_target_to_reg(target, separator + 1, chars, bin_buf);
retval = reg_list[reg_num]->type->set(reg_list[reg_num], bin_buf); retval = reg_list[reg_num]->type->set(reg_list[reg_num], bin_buf);
if (retval != ERROR_OK) { if (retval != ERROR_OK && target->propagate_register_errors) {
LOG_DEBUG("Couldn't set register %s.", reg_list[reg_num]->name); LOG_DEBUG("Couldn't set register %s.", reg_list[reg_num]->name);
free(bin_buf); free(bin_buf);
free(reg_list); free(reg_list);

1
src/target/riscv/riscv.c
View File

@ -245,6 +245,7 @@ static int riscv_init_target(struct command_context *cmd_ctx,
struct target *target) struct target *target)
{ {
LOG_DEBUG("riscv_init_target()"); LOG_DEBUG("riscv_init_target()");
target->propagate_register_errors = true;
target->arch_info = calloc(1, sizeof(riscv_info_t)); target->arch_info = calloc(1, sizeof(riscv_info_t));
if (!target->arch_info) if (!target->arch_info)
return ERROR_FAIL; return ERROR_FAIL;

8
src/target/target.h
View File

@ -204,6 +204,14 @@ struct target {
/* file-I/O information for host to do syscall */ /* file-I/O information for host to do syscall */
struct gdb_fileio_info *fileio_info; struct gdb_fileio_info *fileio_info;
/**
* When true, send gdb an error result when reading/writing a register
* fails. This must be false for some ARM targets (Cortex-M3), where a 'g'
* packet results in an attempt to read 'r0', which fails, which causes gdb
* to close the connection.
*/
bool propagate_register_errors;
}; };
struct target_list { struct target_list {