i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-added support for kernel breakpoints. This feature is just way to

Browse Source 
handy in certain situations to not have it.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27213 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-08-27 12:52:23 +00:00
parent 0490454cb8
commit 953cb30447
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_interrupts.S
+21 -5
View File
@@ -7,6 +7,7 @@
* Distributed under the terms of the NewOS License. * Distributed under the terms of the NewOS License.
*/ */
#include <arch/user_debugger.h>
#include <arch/x86/arch_cpu.h> #include <arch/x86/arch_cpu.h>
#include <arch/x86/arch_kernel.h> #include <arch/x86/arch_kernel.h>
#include <arch/x86/descriptors.h> #include <arch/x86/descriptors.h>
@@ -98,11 +99,16 @@
original eax/edx values */ \ original eax/edx values */ \
iret iret
#define DISABLE_BREAKPOINTS() \ #if KERNEL_BREAKPOINTS
testl $THREAD_FLAGS_BREAKPOINTS_INSTALLED, THREAD_flags(%edi); \ # define DISABLE_BREAKPOINTS() \
jz 1f; \ call x86_exit_user_debug_at_kernel_entry;
call x86_exit_user_debug_at_kernel_entry; \ #else
1: # define DISABLE_BREAKPOINTS() \
testl $THREAD_FLAGS_BREAKPOINTS_INSTALLED, THREAD_flags(%edi); \
jz 1f; \
call x86_exit_user_debug_at_kernel_entry; \
1:
#endif // KERNEL_BREAKPOINTS
#define COPY_SYSCALL_PARAMETERS() \ #define COPY_SYSCALL_PARAMETERS() \
/* make room for the syscall params */ \ /* make room for the syscall params */ \
@@ -306,10 +312,14 @@ int_bottom_user:
cmp $USER_CODE_SEG, IFRAME_cs(%ebp) cmp $USER_CODE_SEG, IFRAME_cs(%ebp)
jne 1f jne 1f
#if KERNEL_BREAKPOINTS
jmp kernel_exit_work
#else
testl $(THREAD_FLAGS_DEBUGGER_INSTALLED | THREAD_FLAGS_SIGNALS_PENDING \ testl $(THREAD_FLAGS_DEBUGGER_INSTALLED | THREAD_FLAGS_SIGNALS_PENDING \
| THREAD_FLAGS_DEBUG_THREAD | THREAD_FLAGS_BREAKPOINTS_DEFINED) \ | THREAD_FLAGS_DEBUG_THREAD | THREAD_FLAGS_BREAKPOINTS_DEFINED) \
, THREAD_flags(%edi) , THREAD_flags(%edi)
jnz kernel_exit_work jnz kernel_exit_work
#endif
1: 1:
cli // disable interrupts cli // disable interrupts
@@ -411,12 +421,16 @@ handle_syscall:
TRACE_POST_SYSCALL() TRACE_POST_SYSCALL()
#if KERNEL_BREAKPOINTS
jmp post_syscall_work
#else
testl $(THREAD_FLAGS_DEBUGGER_INSTALLED | THREAD_FLAGS_SIGNALS_PENDING \ testl $(THREAD_FLAGS_DEBUGGER_INSTALLED | THREAD_FLAGS_SIGNALS_PENDING \
| THREAD_FLAGS_DEBUG_THREAD | THREAD_FLAGS_BREAKPOINTS_DEFINED \ | THREAD_FLAGS_DEBUG_THREAD | THREAD_FLAGS_BREAKPOINTS_DEFINED \
| THREAD_FLAGS_64_BIT_SYSCALL_RETURN \ | THREAD_FLAGS_64_BIT_SYSCALL_RETURN \
| THREAD_FLAGS_RESTART_SYSCALL | THREAD_FLAGS_SYSCALL_RESTARTED) \ | THREAD_FLAGS_RESTART_SYSCALL | THREAD_FLAGS_SYSCALL_RESTARTED) \
, THREAD_flags(%edi) , THREAD_flags(%edi)
jnz post_syscall_work jnz post_syscall_work
#endif
cli // disable interrupts cli // disable interrupts
@@ -489,8 +503,10 @@ handle_syscall:
1: 1:
// install breakpoints, if defined // install breakpoints, if defined
#if !KERNEL_BREAKPOINTS
testl $THREAD_FLAGS_BREAKPOINTS_DEFINED, THREAD_flags(%edi) testl $THREAD_FLAGS_BREAKPOINTS_DEFINED, THREAD_flags(%edi)
jz 1f jz 1f
#endif
push %ebp push %ebp
call x86_init_user_debug_at_kernel_exit call x86_init_user_debug_at_kernel_exit
1: 1: