Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3011 → Rev 3012

/branches/tracing/uspace/app/debug/arch/mips32/include/types.h
43,6 → 43,7
 
typedef struct {
int singlestep;
uint32_t sstep_back;
} dthread_arch_t;
 
typedef struct {
/branches/tracing/uspace/app/debug/arch/mips32/src/mips32.c
36,7 → 36,6
#include <stdlib.h>
#include <sys/types.h>
#include <udebug.h>
#include <kernel/arch/context_offset.h>
 
#include "../../../cons.h"
#include "../../../main.h"
45,7 → 44,7
 
#define OPCODE_BREAK 0x0000000d
 
static unsigned buffer[1024];
static istate_t istate;
 
int arch_breakpoint_set(breakpoint_t *b)
{
70,7 → 69,7
int rc;
 
if (b->active) {
rc = udebug_mem_write(app_phone, &b->arch.back, b->addr + 4, 1);
rc = udebug_mem_write(app_phone, &b->arch.back, b->addr + 4, 4);
if (rc < 0) {
cons_printf("error writing memory\n");
return rc;
77,7 → 76,7
}
active_bkpt = NULL;
} else {
rc = udebug_mem_write(app_phone, &b->arch.back, b->addr, 1);
rc = udebug_mem_write(app_phone, &b->arch.back, b->addr, 4);
if (rc < 0) {
cons_printf("error writing memory\n");
return rc;
91,6 → 90,7
void arch_event_breakpoint(thash_t thread_hash)
{
breakpoint_t *b;
dthread_t *dt;
int rc;
uint32_t epc;
int brk_addr;
98,21 → 98,27
 
brkp = OPCODE_BREAK;
 
rc = udebug_regs_read(app_phone, thread_hash, buffer);
cons_printf("arch_event_breakpoint\n");
 
rc = udebug_regs_read(app_phone, thread_hash, &istate);
cons_printf("udebug_regs_read -> %d\n", rc);
epc = buffer[EOFFSET_EPC/sizeof(unsigned)];
epc = istate_get_pc(&istate);
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);
cons_printf("udebug_mem_write(phone, 0x%x, 0x%02x, 1) -> %d\n", brk_addr, b->arch.back, rc);
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;
 
cons_printf("breakpoint_hit...\n");
breakpoint_hit(b);
cons_printf("end_hit...\n");
return;
}
 
b = breakpoint_find_by_addr(brk_addr - 4);
122,9 → 128,29
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 = 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;
}
 
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);
 
singlestep_hit();
 
return;
}
 
cons_printf("Unrecognized breakpoint at 0x%lx\n", brk_addr);
}
 
140,6 → 166,42
 
void arch_set_singlestep(dthread_t *dt, int enable)
{
int rc;
uint32_t epc;
uint32_t brk;
breakpoint_t *b1, *b2;
 
brk = OPCODE_BREAK;
 
cons_printf("arch_set_singlestep(dt, %d)\n", enable);
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);
 
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;
}
 
/** @}