/branches/tracing/uspace/app/debug/main.c |
---|
51,7 → 51,7 |
#include "include/arch.h" |
#include "main.h" |
void thread_debug_start(thash_t thread_hash); |
void thread_debug_start(unsigned thread_hash); |
#define IN_BUF_SIZE 64 |
static char in_buf[IN_BUF_SIZE]; |
321,7 → 321,7 |
cons_printf("thread hashes:"); |
for (i = 0; i < *n; ++i) { |
cons_printf("0x%lx\n", thash_buf[i]); |
cons_printf("0x%x\n", thash_buf[i]); |
} |
cons_printf("Total of %u threads\n", *n); |
331,10 → 331,10 |
return 0; |
} |
static void event_thread_b(thash_t hash) |
static void event_thread_b(unsigned hash) |
{ |
async_serialize_start(); |
cons_printf("new thread, hash 0x%lx\n", hash); |
cons_printf("new thread, hash 0x%x\n", hash); |
async_serialize_end(); |
thread_debug_start(hash); |
370,7 → 370,7 |
{ |
int rc; |
udebug_event_t ev_type; |
sysarg_t val0, val1; |
unsigned val0, val1; |
dthread_t *dt; |
dt = (dthread_t *)dt_arg; |
378,18 → 378,15 |
cons_printf("debug_loop(%d)\n", dt->id); |
while (!abort_debug) { |
/* Run thread until an event occurs */ |
rc = udebug_go(app_phone, dt->hash, &ev_type, &val0, &val1); |
if (rc < 0) { |
cons_printf("Failed resuming thread (%d).\n", rc); |
return rc; |
} |
if (ev_type == UDEBUG_EVENT_FINISHED) { |
cons_printf("thread %u debugging finished\n", dt->id); |
break; |
} |
debug_event(dt->hash, ev_type, val0); |
if (rc >= 0) debug_event(dt->hash, ev_type, val0); |
} |
cons_printf("debug_loop(%d) exiting\n", dt->id); |
396,7 → 393,7 |
return 0; |
} |
void thread_debug_start(thash_t thash) |
void thread_debug_start(unsigned thash) |
{ |
fid_t fid; |
dthread_t *dt; |
/branches/tracing/uspace/app/debug/arch/amd64/include/types.h |
---|
File deleted |
/branches/tracing/uspace/app/debug/arch/amd64/Makefile.inc |
---|
File deleted |
/branches/tracing/uspace/app/debug/arch/amd64/src/amd64.c |
---|
File deleted |
/branches/tracing/uspace/app/debug/cmd.c |
---|
86,7 → 86,7 |
(void)argc; |
addr = strtoul(argv[1], NULL, 0); |
cons_printf("You requested a breakpoint at 0x%lx\n", addr); |
cons_printf("You requested a breakpoint at 0x%x\n", addr); |
// arch_breakpoint_add(addr); |
breakpoint_add(addr); |
} |
109,7 → 109,7 |
if (dt->id == tid) { |
cwt = dt; |
cons_printf("changed working thread to: %d [hash 0x%lx]\n", |
cons_printf("changed working thread to: %d [hash 0x%x]\n", |
cwt->id, cwt->hash); |
} else { |
cons_printf("no such thread\n"); |
195,7 → 195,7 |
return; |
} |
cons_printf("0x%lx:", addr); |
cons_printf("0x%x:", addr); |
for (i = 0; i < to_read; ++i) { |
cons_printf(" %02x", buf[i]); |
} |
263,7 → 263,7 |
dt = NULL; |
for (cur = dthreads.next; cur != &dthreads; cur = cur->next) { |
dt = list_get_instance(cur, dthread_t, link); |
cons_printf("%d [hash 0x%lx]\n", dt->id, dt->hash); |
cons_printf("%d [hash 0x%x]\n", dt->id, dt->hash); |
} |
} |
/branches/tracing/boot/arch/amd64/Makefile.inc |
---|
54,7 → 54,6 |
$(USPACEDIR)/app/trace/trace \ |
$(USPACEDIR)/app/tetris/tetris \ |
$(USPACEDIR)/app/tester/tester \ |
$(USPACEDIR)/app/debug/debug \ |
$(USPACEDIR)/app/klog/klog \ |
$(USPACEDIR)/app/bdsh/bdsh |
/branches/tracing/kernel/arch/amd64/include/drivers |
---|
File deleted |
\ No newline at end of file |
Property changes: |
Deleted: svn:special |
-* |
\ No newline at end of property |
/branches/tracing/kernel/arch/amd64/include/cpu.h |
---|
77,10 → 77,6 |
extern uint64_t read_efer_flag(void); |
void cpu_setup_fpu(void); |
#define DR6_BT (1<<15) |
#define DR6_BS (1<<14) |
#define DR6_BD (1<<13) |
#endif /* __ASM__ */ |
#endif |
/branches/tracing/kernel/arch/amd64/src/debugger.c |
---|
282,7 → 282,7 |
* The userspace thread has TF set and executed |
* an instruction |
*/ |
udebug_trap_event(getip(istate)); |
udebug_trap_event(istate->eip); |
return; |
} |
} |