Changeset 7f1c620 in mainline for arch/amd64/src/debugger.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

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

arch/amd64/src/debugger.c

@@ -47 +47 @@
 
 typedef struct  {
-        __address address;      /**< Breakpoint address */
+        uintptr_t address;      /**< Breakpoint address */
         int flags;              /**< Flags regarding breakpoint */
         int counter;            /**< How many times the exception occured */
@@ -123 +123 @@
 static void setup_dr(int curidx)
 {
-        __native dr7;
+        unative_t dr7;
         bpinfo_t *cur = &breakpoints[curidx];
         int flags = breakpoints[curidx].flags;
@@ -154 +154 @@
                 } else {
                         if (sizeof(int) == 4)
-                                dr7 |= ((__native) 0x3) << (18 + 4*curidx);
+                                dr7 |= ((unative_t) 0x3) << (18 + 4*curidx);
                         else /* 8 */
-                                dr7 |= ((__native) 0x2) << (18 + 4*curidx);
+                                dr7 |= ((unative_t) 0x2) << (18 + 4*curidx);
                         
                         if ((flags & BKPOINT_WRITE))
-                                dr7 |= ((__native) 0x1) << (16 + 4*curidx);
+                                dr7 |= ((unative_t) 0x1) << (16 + 4*curidx);
                         else if ((flags & BKPOINT_READ_WRITE))
-                                dr7 |= ((__native) 0x3) << (16 + 4*curidx);
+                                dr7 |= ((unative_t) 0x3) << (16 + 4*curidx);
                 }
 
@@ -206 +206 @@
         cur = &breakpoints[curidx];
 
-        cur->address = (__address) where;
+        cur->address = (uintptr_t) where;
         cur->flags = flags;
         cur->counter = 0;
@@ -236 +236 @@
         if (! (breakpoints[slot].flags & BKPOINT_INSTR)) {
                 if ((breakpoints[slot].flags & BKPOINT_CHECK_ZERO)) {
-                        if (*((__native *) breakpoints[slot].address) != 0)
+                        if (*((unative_t *) breakpoints[slot].address) != 0)
                                 return;
                         printf("**** Found ZERO on address %p ****\n",
@@ -242 +242 @@
                 } else {
                         printf("Data watchpoint - new data: %p\n",
-                               *((__native *) breakpoints[slot].address));
+                               *((unative_t *) breakpoints[slot].address));
                 }
         }
@@ -316 +316 @@
 static void debug_exception(int n, istate_t *istate)
 {
-        __native dr6;
+        unative_t dr6;
         int i;