Changeset 687c3cd in mainline

Timestamp:

2009-02-14T21:06:57Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4cac212c

Parents:

74bcf5e

Message:

Get rid of CONFIG_DEBUG_AS_WATCHPOINT.

Files:

• HelenOS.config (modified) (1 diff)
• kernel/arch/amd64/src/debugger.c (modified) (6 diffs)
• kernel/arch/amd64/src/proc/scheduler.c (modified) (2 diffs)
• kernel/arch/ia32/src/proc/scheduler.c (modified) (2 diffs)

HelenOS.config

@@ -328 +328 @@
 % Deadlock detection support for spinlocks
 ! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
-
-% Watchpoint on rewriting AS with zero
-! [CONFIG_DEBUG=y&(PLATFORM=amd64|PLATFORM=ia32)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
 
 % Compile kernel tests

kernel/arch/amd64/src/debugger.c

@@ -65 +65 @@
 };
 
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
-
 static int cmd_del_breakpoint(cmd_arg_t *argv);
 static cmd_arg_t del_argv = {
@@ -102 +100 @@
 };
 
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 
@@ -321 +318 @@
                 printf("Cannot register command %s\n", bkpts_info.name);
 
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
         cmd_initialize(&delbkpt_info);
         if (!cmd_register(&delbkpt_info))
@@ -333 +329 @@
         if (!cmd_register(&addwatchp_info))
                 printf("Cannot register command %s\n", addwatchp_info.name);
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
         
@@ -378 +373 @@
         return 1;
 }
-
-#ifndef CONFIG_DEBUG_AS_WATCHPOINT
 
 /** Remove breakpoint from table */
@@ -413 +406 @@
         return 1;
 }
-#endif /* CONFIG_DEBUG_AS_WATCHPOINT */
 #endif /* CONFIG_KCONSOLE */
 

kernel/arch/amd64/src/proc/scheduler.c

@@ -40 +40 @@
 #include <arch/context.h>       /* SP_DELTA */
 #include <arch/asm.h>
-#include <arch/debugger.h>
 #include <print.h>
 #include <arch/pm.h>
@@ -69 +68 @@
         /* TLS support - set FS to thread local storage */
         write_msr(AMD_MSR_FS, THREAD->arch.tls);
-
-#ifdef CONFIG_DEBUG_AS_WATCHPOINT
-        /* Set watchpoint on AS to ensure that nobody sets it to zero */
-        if (CPU->id < BKPOINTS_MAX)
-                breakpoint_add(&((the_t *) THREAD->kstack)->as, 
-                    BKPOINT_WRITE | BKPOINT_CHECK_ZERO, CPU->id);
-#endif
 }
 

kernel/arch/ia32/src/proc/scheduler.c

@@ -39 +39 @@
 #include <arch.h>
 #include <arch/context.h>       /* SP_DELTA */
-#include <arch/debugger.h>
 #include <arch/pm.h>
 #include <arch/asm.h>
@@ -71 +70 @@
         /* Set up TLS in GS register */
         set_tls_desc(THREAD->arch.tls);
-
-#ifdef CONFIG_DEBUG_AS_WATCHPOINT
-        /* Set watchpoint on AS to ensure that nobody sets it to zero */
-        if (CPU->id < BKPOINTS_MAX) {
-                the_t *the = THE;
-                breakpoint_add(&((the_t *) the->thread->kstack)->as, 
-                    BKPOINT_WRITE | BKPOINT_CHECK_ZERO, the->cpu->id);
-        }
-#endif
 }