Changes in kernel/arch/amd64/src/debugger.c [49ace23:dc0b964] in mainline

File:

• kernel/arch/amd64/src/debugger.c (modified) (4 diffs)

kernel/arch/amd64/src/debugger.c

@@ -126 +126 @@
         /* Disable breakpoint in DR7 */
         unative_t dr7 = read_dr7();
-        dr7 &= ~(0x2 << (curidx * 2));
+        dr7 &= ~(0x02U << (curidx * 2));
         
         /* Setup DR register */
@@ -147 +147 @@
                 
                 /* Set type to requested breakpoint & length*/
-                dr7 &= ~(0x3 << (16 + 4 * curidx));
-                dr7 &= ~(0x3 << (18 + 4 * curidx));
+                dr7 &= ~(0x03U << (16 + 4 * curidx));
+                dr7 &= ~(0x03U << (18 + 4 * curidx));
                 
                 if (!(flags & BKPOINT_INSTR)) {
 #ifdef __32_BITS__
-                        dr7 |= ((unative_t) 0x3) << (18 + 4 * curidx);
+                        dr7 |= ((unative_t) 0x03U) << (18 + 4 * curidx);
 #endif
                         
 #ifdef __64_BITS__
-                        dr7 |= ((unative_t) 0x2) << (18 + 4 * curidx);
+                        dr7 |= ((unative_t) 0x02U) << (18 + 4 * curidx);
 #endif
                         
                         if ((flags & BKPOINT_WRITE))
-                                dr7 |= ((unative_t) 0x1) << (16 + 4 * curidx);
+                                dr7 |= ((unative_t) 0x01U) << (16 + 4 * curidx);
                         else if ((flags & BKPOINT_READ_WRITE))
-                                dr7 |= ((unative_t) 0x3) << (16 + 4 * curidx);
+                                dr7 |= ((unative_t) 0x03U) << (16 + 4 * curidx);
                 }
                 
                 /* Enable global breakpoint */
-                dr7 |= 0x2 << (curidx * 2);
+                dr7 |= 0x02U << (curidx * 2);
                 
                 write_dr7(dr7);
@@ -260 +260 @@
         }
         
-        cur->address = NULL;
+        cur->address = (uintptr_t) NULL;
         
         setup_dr(slot);
@@ -313 +313 @@
         unsigned int i;
         for (i = 0; i < BKPOINTS_MAX; i++)
-                breakpoints[i].address = NULL;
+                breakpoints[i].address = (uintptr_t) NULL;
         
 #ifdef CONFIG_KCONSOLE