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

ARM: fix arch_debug_call_with_fault_handler 

This fixes the problem with KDL freaking out when doing a stacktrace
and having its fault handler triggered. Have no clue how this could
have worked before, but it did :P
This commit is contained in:
Ithamar R. Adema 2014-09-07 19:11:36 +02:00
parent 365f14bfbd
commit eb92810edc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/kernel/arch/arm/arch_asm.S
View File

@ -231,7 +231,7 @@ FUNCTION_END(arch_cpu_user_strlcpy)
\param parameter The parameter to be passed to the function to be called. \param parameter The parameter to be passed to the function to be called.
*/ */
FUNCTION(arch_debug_call_with_fault_handler): FUNCTION(arch_debug_call_with_fault_handler):
stmfd sp!, { r4, lr } stmfd sp!, { r1, r4, lr }
// Set fault handler address, and fault handler stack pointer address. We // Set fault handler address, and fault handler stack pointer address. We
// don't need to save the previous values, since that's done by the caller. // don't need to save the previous values, since that's done by the caller.
@ -245,11 +245,11 @@ FUNCTION(arch_debug_call_with_fault_handler):
blx r2 blx r2
// regular return // regular return
ldmfd sp!, { r4, pc } ldmfd sp!, { r1, r4, pc }
// fault -- return via longjmp(jumpBuffer, 1) // fault -- return via longjmp(jumpBuffer, 1)
1: 1:
mov r0, r1 ldmfd sp!, { r0, r4, lr } // restore jumpBuffer in r0 (was r1)
mov r1, #1 mov r1, #1
bl longjmp b longjmp
FUNCTION_END(arch_debug_call_with_fault_handler) FUNCTION_END(arch_debug_call_with_fault_handler)