Changeset 4e49572 in mainline for arch

Timestamp:

2006-03-17T11:41:05Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

23d22eb

Parents:

5a7d9d1

Message:

Added debugger to AMD64.
Added automatic debugging of AS if it is not rewritten with zero.
Did small changes to IPC infrastructure.

Location:

arch/amd64

Files:

• Makefile.inc (modified) (1 diff)
• include/asm.h (modified) (2 diffs)
• include/cpu.h (modified) (1 diff)
• include/debugger.h (added)
• include/interrupt.h (modified) (1 diff)
• src/amd64.c (modified) (2 diffs)
• src/debugger.c (added)
• src/proc/scheduler.c (modified) (2 diffs)

arch/amd64/Makefile.inc

@@ -104 +104 @@
         arch/$(ARCH)/src/proc/scheduler.c \
         arch/$(ARCH)/src/userspace.c \
-        arch/$(ARCH)/src/syscall.c
+        arch/$(ARCH)/src/syscall.c \
+        arch/$(ARCH)/src/debugger.c
 
 ifeq ($(CONFIG_SMP),y)

arch/amd64/include/asm.h

@@ -142 +142 @@
 }
 
-/** Read CR0
- *
- * Return value in CR0
- *
- * @return Value read.
- */
-static inline __u64 read_cr0(void) 
-{ 
-        __u64 v; 
-        __asm__ volatile ("movq %%cr0,%0\n" : "=r" (v)); 
-        return v; 
-}
-
-/** Read CR2
- *
- * Return value in CR2
- *
- * @return Value read.
- */
-static inline __u64 read_cr2(void) 
-{ 
-        __u64 v; 
-        __asm__ volatile ("movq %%cr2,%0\n" : "=r" (v)); 
-        return v; 
-}
-
-/** Write CR3
- *
- * Write value to CR3.
- *
- * @param v Value to be written.
- */
-static inline void write_cr3(__u64 v) 
-{ 
-        __asm__ volatile ("movq %0,%%cr3\n" : : "r" (v)); 
-}
-
-/** Read CR3
- *
- * Return value in CR3
- *
- * @return Value read.
- */
-static inline __u64 read_cr3(void) 
-{ 
-        __u64 v;
-        __asm__ volatile ("movq %%cr3,%0" : "=r" (v)); 
-        return v; 
-}
-
 /** Write to MSR */
 static inline void write_msr(__u32 msr, __u64 value)
@@ -251 +201 @@
 }
 
+#define GEN_READ_REG(reg) static inline __native read_ ##reg (void) \
+    { \
+        __native res; \
+        __asm__ volatile ("movq %%" #reg ", %0" : "=r" (res) ); \
+        return res; \
+    }
+
+#define GEN_WRITE_REG(reg) static inline void write_ ##reg (__native regn) \
+    { \
+        __asm__ volatile ("movq %0, %%" #reg : : "r" (regn)); \
+    }
+
+GEN_READ_REG(cr0);
+GEN_READ_REG(cr2);
+GEN_READ_REG(cr3);
+GEN_WRITE_REG(cr3);
+
+GEN_READ_REG(dr0);
+GEN_READ_REG(dr1);
+GEN_READ_REG(dr2);
+GEN_READ_REG(dr3);
+GEN_READ_REG(dr6);
+GEN_READ_REG(dr7);
+
+GEN_WRITE_REG(dr0);
+GEN_WRITE_REG(dr1);
+GEN_WRITE_REG(dr2);
+GEN_WRITE_REG(dr3);
+GEN_WRITE_REG(dr6);
+GEN_WRITE_REG(dr7);
+
+
 extern size_t interrupt_handler_size;
 extern void interrupt_handlers(void);

arch/amd64/include/cpu.h

@@ -30 +30 @@
 #define __amd64_CPU_H__
 
+#define RFLAGS_RF       (1 << 16)
 
 #define EFER_MSR_NUM    0xc0000080

arch/amd64/include/interrupt.h

@@ -54 +54 @@
 #endif
 
+#define VECTOR_DEBUG            1
 #define VECTOR_PIC_SPUR         (IVT_IRQBASE+IRQ_PIC_SPUR)
 #define VECTOR_CLK              (IVT_IRQBASE+IRQ_CLK)

arch/amd64/src/amd64.c

@@ -47 +47 @@
 #include <interrupt.h>
 #include <arch/syscall.h>
+#include <arch/debugger.h>
 
 /** Disable I/O on non-privileged levels
@@ -130 +131 @@
         if (config.cpu_active == 1) {
                 ega_init();     /* video */
+                /* Enable debugger */
+                debugger_init();
         }
         /* Setup fast SYSCALL/SYSRET */
         syscall_setup_cpu();
-
+        
 }
 

arch/amd64/src/proc/scheduler.c

@@ -33 +33 @@
 #include <arch/context.h>       /* SP_DELTA */
 #include <arch/asm.h>
+#include <arch/debugger.h>
 
 void before_thread_runs_arch(void)
@@ -43 +44 @@
                   (__u64)&THREAD->kstack);
         swapgs();
+
+
+#ifdef CONFIG_DEBUG_AS_WATCHPOINT
+        /* Set watchpoint on AS to ensure that nobody sets it to zero */
+        static int old_slot = -1;
+        if (old_slot >=0)
+                breakpoint_del(old_slot);
+        old_slot = breakpoint_add(&((the_t *) THREAD->kstack)->as, 
+                                  BKPOINT_WRITE | BKPOINT_CHECK_ZERO);
+#endif
 }