Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3004 → Rev 3005

/branches/tracing/uspace/app/debug/arch/mips32/include/types.h
84,6 → 84,11
uint32_t k1; /* We use it as thread-local pointer */
} istate_t;
 
static inline uint32_t istate_get_pc(istate_t *istate)
{
return istate->epc;
}
 
#endif
 
/** @}
/branches/tracing/uspace/app/debug/arch/mips32/src/mips32.c
40,45 → 40,57
 
#include "../../../cons.h"
#include "../../../main.h"
#include "../../../breakpoint.h"
#include "../../../include/arch.h"
 
#define OPCODE_BREAK 0x0000000d
 
void arch_breakpoint_add(uintptr_t addr)
static unsigned buffer[1024];
 
int arch_breakpoint_set(breakpoint_t *b)
{
uint32_t brkp;
int rc;
breakpoint_t *brk;
int i;
 
brk = NULL;
for (i = 0; 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,
sizeof(b->arch.back));
if (rc < 0) return rc;
 
if (!brk) {
cons_printf("too many breakpoints\n");
return;
}
 
rc = udebug_mem_read(app_phone, &brk->arch.back, addr, sizeof(&brk->arch.back));
cons_printf("udebug_mem_read() -> %d\n", rc);
brkp = OPCODE_BREAK;
rc = udebug_mem_write(app_phone, &brkp, addr, sizeof(brkp));
// for (i=0; i<256; i++) rc = udebug_mem_write(app_phone, &brkp, addr+4*i, sizeof(brkp));
rc = udebug_mem_write(app_phone, &brkp, b->addr, sizeof(brkp));
cons_printf("udebug_mem_write() -> %d\n", rc);
if (rc < 0) return rc;
 
brk->addr = addr;
brk->set = 1;
return 0;
}
 
static unsigned buffer[1024];
static breakpoint_t *lifted_brkpt;
int arch_breakpoint_remove(breakpoint_t *b)
{
int rc;
 
if (b->active) {
rc = udebug_mem_write(app_phone, &b->arch.back, b->addr + 4, 1);
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, 1);
if (rc < 0) {
cons_printf("error writing memory\n");
return rc;
}
}
 
return 0;
 
}
 
void arch_event_breakpoint(thash_t thread_hash)
{
breakpoint_t *b;
int rc;
uint32_t epc;
int brk_addr;
92,37 → 104,28
cons_printf("EPC was 0x%08x\n", epc);
brk_addr = epc;
 
int bi;
for (bi = 0; bi < MAX_BRKPTS; bi++) {
if (brk_list[bi].set && brk_list[bi].addr == brk_addr)
break;
}
if (bi < MAX_BRKPTS) {
cons_printf("breakpoint %d hit\n", bi);
breakpoint_hit();
b = breakpoint_find_by_addr(brk_addr);
if (b != NULL) {
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;
 
rc = udebug_mem_write(app_phone, &brk_list[bi].arch.back, brk_addr, 4);
cons_printf("udebug_mem_write(phone, 0x%x, 0x%02x, 1) -> %d\n", brk_addr, brk_list[bi].arch.back, rc);
rc = udebug_mem_read(app_phone, &brk_list[bi].arch.back, brk_addr+4, 4);
rc = udebug_mem_write(app_phone, &brkp, brk_addr+4, 4);
lifted_brkpt = &brk_list[bi];
return;
breakpoint_hit(b);
}
 
for (bi = 0; bi < MAX_BRKPTS; bi++) {
if (brk_list[bi].set && brk_list[bi].addr + 4 == brk_addr)
break;
}
if (bi < MAX_BRKPTS) {
cons_printf("restoring breakpoint %d\n", bi);
rc = udebug_mem_write(app_phone, &brk_list[bi].arch.back, brk_addr, 4);
rc = udebug_mem_read(app_phone, &brk_list[bi].arch.back, brk_addr-4, 4);
rc = udebug_mem_write(app_phone, &brkp, brk_addr-4, 4);
lifted_brkpt = NULL;
b = breakpoint_find_by_addr(brk_addr - 4);
if (b != NULL && b->active) {
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);
active_bkpt = NULL;
return;
}
 
cons_printf("unrecognized breakpoint at 0x%x\n", brk_addr);
cons_printf("Unrecognized breakpoint at 0x%lx\n", brk_addr);
}
 
void arch_event_trap(dthread_t *dt)
139,13 → 142,5
{
}
 
void arch_breakpoint_remove(int id)
{
}
 
void arch_breakpoint_list(void)
{
}
 
/** @}
*/