Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: improve error output, fix iframe reporting.

Browse Source
This commit is contained in:
Ithamar R. Adema 2013-09-19 03:15:06 +02:00
parent e8a2aa0b28
commit e7c330c6f3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/system/kernel/arch/arm/arch_int.cpp
View File

@ -31,7 +31,7 @@
#include <string.h> #include <string.h>
//#define TRACE_ARCH_INT #define TRACE_ARCH_INT
#ifdef TRACE_ARCH_INT #ifdef TRACE_ARCH_INT
# define TRACE(x) dprintf x # define TRACE(x) dprintf x
#else #else
@ -108,9 +108,9 @@ print_iframe(const char *event, struct iframe *frame)
frame->r0, frame->r1, frame->r2, frame->r3, frame->r0, frame->r1, frame->r2, frame->r3,
frame->r4, frame->r5, frame->r6, frame->r7); frame->r4, frame->r5, frame->r6, frame->r7);
dprintf("R08=%08lx R09=%08lx R10=%08lx R11=%08lx\n" dprintf("R08=%08lx R09=%08lx R10=%08lx R11=%08lx\n"
"R12=%08lx R13=%08lx R14=%08lx CPSR=%08lx\n", "R12=%08lx SP=%08lx LR=%08lx PC=%08lx CPSR=%08lx\n",
frame->r8, frame->r9, frame->r10, frame->r11, frame->r8, frame->r9, frame->r10, frame->r11,
frame->r12, frame->usr_sp, frame->usr_lr, frame->spsr); frame->r12, frame->svc_sp, frame->svc_lr, frame->pc, frame->spsr);
} }
@ -215,9 +215,9 @@ private:
extern "C" void extern "C" void
arch_arm_undefined(struct iframe *iframe) arch_arm_undefined(struct iframe *iframe)
{ {
print_iframe("Undefined Instruction", iframe);
IFrameScope scope(iframe); // push/pop iframe IFrameScope scope(iframe); // push/pop iframe
print_iframe("Undefined Instruction", iframe);
panic("not handled!"); panic("not handled!");
} }
@ -225,17 +225,14 @@ arch_arm_undefined(struct iframe *iframe)
extern "C" void extern "C" void
arch_arm_syscall(struct iframe *iframe) arch_arm_syscall(struct iframe *iframe)
{ {
IFrameScope scope(iframe); // push/pop iframe
print_iframe("Software interrupt", iframe); print_iframe("Software interrupt", iframe);
IFrameScope scope(iframe); // push/pop iframe
} }
extern "C" void extern "C" void
arch_arm_data_abort(struct iframe *frame) arch_arm_data_abort(struct iframe *frame)
{ {
IFrameScope scope(iframe);
Thread *thread = thread_get_current_thread(); Thread *thread = thread_get_current_thread();
bool isUser = (frame->spsr & 0x1f) == 0x10; bool isUser = (frame->spsr & 0x1f) == 0x10;
addr_t far = arm_get_far(); addr_t far = arm_get_far();
@ -244,8 +241,11 @@ arch_arm_data_abort(struct iframe *frame)
#ifdef TRACE_ARCH_INT #ifdef TRACE_ARCH_INT
print_iframe("Data Abort", frame); print_iframe("Data Abort", frame);
dprintf("FAR: %08lx, thread: %s\n", far, thread->name);
#endif #endif
IFrameScope scope(frame);
if (debug_debugger_running()) { if (debug_debugger_running()) {
// If this CPU or this thread has a fault handler, we're allowed to be // If this CPU or this thread has a fault handler, we're allowed to be
// here. // here.
@ -320,9 +320,9 @@ arch_arm_data_abort(struct iframe *frame)
extern "C" void extern "C" void
arch_arm_prefetch_abort(struct iframe *iframe) arch_arm_prefetch_abort(struct iframe *iframe)
{ {
print_iframe("Prefetch Abort", iframe);
IFrameScope scope(iframe); IFrameScope scope(iframe);
print_iframe("Prefetch Abort", iframe);
panic("not handled!"); panic("not handled!");
} }