Ticket #6032: ppc_arch_debug_call_with_fault_handler_2010-05-18.diff

src/system/kernel/arch/ppc/arch_asm.S

@@ -7 +7 @@
  */
 
 
+#include "asm_offsets.h"
+
 #define FUNCTION(x) .global x; .type x,@function; x
 
 #define MSR_EXCEPTIONS_ENABLED 15
@@ -330 +332 @@
     li          %r3, 0
     b           kernel_debugger
 
+
+/*! \fn void arch_debug_call_with_fault_handler(cpu_ent* cpu,
+        jmp_buf jumpBuffer, void (*function)(void*), void* parameter)
+
+    Called by debug_call_with_fault_handler() to do the dirty work of setting
+    the fault handler and calling the function. If the function causes a page
+    fault, the arch_debug_call_with_fault_handler() calls longjmp() with the
+    given \a jumpBuffer. Otherwise it returns normally.
+
+    debug_call_with_fault_handler() has already saved the CPU's fault_handler
+    and fault_handler_stack_pointer and will reset them later, so
+    arch_debug_call_with_fault_handler() doesn't need to care about it.
+
+    \param cpu The \c cpu_ent for the current CPU.
+    \param jumpBuffer Buffer to be used for longjmp().
+    \param function 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):
+    // store jump buffer pointer on stack
+    stwu    %r4, -4(%r1)
+    // set CPU's fault handler
+    lis     %r13, 1b@ha
+    ori     %r13, %r13, 1b@l
+    stw     %r13, CPU_ENT_fault_handler(%r3)
+    // set CPU's fault_handler_stack_pointer
+    stw     %r1, CPU_ENT_fault_handler_stack_pointer(%r3)
+    // call the given function
+    stwu    %r3, -4(%r1)
+    mflr    %r3
+    stwu    %r3, -4(%r1)
+
+    mr      %r3, %r6
+    mtlr    %r5
+    blr
+    
+    lwzu    %r3, 4(%r1)
+    mtlr    %r3
+    lwzu    %r3, 4(%r1)
+    lwzu    %r4, 4(%r1)
+    blr
+
+    // fault -- return via longjmp(jumpBuffer, 1)
+1:
+    lwzu    %r3, 4(%r1)
+    li      %r4, 1
+    mflr    %r13
+    stwu    %r13, -4(%r1)
+    lis     %r13, longjmp@ha
+    ori     %r13, %r13, longjmp@l
+    mtlr    %r13
+    blr
+    lwzu    %r13, 4(%r1)
+    mtlr    %r13
+    blr
+

src/system/kernel/arch/ppc/arch_debug.cpp

@@ -308 +308 @@
 }
 
 
-void
-arch_debug_call_with_fault_handler(cpu_ent* cpu, jmp_buf jumpBuffer,
-    void (*function)(void*), void* parameter)
-{
-    // TODO: Implement! Most likely in assembly.
-    longjmp(jumpBuffer, 1);
-}
-
-
 bool
 arch_is_debug_variable_defined(const char* variableName)
 {