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

More cleanup. 

Change-Id: I804bdcec23b69d77dfc376e23c6d1f29f99e7335
This commit is contained in:
Tim Newsome 2019-01-25 15:31:42 -08:00
parent 96df1db7b1
commit e186f62962
5 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rtos/rtos.c
View File

@ -432,7 +432,6 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
target->rtos->current_threadid = target->rtos->current_thread;
else
target->rtos->current_threadid = threadid;
LOG_DEBUG("current_threadid=%ld", target->rtos->current_threadid);
}
gdb_put_packet(connection, "OK", 2);
return ERROR_OK;
@ -517,7 +516,6 @@ int rtos_get_gdb_reg_list(struct connection *connection)
{
struct target *target = get_target_from_connection(connection);
int64_t current_threadid = target->rtos->current_threadid;
LOG_DEBUG("current_threadid=%ld", target->rtos->current_threadid);
if ((target->rtos != NULL) && (current_threadid != -1) &&
(current_threadid != 0) &&
((current_threadid != target->rtos->current_thread) ||

4
src/server/gdb_server.c
View File

@ -96,7 +96,7 @@ struct gdb_connection {
char *thread_list;
};
#if 1
#if 0
#define _DEBUG_GDB_IO_
#endif
@ -736,7 +736,7 @@ static void gdb_signal_reply(struct target *target, struct connection *connectio
struct target *ct;
if (target->rtos != NULL) {
target->rtos->current_threadid = target->rtos->current_thread;
LOG_DEBUG("current_threadid=%ld", target->rtos->current_threadid);
LOG_DEBUG("current_threadid=%" PRId64, target->rtos->current_threadid);
target->rtos->gdb_target_for_threadid(connection, target->rtos->current_threadid, &ct);
} else {
ct = target;

2
src/target/breakpoints.c
View File

@ -549,8 +549,6 @@ int watchpoint_hit(struct target *target, enum watchpoint_rw *rw,
int retval;
struct watchpoint *hit_watchpoint;
LOG_DEBUG("[%d]", target->coreid);
retval = target_hit_watchpoint(target, &hit_watchpoint);
if (retval != ERROR_OK)
return ERROR_FAIL;

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

@ -648,33 +648,12 @@ static void trigger_from_watchpoint(struct trigger *trigger,
int riscv_add_watchpoint(struct target *target, struct watchpoint *watchpoint)
{
LOG_DEBUG("[%d] @0x%" TARGET_PRIxADDR, target->coreid, watchpoint->address);
struct trigger trigger;
trigger_from_watchpoint(&trigger, watchpoint);
if (target->smp) {
struct target *failed = NULL;
for (struct target_list *list = target->head; list != NULL;
list = list->next) {
struct target *t = list->target;
if (add_trigger(t, &trigger) != ERROR_OK) {
failed = t;
break;
}
}
if (failed) {
for (struct target_list *list = target->head;
list->target != failed; list = list->next) {
struct target *t = list->target;
remove_trigger(t, &trigger);
}
return ERROR_FAIL;
}
} else {
int result = add_trigger(target, &trigger);
if (result != ERROR_OK)
return result;
}
watchpoint->set = true;
return ERROR_OK;
@ -688,21 +667,9 @@ int riscv_remove_watchpoint(struct target *target,
struct trigger trigger;
trigger_from_watchpoint(&trigger, watchpoint);
if (target->smp) {
bool failed = false;
for (struct target_list *list = target->head; list != NULL;
list = list->next) {
struct target *t = list->target;
if (remove_trigger(t, &trigger) != ERROR_OK)
failed = true;
}
if (failed)
return ERROR_FAIL;
} else {
int result = remove_trigger(target, &trigger);
if (result != ERROR_OK)
return result;
}
watchpoint->set = false;
return ERROR_OK;

2
src/target/target.c
View File

@ -1206,8 +1206,6 @@ int target_hit_watchpoint(struct target *target,
return ERROR_FAIL;
}
LOG_DEBUG("[%d]", target->coreid);
return target->type->hit_watchpoint(target, hit_watchpoint);
}