| /branches/tracing/uspace/app/debug/include/arch.h |
|---|
| 47,7 → 47,7 |
| void arch_event_breakpoint(thash_t thread_hash); |
| void arch_event_trap(dthread_t *dt); |
| void arch_dump_regs(thash_t thash); |
| void arch_set_singlestep(dthread_t *dt, int enable); |
| void arch_singlestep(dthread_t *dt); |
| #endif |
| /branches/tracing/uspace/app/debug/cmd.c |
|---|
| 140,7 → 140,6 |
| dt = NULL; |
| for (cur = dthreads.next; cur != &dthreads; cur = cur->next) { |
| dt = list_get_instance(cur, dthread_t, link); |
| arch_set_singlestep(dt, 0); |
| dthread_resume(dt); |
| } |
| } |
| 161,8 → 160,7 |
| { |
| (void)argc; (void)argv; |
| arch_set_singlestep(cwt, 1); |
| dthread_resume(cwt); |
| arch_singlestep(cwt); |
| } |
| static void cmd_lbrk(int argc, char *argv[]) |
| /branches/tracing/uspace/app/debug/arch/mips32/include/bstore.h |
|---|
| 0,0 → 1,55 |
| /* |
| * Copyright (c) 2008 Jiri Svoboda |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup debug |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef BSTORE_H_ |
| #define BSTORE_H_ |
| #include <bool.h> |
| typedef struct { |
| bool valid; |
| uintptr_t address; |
| uint32_t value; |
| } bstore_t; |
| void bstore_initialize(bstore_t *bs); |
| int bstore_save(bstore_t *bs, uintptr_t addr); |
| int bstore_push(bstore_t *bs, uintptr_t addr, uint32_t value); |
| int bstore_pop(bstore_t *bs); |
| void bstore_empty(bstore_t *bs); |
| #endif |
| /** @} |
| */ |
| /branches/tracing/uspace/app/debug/arch/mips32/include/types.h |
|---|
| 36,14 → 36,15 |
| #define TYPES_H_ |
| #include <sys/types.h> |
| #include "bstore.h" |
| typedef struct { |
| uint32_t back; |
| bstore_t bs; |
| } breakpoint_arch_t; |
| typedef struct { |
| int singlestep; |
| uint32_t sstep_back; |
| bstore_t cur, next; |
| } dthread_arch_t; |
| typedef struct { |
| /branches/tracing/uspace/app/debug/arch/mips32/Makefile.inc |
|---|
| 26,4 → 26,6 |
| # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| # |
| ARCH_SOURCES := arch/$(ARCH)/src/mips32.c |
| ARCH_SOURCES := \ |
| arch/$(ARCH)/src/mips32.c \ |
| arch/$(ARCH)/src/bstore.c |
| /branches/tracing/uspace/app/debug/arch/mips32/src/bstore.c |
|---|
| 0,0 → 1,111 |
| /* |
| * Copyright (c) 2008 Jiri Svoboda |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup debug |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <stdio.h> |
| #include <assert.h> |
| #include <errno.h> |
| #include <sys/types.h> |
| #include <udebug.h> |
| #include "../../../main.h" |
| #include "../../../cons.h" |
| #include "../include/bstore.h" |
| void bstore_initialize(bstore_t *bs) |
| { |
| bs->valid = false; |
| } |
| int bstore_save(bstore_t *bs, uintptr_t addr) |
| { |
| uint32_t v; |
| int rc; |
| assert(bs->valid == false); |
| rc = udebug_mem_read(app_phone, &v, addr, sizeof(uint32_t)); |
| if (rc == EOK) { |
| bs->valid = true; |
| bs->address = addr; |
| bs->value = v; |
| } else { |
| cons_printf("Error reading memory address 0x%zx\n", addr); |
| } |
| return rc; |
| } |
| int bstore_push(bstore_t *bs, uintptr_t addr, uint32_t value) |
| { |
| int rc; |
| rc = bstore_save(bs, addr); |
| if (rc != EOK) return rc; |
| rc = udebug_mem_write(app_phone, &value, addr, sizeof(uint32_t)); |
| if (rc != EOK) { |
| cons_printf("Error writing memory address 0x%zx\n", addr); |
| bstore_empty(bs); |
| return rc; |
| } |
| return EOK; |
| } |
| int bstore_pop(bstore_t *bs) |
| { |
| int rc; |
| assert(bs->valid == true); |
| rc = udebug_mem_write(app_phone, &bs->value, bs->address, |
| sizeof(uint32_t)); |
| if (rc == EOK) { |
| bs->valid = false; |
| } else { |
| cons_printf("Error writing memory address 0x%zx\n", |
| bs->address); |
| } |
| return rc; |
| } |
| void bstore_empty(bstore_t *bs) |
| { |
| assert(bs->valid == true); |
| bs->valid = false; |
| } |
| /** @} |
| */ |
| /branches/tracing/uspace/app/debug/arch/mips32/src/mips32.c |
|---|
| 34,6 → 34,7 |
| #include <stdio.h> |
| #include <stdlib.h> |
| #include <assert.h> |
| #include <sys/types.h> |
| #include <udebug.h> |
| 48,46 → 49,15 |
| int arch_breakpoint_set(breakpoint_t *b) |
| { |
| uint32_t brkp; |
| int rc; |
| rc = udebug_mem_read(app_phone, &b->arch.back, b->addr, |
| sizeof(b->arch.back)); |
| if (rc < 0) return rc; |
| cons_printf("udebug_mem_read() -> %d\n", rc); |
| brkp = OPCODE_BREAK; |
| rc = udebug_mem_write(app_phone, &brkp, b->addr, sizeof(brkp)); |
| cons_printf("udebug_mem_write() -> %d\n", rc); |
| if (rc < 0) return rc; |
| return 0; |
| return bstore_push(&b->arch.bs, b->addr, OPCODE_BREAK); |
| } |
| int arch_breakpoint_remove(breakpoint_t *b) |
| { |
| int rc; |
| if (b->active) { |
| rc = udebug_mem_write(app_phone, &b->arch.back, b->addr + 4, 4); |
| if (rc < 0) { |
| cons_printf("error writing memory\n"); |
| return rc; |
| } |
| active_bkpt = NULL; |
| } else { |
| rc = udebug_mem_write(app_phone, &b->arch.back, b->addr, 4); |
| if (rc < 0) { |
| cons_printf("error writing memory\n"); |
| return rc; |
| } |
| } |
| return 0; |
| return bstore_pop(&b->arch.bs); |
| } |
| void arch_event_breakpoint(thash_t thread_hash) |
| static void _ev_breakpoint(thash_t thread_hash) |
| { |
| breakpoint_t *b; |
| dthread_t *dt; |
| 106,54 → 76,100 |
| cons_printf("EPC was 0x%08x\n", epc); |
| brk_addr = epc; |
| b = breakpoint_find_by_addr(brk_addr); |
| if (b != NULL) { |
| cons_printf("move breakpoint\b"); |
| rc = udebug_mem_write(app_phone, &b->arch.back, brk_addr, 4); |
| rc = udebug_mem_read(app_phone, &b->arch.back, brk_addr + 4, 4); |
| rc = udebug_mem_write(app_phone, &brkp, brk_addr + 4, 4); |
| active_bkpt = b; |
| b->active = true; |
| dt = dthread_get(); |
| cons_printf("breakpoint_hit...\n"); |
| breakpoint_hit(b); |
| cons_printf("end_hit...\n"); |
| return; |
| } |
| if (active_bkpt != NULL) { |
| assert(active_bkpt->arch.bs.address == brk_addr); |
| b = breakpoint_find_by_addr(brk_addr - 4); |
| if (b != NULL && b->active) { |
| /* A breakpoint-clearing BRK has been hit */ |
| cons_printf("restoring breakpoint %d\n", b->id); |
| rc = udebug_mem_write(app_phone, &b->arch.back, brk_addr, 4); |
| rc = udebug_mem_read(app_phone, &b->arch.back, brk_addr - 4, 4); |
| rc = udebug_mem_write(app_phone, &brkp, brk_addr - 4, 4); |
| rc = bstore_pop(&b->arch.bs); |
| if (rc != 0) return; |
| rc = bstore_push(&b->arch.bs, brk_addr - 4, OPCODE_BREAK); |
| if (rc != 0) return; |
| active_bkpt = NULL; |
| if (dt->arch.singlestep) { |
| singlestep_hit(); |
| rc = udebug_mem_read(app_phone, &dt->arch.sstep_back, brk_addr + 4, 4); |
| rc = udebug_mem_write(app_phone, &brkp, brk_addr + 4, 4); |
| } |
| return; |
| } |
| b = breakpoint_find_by_addr(brk_addr); |
| if (b == NULL) { |
| cons_printf("Unrecognized breakpoint at 0x%lx\n", brk_addr); |
| } |
| /* A breakpoint has been hit */ |
| cons_printf("breakpoint_hit...\n"); |
| breakpoint_hit(b); |
| /* While in breakpoint_hit(), singlestep was activated */ |
| if (dt->arch.singlestep) return; |
| cons_printf("move breakpoint\b"); |
| rc = bstore_pop(&b->arch.bs); |
| if (rc != 0) return; |
| /* |
| * There could be another breakpoint at brk_addr + 4, |
| * but that's okay. We'll pop the active breakpoint bs |
| * before doing anything else. |
| */ |
| rc = bstore_push(&b->arch.bs, brk_addr + 4, OPCODE_BREAK); |
| if (rc != 0) return; |
| active_bkpt = b; |
| b->active = true; |
| cons_printf("end_hit...\n"); |
| } |
| static void _ev_singlestep(thash_t thread_hash) |
| { |
| dthread_t *dt; |
| int rc; |
| uint32_t epc; |
| int brk_addr; |
| uint32_t brkp; |
| dt = dthread_get(); |
| if (dt->arch.singlestep) { |
| cons_printf("advance singlestep\n"); |
| rc = udebug_mem_write(app_phone, &dt->arch.sstep_back, brk_addr, 4); |
| rc = udebug_mem_read(app_phone, &dt->arch.sstep_back, brk_addr + 4, 4); |
| rc = udebug_mem_write(app_phone, &brkp, brk_addr + 4, 4); |
| assert(active_bkpt == NULL); |
| assert(dt->arch.singlestep); |
| brkp = OPCODE_BREAK; |
| singlestep_hit(); |
| cons_printf("arch_event_breakpoint\n"); |
| return; |
| rc = udebug_regs_read(app_phone, thread_hash, &istate); |
| cons_printf("udebug_regs_read -> %d\n", rc); |
| epc = istate_get_pc(&istate); |
| cons_printf("EPC was 0x%08x\n", epc); |
| brk_addr = epc; |
| if (dt->arch.cur.valid) { |
| cons_printf("restore breakpoint BRK\n"); |
| rc = bstore_pop(&dt->arch.cur); |
| } |
| cons_printf("Unrecognized breakpoint at 0x%lx\n", brk_addr); |
| cons_printf("clear singlestep BRK\n"); |
| rc = bstore_pop(&dt->arch.next); |
| dt->arch.singlestep = false; |
| singlestep_hit(); |
| } |
| void arch_event_breakpoint(thash_t thread_hash) |
| { |
| dthread_t *dt; |
| dt = dthread_get(); |
| if (dt->arch.singlestep) { |
| _ev_singlestep(thread_hash); |
| } else { |
| _ev_breakpoint(thread_hash); |
| } |
| } |
| void arch_event_trap(dthread_t *dt) |
| { |
| /* Unused */ |
| 162,46 → 178,40 |
| void arch_dump_regs(thash_t thash) |
| { |
| /* TODO */ |
| } |
| void arch_set_singlestep(dthread_t *dt, int enable) |
| void arch_singlestep(dthread_t *dt) |
| { |
| int rc; |
| uint32_t epc; |
| uint32_t brk; |
| breakpoint_t *b1, *b2; |
| breakpoint_t *b; |
| uint32_t old_instr; |
| brk = OPCODE_BREAK; |
| assert(active_bkpt == NULL); |
| assert(dt->arch.singlestep == false); |
| cons_printf("arch_set_singlestep(dt, %d)\n", enable); |
| cons_printf("arch_singlestep(dt)\n"); |
| rc = udebug_regs_read(app_phone, dt->hash, &istate); |
| cons_printf("udebug_regs_read -> %d\n", rc); |
| epc = istate_get_pc(&istate); |
| cons_printf("EPC was 0x%08x\n", epc); |
| b1 = breakpoint_find_by_addr(epc - 4); |
| b2 = breakpoint_find_by_addr(epc); |
| cons_printf("initial set singlestep\n"); |
| b = breakpoint_find_by_addr(epc); |
| if (b != NULL) { |
| /* Cover breakpoint with old instruction */ |
| old_instr = b->arch.bs.value; |
| rc = bstore_push(&dt->arch.cur, epc, old_instr); |
| if (rc < 0) return; |
| } |
| if (enable && !dt->arch.singlestep) { |
| if (b1 && b1->active) { |
| dt->arch.sstep_back = b1->arch.back; |
| } else if (b2) { |
| dt->arch.sstep_back = b2->arch.back; |
| } else { |
| cons_printf("initial set singlestep\b"); |
| rc = udebug_mem_read(app_phone, &dt->arch.sstep_back, epc + 4, 4); |
| rc = udebug_mem_write(app_phone, &brk, epc + 4, 4); |
| if (rc < 0) { cons_printf("error writing mem\n"); return; } |
| } |
| } else if (!enable && dt->arch.singlestep) { |
| if ((b1 && b1->active) || b2) { |
| /* Do not remove BRK instruction */ |
| } else { |
| cons_printf("remove singlestep\b"); |
| rc = udebug_mem_write(app_phone, &dt->arch.sstep_back, epc + 4, 4); |
| } |
| } |
| dt->arch.singlestep = enable; |
| /* Cover next instruction with BREAK */ |
| rc = bstore_push(&dt->arch.next, epc + 4, OPCODE_BREAK); |
| if (rc < 0) return; |
| dt->arch.singlestep = true; |
| dthread_resume(dt); |
| } |
| /** @} |
| /branches/tracing/uspace/app/debug/arch/ia32/src/ia32.c |
|---|
| 35,6 → 35,7 |
| #include <stdio.h> |
| #include <stdlib.h> |
| #include <sys/types.h> |
| #include <bool.h> |
| #include <udebug.h> |
| #include <kernel/arch/context_offset.h> |
| 45,6 → 46,23 |
| #define OPCODE_INT3 0xCC |
| static int _set_trap_flag(dthread_t *dt, bool enable) |
| { |
| static istate_t istate; |
| int rc; |
| rc = udebug_regs_read(app_phone, dt->hash, &istate); |
| if (rc < 0) { printf("regs read failed\n"); return; } |
| if (enable) 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; } |
| return 0; |
| } |
| int arch_breakpoint_set(breakpoint_t *b) |
| { |
| char brkp[1]; |
| 128,15 → 146,10 |
| active_bkpt = NULL; |
| } |
| if (!dt->arch.singlestep) { |
| rc = udebug_regs_read(app_phone, dt->hash, &istate); |
| // cons_printf("udebug_regs_read -> %d\n", rc); |
| istate.eflags &= ~0x0100; /* trap flag */ |
| rc = udebug_regs_write(app_phone, dt->hash, &istate); |
| } else { |
| // printf("ss-hit\n"); |
| singlestep_hit(); |
| } |
| rc = _set_trap_flag(dt, false); |
| dt->arch.singlestep = false; |
| singlestep_hit(); |
| } |
| void arch_dump_regs(thash_t thash) |
| 155,21 → 168,14 |
| istate.ds, istate.es, istate.fs, istate.gs); |
| } |
| void arch_set_singlestep(dthread_t *dt, int enable) |
| void arch_singlestep(dthread_t *dt) |
| { |
| static istate_t istate; |
| int rc; |
| rc = udebug_regs_read(app_phone, dt->hash, &istate); |
| if (rc < 0) { printf("regs read failed\n"); return; } |
| rc = _set_trap_flag(dt, true); |
| if (rc != 0) return; |
| if (enable) 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; } |
| dt->arch.singlestep = enable; |
| dthread_resume(dt); |
| } |
| /** @} |