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

Timestamp:

2008-06-03T14:59:48Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2c4fb51

Parents:

b63f8569

Message:

reflect changes in generic code
proper formatting directives
coding style

File:

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

kernel/arch/amd64/src/debugger.c

@@ -107 +107 @@
         unsigned int i;
         char *symbol;
-        
-        if (sizeof(void *) == 4) {
-                printf("#  Count Address    In symbol\n");
-                printf("-- ----- ---------- ---------\n");
-        } else {
-                printf("#  Count Address            In symbol\n");
-                printf("-- ----- ------------------ ---------\n");
-        }
+
+#ifdef __32_BITS__      
+        printf("#  Count Address    In symbol\n");
+        printf("-- ----- ---------- ---------\n");
+#endif
+
+#ifdef __64_BITS__
+        printf("#  Count Address            In symbol\n");
+        printf("-- ----- ------------------ ---------\n");
+#endif
         
         for (i = 0; i < BKPOINTS_MAX; i++)
                 if (breakpoints[i].address) {
                         symbol = get_symtab_entry(breakpoints[i].address);
-                        
-                        if (sizeof(void *) == 4)
-                                printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
-                                        breakpoints[i].address, symbol);
-                        else
-                                printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
-                                        breakpoints[i].address, symbol);
+
+#ifdef __32_BITS__
+                        printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
+                                breakpoints[i].address, symbol);
+#endif
+
+#ifdef __64_BITS__
+                        printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
+                                breakpoints[i].address, symbol);
+#endif
+
                 }
         return 1;
@@ -163 +169 @@
                         ;
                 } else {
-                        if (sizeof(int) == 4)
-                                dr7 |= ((unative_t) 0x3) << (18 + 4*curidx);
-                        else /* 8 */
-                                dr7 |= ((unative_t) 0x2) << (18 + 4*curidx);
+                
+#ifdef __32_BITS__
+                        dr7 |= ((unative_t) 0x3) << (18 + 4 * curidx);
+#endif
+
+#ifdef __64_BITS__
+                        dr7 |= ((unative_t) 0x2) << (18 + 4 * curidx);
+#endif
                         
                         if ((flags & BKPOINT_WRITE))
-                                dr7 |= ((unative_t) 0x1) << (16 + 4*curidx);
+                                dr7 |= ((unative_t) 0x1) << (16 + 4 * curidx);
                         else if ((flags & BKPOINT_READ_WRITE))
-                                dr7 |= ((unative_t) 0x3) << (16 + 4*curidx);
+                                dr7 |= ((unative_t) 0x3) << (16 + 4 * curidx);
                 }