Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3100 → Rev 3108

/branches/tracing/uspace/app/debug/arch/mips32/src/mips32.c
43,6 → 43,7
#include "../../../main.h"
#include "../../../breakpoint.h"
#include "../../../include/arch.h"
#include "../../../genarch/idec/idec.h"
 
#define OPCODE_BREAK 0x0000000d
 
125,16 → 126,12
 
int arch_breakpoint_set(breakpoint_t *b)
{
bstore_initialize(&b->arch.bs);
bstore_initialize(&b->arch.next_bs[0]);
bstore_initialize(&b->arch.next_bs[1]);
 
return bstore_push(&b->arch.bs, b->addr, OPCODE_BREAK);
return idec_breakpoint_set(b);
}
 
int arch_breakpoint_remove(breakpoint_t *b)
{
return bstore_pop(&b->arch.bs);
return idec_breakpoint_remove(b);
}
 
static int islot_read(uintptr_t addr, uint32_t *instr)
163,8 → 160,10
return -1;
}
 
static int get_reg(int reg_no, uint32_t *value)
static int get_reg(dthread_t *dt, int reg_no, uint32_t *value)
{
int rc;
 
cons_printf("get_reg...\n");
 
if (reg_no == 0) {
172,6 → 171,9
return 0;
}
 
rc = udebug_regs_read(app_phone, dt->hash, &istate);
if (rc < 0) return rc;
 
/* FIXME: ugly */
*value = ((uint32_t *)&istate)[reg_no - 1];
printf("get_reg ok (0x%08x)\n", *value);
183,11 → 185,12
*
* Assumptions: addr == PC, *addr is not covered by a BREAK.
*
* @param dt Dthread on which to operate.
* @param addr Address of an instruction.
* @param buffer Buffer for storing up to 2 addresses.
* @return Number of stored addresses or negative error code.
*/
static int get_next_addr(uintptr_t addr, uintptr_t *buffer)
int get_next_addr(dthread_t *dt, uintptr_t addr, uintptr_t *buffer)
{
/* TODO: J[AL]R, branches and delay slots */
uint32_t instr;
239,7 → 242,7
case OP_JR:
case OP_JALR:
/* Register jump */
rc = get_reg((instr >> 21) & 0x1f, &buffer[0]);
rc = get_reg(dt, (instr >> 21) & 0x1f, &buffer[0]);
n = 1;
break;
default:
252,132 → 255,9
return n;
}
 
static void _ev_breakpoint(thash_t thread_hash)
{
breakpoint_t *b;
dthread_t *dt;
int rc, n_next, i;
uint32_t epc;
uintptr_t brk_addr;
uintptr_t next_addr[2];
uint32_t brkp;
 
brkp = OPCODE_BREAK;
 
cons_printf("arch_event_breakpoint\n");
 
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;
 
dt = dthread_get();
 
if (active_bkpt != NULL) {
assert(active_bkpt->arch.bs.address == brk_addr);
b = active_bkpt;
 
/* A breakpoint-restoring BRK has been hit */
cons_printf("restoring breakpoint %d\n", b->id);
for (i = 0; i < b->arch.n_next; ++i) {
rc = bstore_pop(&b->arch.next_bs[i]);
if (rc != 0) return;
}
 
rc = bstore_push(&b->arch.bs, b->addr, OPCODE_BREAK);
if (rc != 0) return;
active_bkpt = NULL;
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;
 
n_next = get_next_addr(brk_addr, next_addr);
if (n_next < 0) return;
 
/*
* There could be another breakpoint at next_addr,
* but that's okay. We'll pop the active breakpoint bs
* before doing anything else.
*/
for (i = 0; i < n_next; ++i) {
rc = bstore_push(&b->arch.next_bs[i], next_addr[i],
OPCODE_BREAK);
if (rc != 0) return;
}
b->arch.n_next = n_next;
 
active_bkpt = b;
b->active = true;
 
cons_printf("end_hit...\n");
}
 
 
static void _ev_singlestep(thash_t thread_hash)
{
dthread_t *dt;
int rc, i;
uint32_t epc;
int brk_addr;
uint32_t brkp;
 
dt = dthread_get();
 
assert(active_bkpt == NULL);
assert(dt->arch.singlestep);
brkp = OPCODE_BREAK;
 
cons_printf("arch_event_breakpoint\n");
 
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 BREAK\n");
rc = bstore_pop(&dt->arch.cur);
}
 
cons_printf("\nclear singlestep BREAKs\n");
for (i = 0; i < dt->arch.n_next; ++i) {
rc = bstore_pop(&dt->arch.next[i]);
if (rc != 0) return;
}
 
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);
}
idec_event_breakpoint(thread_hash);
}
 
void arch_event_trap(dthread_t *dt)
393,43 → 273,7
 
void arch_singlestep(dthread_t *dt)
{
int rc, i;
uint32_t epc;
breakpoint_t *b;
uint32_t old_instr;
uintptr_t next_addr[2];
int n_next;
 
assert(active_bkpt == NULL);
assert(dt->arch.singlestep == false);
 
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);
 
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;
}
 
n_next = get_next_addr(epc, next_addr);
if (n_next < 0) return;
 
/* Cover next instruction(s) with BREAK */
for (i = 0; i < n_next; ++i) {
rc = bstore_push(&dt->arch.next[i], next_addr[i], OPCODE_BREAK);
if (rc != 0) return;
}
dt->arch.n_next = n_next;
 
dt->arch.singlestep = true;
dthread_resume(dt);
idec_singlestep(dt);
}
 
/** @}