| 106,25 → 106,33 |
|---|
| { |
| unsigned int i; |
| char *symbol; |
| |
| #ifdef __32_BITS__ |
| printf("# Count Address In symbol\n"); |
| printf("-- ----- ---------- ---------\n"); |
| #endif |
| |
| #ifdef __64_BITS__ |
| printf("# Count Address In symbol\n"); |
| printf("-- ----- ------------------ ---------\n"); |
| #endif |
| |
| if (sizeof(void *) == 4) { |
| printf("# Count Address In symbol\n"); |
| printf("-- ----- ---------- ---------\n"); |
| } else { |
| printf("# Count Address In symbol\n"); |
| printf("-- ----- ------------------ ---------\n"); |
| } |
| |
| for (i = 0; i < BKPOINTS_MAX; i++) |
| if (breakpoints[i].address) { |
| symbol = get_symtab_entry(breakpoints[i].address); |
| |
| if (sizeof(void *) == 4) |
| printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter, |
| breakpoints[i].address, symbol); |
| else |
| printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter, |
| breakpoints[i].address, symbol); |
| |
| #ifdef __32_BITS__ |
| printf("%-2u %-5d %#10zx %s\n", i, |
| breakpoints[i].counter, breakpoints[i].address, |
| symbol); |
| #endif |
| |
| #ifdef __64_BITS__ |
| printf("%-2u %-5d %#18zx %s\n", i, |
| breakpoints[i].counter, breakpoints[i].address, |
| symbol); |
| #endif |
| |
| } |
| return 1; |
| } |
| 162,19 → 170,23 |
|---|
| if ((flags & BKPOINT_INSTR)) { |
| ; |
| } else { |
| if (sizeof(int) == 4) |
| dr7 |= ((unative_t) 0x3) << (18 + 4*curidx); |
| else /* 8 */ |
| dr7 |= ((unative_t) 0x2) << (18 + 4*curidx); |
| |
| #ifdef __32_BITS__ |
| dr7 |= ((unative_t) 0x3) << (18 + 4 * curidx); |
| #endif |
| |
| #ifdef __64_BITS__ |
| dr7 |= ((unative_t) 0x2) << (18 + 4 * curidx); |
| #endif |
| |
| if ((flags & BKPOINT_WRITE)) |
| dr7 |= ((unative_t) 0x1) << (16 + 4*curidx); |
| dr7 |= ((unative_t) 0x1) << (16 + 4 * curidx); |
| else if ((flags & BKPOINT_READ_WRITE)) |
| dr7 |= ((unative_t) 0x3) << (16 + 4*curidx); |
| dr7 |= ((unative_t) 0x3) << (16 + 4 * curidx); |
| } |
| |
| /* Enable global breakpoint */ |
| dr7 |= 0x2 << (curidx*2); |
| dr7 |= 0x2 << (curidx * 2); |
| |
| write_dr7(dr7); |
| |
| 246,15 → 258,15 |
|---|
| if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) { |
| if (*((unative_t *) breakpoints[slot].address) != 0) |
| return; |
| printf("**** Found ZERO on address %lx (slot %d) ****\n", |
| breakpoints[slot].address, slot); |
| printf("*** Found ZERO on address %lx (slot %d) ***\n", |
| breakpoints[slot].address, slot); |
| } else { |
| printf("Data watchpoint - new data: %lx\n", |
| *((unative_t *) breakpoints[slot].address)); |
| *((unative_t *) breakpoints[slot].address)); |
| } |
| } |
| printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate), |
| get_symtab_entry(getip(istate))); |
| get_symtab_entry(getip(istate))); |
| printf("***Type 'exit' to exit kconsole.\n"); |
| atomic_set(&haltstate,1); |
| kconsole((void *) "debug"); |
| 359,7 → 371,9 |
|---|
| } |
| |
| #ifdef CONFIG_SMP |
| static void debug_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused))) |
| static void |
| debug_ipi(int n __attribute__((unused)), |
| istate_t *istate __attribute__((unused))) |
| { |
| int i; |
| |
| 375,7 → 389,7 |
|---|
| { |
| int i; |
| |
| for (i=0; i<BKPOINTS_MAX; i++) |
| for (i = 0; i < BKPOINTS_MAX; i++) |
| breakpoints[i].address = NULL; |
| |
| cmd_initialize(&bkpts_info); |
| 396,11 → 410,9 |
|---|
| panic("could not register command %s\n", addwatchp_info.name); |
| #endif |
| |
| exc_register(VECTOR_DEBUG, "debugger", |
| debug_exception); |
| exc_register(VECTOR_DEBUG, "debugger", debug_exception); |
| #ifdef CONFIG_SMP |
| exc_register(VECTOR_DEBUG_IPI, "debugger_smp", |
| debug_ipi); |
| exc_register(VECTOR_DEBUG_IPI, "debugger_smp", debug_ipi); |
| #endif |
| } |
| |