secc
/
l4ka-pistachio
mirror of https://github.com/l4ka/pistachio.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Move retrieving kernel space to top 

- Bugfix: x86_last_ip has size word_t
This commit is contained in:
Jan Stoess 2007-11-30 22:48:09 +01:00
parent e161d019f7
commit e06676547c
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/kdb/glue/v4-x86/prepost.cc
View File

@ -75,6 +75,8 @@ bool kdb_t::pre()
debug_param_t * param = (debug_param_t*)kdb_param;
x86_exceptionframe_t* f = param->frame;
space_t * space = kdb.kdb_current->get_space();
if (!space) space = get_kernel_space();
switch (param->exception)
{
@ -83,7 +85,7 @@ bool kdb_t::pre()
/* breakpoint exception */
if (f->regs[x86_exceptionframe_t::freg] & (1 << 8))
{
extern u32_t x86_last_ip;
extern word_t x86_last_ip;
#if defined(CONFIG_CPU_X86_I686) || defined(CONFIG_CPU_X86_P4)
extern bool x86_single_step_on_branches;
if (x86_single_step_on_branches)
@ -144,11 +146,7 @@ bool kdb_t::pre()
printf("--- Debug Exception NO DR---\n");
break;
}
space_t *space = kdb.kdb_current->get_space();
if (!space)
space = get_kernel_space();
word_t content;
ENABLE_TRACEPOINT(X86_BREAKPOINT, x86_breakpoint_cpumask, 0);
@ -159,7 +157,7 @@ bool kdb_t::pre()
TRACEPOINT(X86_BREAKPOINT, "breakpoint dr%d ip: %x addr %x content %x",
dbnum, f->regs[x86_exceptionframe_t::ipreg], db, content);
return (x86_breakpoint_cpumask_kdb & (1 << get_current_cpu()));
enter_kernel_debugger = ((x86_breakpoint_cpumask_kdb & (1 << get_current_cpu())) != 0);
#else
printf("--- Debug Exception ---\n");
#endif
@ -173,9 +171,6 @@ bool kdb_t::pre()
case X86_EXC_BREAKPOINT: /* int3 */
{
space_t * space = kdb.kdb_current->get_space();
if (!space) space = get_kernel_space();
addr_t addr = (addr_t)(f->regs[x86_exceptionframe_t::ipreg]);
unsigned char c;