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

File:

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

kernel/arch/amd64/src/debugger.c

@@ -125 +125 @@
         
         /* Disable breakpoint in DR7 */
-        unative_t dr7 = read_dr7();
-        dr7 &= ~(0x2 << (curidx * 2));
+        sysarg_t dr7 = read_dr7();
+        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 |= ((sysarg_t) 0x03U) << (18 + 4 * curidx);
 #endif
                         
 #ifdef __64_BITS__
-                        dr7 |= ((unative_t) 0x2) << (18 + 4 * curidx);
+                        dr7 |= ((sysarg_t) 0x02U) << (18 + 4 * curidx);
 #endif
                         
                         if ((flags & BKPOINT_WRITE))
-                                dr7 |= ((unative_t) 0x1) << (16 + 4 * curidx);
+                                dr7 |= ((sysarg_t) 0x01U) << (16 + 4 * curidx);
                         else if ((flags & BKPOINT_READ_WRITE))
-                                dr7 |= ((unative_t) 0x3) << (16 + 4 * curidx);
+                                dr7 |= ((sysarg_t) 0x03U) << (16 + 4 * curidx);
                 }
                 
                 /* Enable global breakpoint */
-                dr7 |= 0x2 << (curidx * 2);
+                dr7 |= 0x02U << (curidx * 2);
                 
                 write_dr7(dr7);
@@ -227 +227 @@
         if (!(breakpoints[slot].flags & BKPOINT_INSTR)) {
                 if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) {
-                        if (*((unative_t *) breakpoints[slot].address) != 0)
+                        if (*((sysarg_t *) breakpoints[slot].address) != 0)
                                 return;
                         
-                        printf("*** Found ZERO on address %" PRIp " (slot %d) ***\n",
-                            breakpoints[slot].address, slot);
+                        printf("*** Found ZERO on address %p (slot %d) ***\n",
+                            (void *) breakpoints[slot].address, slot);
                 } else {
-                        printf("Data watchpoint - new data: %" PRIp "\n",
-                            *((unative_t *) breakpoints[slot].address));
-                }
-        }
-        
-        printf("Reached breakpoint %d:%" PRIp " (%s)\n", slot, getip(istate),
-            symtab_fmt_name_lookup(getip(istate)));
+                        printf("Data watchpoint - new data: %#" PRIxn "\n",
+                            *((sysarg_t *) breakpoints[slot].address));
+                }
+        }
+        
+        printf("Reached breakpoint %d:%p (%s)\n", slot,
+            (void *) getip(istate), symtab_fmt_name_lookup(getip(istate)));
         
 #ifdef CONFIG_KCONSOLE
@@ -260 +260 @@
         }
         
-        cur->address = NULL;
+        cur->address = (uintptr_t) NULL;
         
         setup_dr(slot);
@@ -279 +279 @@
 #endif
         
-        unative_t dr6 = read_dr6();
+        sysarg_t dr6 = read_dr6();
         
         unsigned int i;
@@ -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
@@ -363 +363 @@
                         
 #ifdef __32_BITS__
-                        printf("%-4u %7" PRIs " %p %s\n", i,
-                            breakpoints[i].counter, breakpoints[i].address,
+                        printf("%-4u %7zu %p %s\n", i,
+                            breakpoints[i].counter, (void *) breakpoints[i].address,
                             symbol);
 #endif
                         
 #ifdef __64_BITS__
-                        printf("%-4u %7" PRIs " %p %s\n", i,
-                            breakpoints[i].counter, breakpoints[i].address,
+                        printf("%-4u %7zu %p %s\n", i,
+                            breakpoints[i].counter, (void *) breakpoints[i].address,
                             symbol);
 #endif
@@ -384 +384 @@
 int cmd_del_breakpoint(cmd_arg_t *argv)
 {
-        unative_t bpno = argv->intval;
+        sysarg_t bpno = argv->intval;
         if (bpno > BKPOINTS_MAX) {
                 printf("Invalid breakpoint number.\n");
@@ -405 +405 @@
                 flags = BKPOINT_WRITE;
         
-        printf("Adding breakpoint on address: %p\n", argv->intval);
-        
-        int id = breakpoint_add((void *)argv->intval, flags, -1);
+        printf("Adding breakpoint on address: %p\n",
+            (void *) argv->intval);
+        
+        int id = breakpoint_add((void *) argv->intval, flags, -1);
         if (id < 0)
                 printf("Add breakpoint failed.\n");