Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 1074 → Rev 1073

/kernel/trunk/arch/amd64/src/debugger.c
191,12 → 191,6
return curidx;
}
 
#ifdef amd64
# define getip(x) ((x)->rip)
#else
# define getip(x) ((x)->eip)
#endif
 
static void handle_exception(int slot, istate_t *istate)
{
ASSERT(breakpoints[slot].address);
213,8 → 207,8
*((__native *) breakpoints[slot].address));
}
}
printf("Reached breakpoint %d:%P(%s)\n", slot, getip(istate),
get_symtab_entry(getip(istate)));
printf("Reached breakpoint %d:%P(%s)\n", slot, istate->rip,
get_symtab_entry(istate->rip));
printf("***Type 'exit' to exit kconsole.\n");
atomic_set(&haltstate,1);
kconsole("debug");
227,11 → 221,7
int i;
/* Set RF to restart the instruction */
#ifdef amd64
istate->rflags |= RFLAGS_RF;
#else
istate->eflags |= EFLAGS_RF;
#endif
 
dr6 = read_dr6();
for (i=0; i < BKPOINTS_MAX; i++) {