Changeset 87b4baa in mainline for kernel/arch/amd64/src/debugger.c

Timestamp:

2010-12-17T20:16:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/arch/amd64/src/debugger.c

@@ -125 +125 @@
         
         /* Disable breakpoint in DR7 */
-        unative_t dr7 = read_dr7();
+        sysarg_t dr7 = read_dr7();
         dr7 &= ~(0x02U << (curidx * 2));
         
@@ -152 +152 @@
                 if (!(flags & BKPOINT_INSTR)) {
 #ifdef __32_BITS__
-                        dr7 |= ((unative_t) 0x03U) << (18 + 4 * curidx);
+                        dr7 |= ((sysarg_t) 0x03U) << (18 + 4 * curidx);
 #endif
                         
 #ifdef __64_BITS__
-                        dr7 |= ((unative_t) 0x02U) << (18 + 4 * curidx);
+                        dr7 |= ((sysarg_t) 0x02U) << (18 + 4 * curidx);
 #endif
                         
                         if ((flags & BKPOINT_WRITE))
-                                dr7 |= ((unative_t) 0x01U) << (16 + 4 * curidx);
+                                dr7 |= ((sysarg_t) 0x01U) << (16 + 4 * curidx);
                         else if ((flags & BKPOINT_READ_WRITE))
-                                dr7 |= ((unative_t) 0x03U) << (16 + 4 * curidx);
+                                dr7 |= ((sysarg_t) 0x03U) << (16 + 4 * curidx);
                 }
                 
@@ -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;
                         
@@ -234 +234 @@
                 } else {
                         printf("Data watchpoint - new data: %#" PRIxn "\n",
-                            *((unative_t *) breakpoints[slot].address));
+                            *((sysarg_t *) breakpoints[slot].address));
                 }
         }
@@ -279 +279 @@
 #endif
         
-        unative_t dr6 = read_dr6();
+        sysarg_t dr6 = read_dr6();
         
         unsigned int i;
@@ -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");