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

Timestamp:

2007-05-31T21:39:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7bb0c32

Parents:

d8431986

Message:

fix ICC compilation

File:

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

kernel/arch/amd64/src/debugger.c

@@ -103 +103 @@
 
 /** Print table of active breakpoints */
-int cmd_print_breakpoints(cmd_arg_t *argv)
+int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
 {
         int i;
@@ -112 +112 @@
                 if (breakpoints[i].address) {
                         symbol = get_symtab_entry(breakpoints[i].address);
-                        printf("%d. %p in %s\n",i,
+                        printf("%d. %lx in %s\n", i,
                                breakpoints[i].address, symbol);
                         printf("     Count(%d) ", breakpoints[i].counter);
@@ -174 +174 @@
 /** Enable hardware breakpoint
  *
- *
  * @param where Address of HW breakpoint
  * @param flags Type of breakpoint (EXECUTE, WRITE)
  * @return Debug slot on success, -1 - no available HW breakpoint
  */
-int breakpoint_add(void * where, int flags, int curidx)
+int breakpoint_add(const void *where, const int flags, int curidx)
 {
         ipl_t ipl;
@@ -185 +184 @@
         bpinfo_t *cur;
 
-        ASSERT( flags & (BKPOINT_INSTR | BKPOINT_WRITE | BKPOINT_READ_WRITE));
+        ASSERT(flags & (BKPOINT_INSTR | BKPOINT_WRITE | BKPOINT_READ_WRITE));
 
         ipl = interrupts_disable();
@@ -192 +191 @@
         if (curidx == -1) {
                 /* Find free space in slots */
-                for (i=0; i<BKPOINTS_MAX; i++)
+                for (i = 0; i < BKPOINTS_MAX; i++)
                         if (!breakpoints[i].address) {
                                 curidx = i;
@@ -224 +223 @@
 
 #ifdef amd64
-# define getip(x)  ((x)->rip)
+#       define getip(x) ((x)->rip)
 #else
-# define getip(x)  ((x)->eip)
+#       define getip(x) ((x)->eip)
 #endif
 
@@ -238 +237 @@
                         if (*((unative_t *) breakpoints[slot].address) != 0)
                                 return;
-                        printf("**** Found ZERO on address %p ****\n",
-                               slot, breakpoints[slot].address);
+                        printf("**** Found ZERO on address %lx (slot %d) ****\n",
+                                breakpoints[slot].address, slot);
                 } else {
-                        printf("Data watchpoint - new data: %p\n",
+                        printf("Data watchpoint - new data: %lx\n",
                                *((unative_t *) breakpoints[slot].address));
                 }
         }
-        printf("Reached breakpoint %d:%p(%s)\n", slot, getip(istate),
+        printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
                get_symtab_entry(getip(istate)));
         printf("***Type 'exit' to exit kconsole.\n");
@@ -314 +313 @@
 #endif
 
-static void debug_exception(int n, istate_t *istate)
+static void debug_exception(int n __attribute__((unused)), istate_t *istate)
 {
         unative_t dr6;
@@ -338 +337 @@
 
 #ifdef CONFIG_SMP
-static void debug_ipi(int n, istate_t *istate)
+static void debug_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
         int i;
 
         spinlock_lock(&bkpoint_lock);
-        for (i=0; i < BKPOINTS_MAX; i++)
+        for (i = 0; i < BKPOINTS_MAX; i++)
                 setup_dr(i);
         spinlock_unlock(&bkpoint_lock);