Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4131 → Rev 4132

/trunk/kernel/arch/amd64/src/debugger.c
35,7 → 35,6
#include <arch/debugger.h>
#include <console/kconsole.h>
#include <console/cmd.h>
#include <symtab.h>
#include <print.h>
#include <panic.h>
#include <interrupt.h>
45,6 → 44,10
#include <func.h>
#include <smp/ipi.h>
 
#ifdef CONFIG_SYMTAB
#include <symtab.h>
#endif
 
typedef struct {
uintptr_t address; /**< Breakpoint address */
int flags; /**< Flags regarding breakpoint */
229,8 → 232,13
*((unative_t *) breakpoints[slot].address));
}
}
 
#ifdef CONFIG_SYMTAB
printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
get_symtab_entry(getip(istate)));
#else
printf("Reached breakpoint %d:%lx\n", slot, getip(istate));
#endif
 
#ifdef CONFIG_KCONSOLE
atomic_set(&haltstate, 1);
355,7 → 363,11
for (i = 0; i < BKPOINTS_MAX; i++)
if (breakpoints[i].address) {
#ifdef CONFIG_SYMTAB
symbol = get_symtab_entry(breakpoints[i].address);
#else
symbol = "n/a";
#endif
 
#ifdef __32_BITS__
printf("%-2u %-5d %#10zx %s\n", i,
/trunk/kernel/arch/amd64/src/interrupt.c
43,7 → 43,6
#include <mm/tlb.h>
#include <mm/as.h>
#include <arch.h>
#include <symtab.h>
#include <arch/asm.h>
#include <proc/scheduler.h>
#include <proc/thread.h>
53,6 → 52,10
#include <interrupt.h>
#include <ddi/irq.h>
 
#ifdef CONFIG_SYMTAB
#include <symtab.h>
#endif
 
/*
* Interrupt and exception dispatching.
*/
66,8 → 69,12
char *symbol;
/* uint64_t *x = &istate->stack[0]; */
 
#ifdef CONFIG_SYMTAB
if (!(symbol = get_symtab_entry(istate->rip)))
symbol = "";
#else
symbol = "";
#endif
 
printf("-----EXCEPTION(%d) OCCURED----- ( %s )\n", n, __func__);
printf("%%rip: %#llx (%s)\n", istate->rip, symbol);