| 45,75 → 45,44 |
|---|
| |
| #define OPCODE_INT3 0xCC |
| |
| static breakpoint_t *lifted_brkpt; |
| |
| void arch_breakpoint_add(uintptr_t addr) |
| int arch_breakpoint_set(breakpoint_t *b) |
| { |
| char brkp[1]; |
| int rc; |
| breakpoint_t *brk; |
| int i; |
| |
| brk = NULL; |
| for (i = 1; i < MAX_BRKPTS; i++) |
| if (brk_list[i].set == 0) { brk = brk_list+i; break; } |
| rc = udebug_mem_read(app_phone, &b->arch.back, b->addr, 1); |
| cons_printf("udebug_mem_read() -> %d\n", rc); |
| if (rc < 0) return rc; |
| |
| if (!brk) { |
| cons_printf("too many breakpoints\n"); |
| return; |
| } |
| brkp[0] = OPCODE_INT3; |
| rc = udebug_mem_write(app_phone, brkp, b->addr, 1); |
| if (rc < 0) return rc; |
| |
| rc = udebug_mem_read(app_phone, &brk->arch.back, addr, 1); |
| cons_printf("udebug_mem_read() -> %d\n", rc); |
| brkp[0] = OPCODE_INT3; |
| rc = udebug_mem_write(app_phone, brkp, addr, 1); |
| cons_printf("udebug_mem_write() -> %d\n", rc); |
| |
| brk->addr = addr; |
| brk->set = 1; |
| |
| cons_printf("Added breakpoint %d\n", i); |
| return 0; |
| } |
| |
| void arch_breakpoint_remove(int id) |
| int arch_breakpoint_remove(breakpoint_t *b) |
| { |
| int rc; |
| |
| if (id < 1 || id >= MAX_BRKPTS || brk_list[id].set == 0) { |
| cons_printf("No such breakpoint\n"); |
| return; |
| } |
| |
| if (lifted_brkpt == &brk_list[id]) { |
| lifted_brkpt = NULL; |
| if (b->active) { |
| active_bkpt = NULL; |
| } else { |
| rc = udebug_mem_write(app_phone, &brk_list[id].arch.back, brk_list[id].addr, 1); |
| if (rc < 0) { printf("error writing mem\n"); return; } |
| rc = udebug_mem_write(app_phone, &b->arch.back, b->addr, 1); |
| if (rc < 0) { |
| cons_printf("error writing mem\n"); |
| return rc; |
| } |
| } |
| |
| brk_list[id].set = 0; |
| |
| cons_printf("Breakpoint removed\n"); |
| return 0; |
| } |
| |
| void arch_breakpoint_list(void) |
| { |
| int i, cnt; |
| |
| cnt = 0; |
| for (i = 0; i < MAX_BRKPTS; ++i) { |
| if (brk_list[i].set != 0) { |
| cons_printf("Breakpoint %d at 0x%lx\n", i, |
| brk_list[i].addr); |
| ++cnt; |
| } |
| } |
| if (cnt == 0) cons_printf("No breakpoints set\n"); |
| } |
| |
| void arch_event_breakpoint(thash_t thread_hash) |
| { |
| static istate_t istate; |
| breakpoint_t *b; |
| int rc; |
| |
| rc = udebug_regs_read(app_phone, thread_hash, &istate); |
| 120,45 → 89,43 |
|---|
| // cons_printf("udebug_regs_read -> %d\n", rc); |
| // cons_printf("EIP was 0x%08x\n", istate.eip); |
| int brk_addr = istate.eip - 1; |
| int bi; |
| for (bi = 0; bi < MAX_BRKPTS; bi++) { |
| if (brk_list[bi].set && brk_list[bi].addr == brk_addr) |
| break; |
| |
| b = breakpoint_find_by_addr(brk_addr); |
| if (!b) { |
| cons_printf("unrecognized breakpoint at 0x%x\n", brk_addr); |
| return; |
| } |
| |
| if (bi < MAX_BRKPTS) { |
| cons_printf("breakpoint %d hit\n", bi); |
| istate.eip = brk_addr; |
| istate.eflags |= 0x0100; /* trap flag */ |
| |
| istate.eip = brk_addr; |
| istate.eflags |= 0x0100; /* trap flag */ |
| // cons_printf("setting EIP to 0x%08x\n", istate.eip); |
| rc = udebug_regs_write(app_phone, thread_hash, &istate); |
| if (rc < 0) { printf("error writing regs\n"); return; } |
| rc = udebug_mem_write(app_phone, &brk_list[bi].arch.back, brk_addr, 1); |
| if (rc < 0) { printf("error writing mem\n"); return; } |
| rc = udebug_regs_write(app_phone, thread_hash, &istate); |
| if (rc < 0) { cons_printf("error writing regs\n"); return; } |
| rc = udebug_mem_write(app_phone, &b->arch.back, brk_addr, 1); |
| if (rc < 0) { cons_printf("error writing mem\n"); return; } |
| // cons_printf("udebug_mem_write(phone, 0x%x, 0x%02x, 1) -> %d\n", brk_addr, brk_list[bi].arch.back, rc); |
| lifted_brkpt = &brk_list[bi]; |
| |
| breakpoint_hit(); |
| } else { |
| cons_printf("unrecognized breakpoint at 0x%x\n", brk_addr); |
| } |
| b->active = true; |
| active_bkpt = b; |
| |
| breakpoint_hit(b); |
| } |
| |
| void arch_event_trap(dthread_t *dt) |
| { |
| breakpoint_t *b; |
| static istate_t istate; |
| unsigned char brkinstr[1]; |
| int rc; |
| |
| // cons_printf("trap event\n"); |
| |
| breakpoint_t *lb = lifted_brkpt; |
| if (lb) { |
| b = active_bkpt; |
| |
| if (b) { |
| brkinstr[0] = OPCODE_INT3; |
| rc = udebug_mem_write(app_phone, brkinstr, lb->addr, 1); |
| rc = udebug_mem_write(app_phone, brkinstr, b->addr, 1); |
| // cons_printf("restore breakpoint -> %d\n", rc); |
| lifted_brkpt = NULL; |
| active_bkpt = NULL; |
| } |
| |
| if (!dt->arch.singlestep) { |
| 197,7 → 164,7 |
|---|
| if (rc < 0) { printf("regs read failed\n"); return; } |
| |
| if (enable) istate.eflags |= 0x0100; /* trap flag */ |
| else if (!lifted_brkpt) istate.eflags &= ~0x0100; /* trap flag */ |
| else if (!active_bkpt) istate.eflags &= ~0x0100; /* trap flag */ |
| |
| rc = udebug_regs_write(app_phone, dt->hash, &istate); |
| if (rc < 0) { printf("regs write failed\n"); return; } |