Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2935 → Rev 2936

/branches/tracing/uspace/app/debug/arch/ia32/src/ia32.c
37,6 → 37,7
#include <sys/types.h>
#include <udebug.h>
 
#include "../../../cons.h"
#include "../../../main.h"
#include "../../../include/arch.h"
 
57,15 → 58,15
if (brk_list[i].set == 0) brk = brk_list+i;
 
if (!brk) {
printf("too many breakpoints\n");
cons_printf("too many breakpoints\n");
return;
}
 
rc = udebug_mem_read(app_phone, &brk->arch.back, addr, 1);
printf("udebug_mem_read() -> %d\n", rc);
cons_printf("udebug_mem_read() -> %d\n", rc);
brkp[0] = OPCODE_INT3;
rc = udebug_mem_write(app_phone, brkp, addr, 1);
printf("udebug_mem_write() -> %d\n", rc);
cons_printf("udebug_mem_write() -> %d\n", rc);
 
brk->addr = addr;
brk->set = 1;
79,8 → 80,8
int rc;
 
rc = udebug_regs_read(app_phone, thread_hash, buffer);
printf("udebug_regs_read -> %d\n", rc);
printf("EIP was 0x%08x\n", buffer[ISTATE_OFF_EIP]);
cons_printf("udebug_regs_read -> %d\n", rc);
cons_printf("EIP was 0x%08x\n", buffer[ISTATE_OFF_EIP]);
int brk_addr = buffer[ISTATE_OFF_EIP] - 1;
int bi;
for (bi = 0; bi < MAX_BRKPTS; bi++) {
89,18 → 90,18
}
 
if (bi < MAX_BRKPTS) {
printf("breakpoint %d hit\n", bi);
cons_printf("breakpoint %d hit\n", bi);
breakpoint_hit();
 
buffer[ISTATE_OFF_EIP] = brk_addr;
buffer[ISTATE_OFF_EFLAGS] |= 0x0100; /* trap flag */
printf("setting EIP to 0x%08x\n", buffer[ISTATE_OFF_EIP]);
cons_printf("setting EIP to 0x%08x\n", buffer[ISTATE_OFF_EIP]);
rc = udebug_regs_write(app_phone, thread_hash, buffer);
rc = udebug_mem_write(app_phone, &brk_list[bi].arch.back, brk_addr, 1);
printf("udebug_mem_write(phone, 0x%x, 0x%02x, 1) -> %d\n", brk_addr, brk_list[bi].arch.back, rc);
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];
} else {
printf("unrecognized breakpoint at 0x%x\n", brk_addr);
cons_printf("unrecognized breakpoint at 0x%x\n", brk_addr);
}
}
 
109,15 → 110,15
unsigned char brkinstr[1];
int rc;
 
printf("trap event\n");
cons_printf("trap event\n");
 
breakpoint_t *lb = lifted_brkpt;
brkinstr[0] = OPCODE_INT3;
rc = udebug_mem_write(app_phone, brkinstr, lb->addr, 1);
printf("restore breakpoint -> %d\n", rc);
cons_printf("restore breakpoint -> %d\n", rc);
 
rc = udebug_regs_read(app_phone, thread_hash, buffer);
printf("udebug_regs_read -> %d\n", rc);
cons_printf("udebug_regs_read -> %d\n", rc);
buffer[ISTATE_OFF_EFLAGS] &= ~0x0100; /* trap flag */
rc = udebug_regs_write(app_phone, thread_hash, buffer);
}