* ddb/db_break.c: Don't include ddb/db_access.h (DB_CHECK_ACCESS() and DB_PHYS_EQ() are no longer needed) Remove register qualifier. Use db_is_current_task() instead of DB_CHECK_ACCESS(). Remove dead code around DB_PHYS_EQ() call.
--- ddb/db_break.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ddb/db_break.c b/ddb/db_break.c index a566d02..554dd30 100644 --- a/ddb/db_break.c +++ b/ddb/db_break.c @@ -46,7 +46,6 @@ #include <ddb/db_output.h> #include <ddb/db_cond.h> #include <ddb/db_expr.h> -#include <ddb/db_access.h> #define NBREAKPOINTS 100 #define NTHREAD_LIST (NBREAKPOINTS*3) @@ -82,7 +81,7 @@ db_breakpoint_alloc() void db_breakpoint_free(bkpt) - register db_breakpoint_t bkpt; + db_breakpoint_t bkpt; { bkpt->link = db_free_breakpoints; db_free_breakpoints = bkpt; @@ -285,7 +284,7 @@ db_set_breakpoint(task, addr, count, thread, task_bpt) return NULL; } } else { - if (!DB_CHECK_ACCESS(addr, BKPT_SIZE, task)) { + if (!db_is_current_task(task)) { db_printf("Cannot set break point at %X\n", addr); return NULL; } @@ -377,9 +376,6 @@ db_find_breakpoint_here(task, addr) || (task != TASK_NULL && (bkpt->flags & BKPT_USR_GLOBAL))) && bkpt->address == addr) return(TRUE); - if ((bkpt->flags & BKPT_USR_GLOBAL) == 0 && - DB_PHYS_EQ(task, (vm_offset_t)addr, bkpt->task, (vm_offset_t)bkpt->address)) - return (TRUE); } return(FALSE); } @@ -408,7 +404,7 @@ db_set_breakpoints(void) } else bkpt->flags &= ~BKPT_1ST_SET; } - if (DB_CHECK_ACCESS(bkpt->address, BKPT_SIZE, task)) { + if (db_is_current_task(task)) { inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, task); if (inst == BKPT_SET(inst)) @@ -452,7 +448,7 @@ db_clear_breakpoints(void) task = cur_task; } if ((bkpt->flags & BKPT_SET_IN_MEM) - && DB_CHECK_ACCESS(bkpt->address, BKPT_SIZE, task)) { + && db_is_current_task(task)) { inst = db_get_task_value(bkpt->address, BKPT_SIZE, FALSE, task); if (inst != BKPT_SET(inst)) { -- 1.8.1.4