Changeset d7c9fcb in mainline


Ignore:
Timestamp:
2008-06-14T11:55:47Z (16 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1e1e5e1
Parents:
8605b24
Message:

Formatting fixes for amd64 debugger.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/src/debugger.c

    r8605b24 rd7c9fcb  
    123123
    124124#ifdef __32_BITS__
    125                         printf("%-2u %-5d %#10zx %s\n", i, breakpoints[i].counter,
    126                                 breakpoints[i].address, symbol);
     125                        printf("%-2u %-5d %#10zx %s\n", i,
     126                            breakpoints[i].counter, breakpoints[i].address,
     127                            symbol);
    127128#endif
    128129
    129130#ifdef __64_BITS__
    130                         printf("%-2u %-5d %#18zx %s\n", i, breakpoints[i].counter,
    131                                 breakpoints[i].address, symbol);
     131                        printf("%-2u %-5d %#18zx %s\n", i,
     132                            breakpoints[i].counter, breakpoints[i].address,
     133                            symbol);
    132134#endif
    133135
     
    185187
    186188                /* Enable global breakpoint */
    187                 dr7 |= 0x2 << (curidx*2);
     189                dr7 |= 0x2 << (curidx * 2);
    188190
    189191                write_dr7(dr7);
     
    257259                        if (*((unative_t *) breakpoints[slot].address) != 0)
    258260                                return;
    259                         printf("**** Found ZERO on address %lx (slot %d) ****\n",
    260                                 breakpoints[slot].address, slot);
     261                        printf("*** Found ZERO on address %lx (slot %d) ***\n",
     262                            breakpoints[slot].address, slot);
    261263                } else {
    262264                        printf("Data watchpoint - new data: %lx\n",
    263                                *((unative_t *) breakpoints[slot].address));
     265                            *((unative_t *) breakpoints[slot].address));
    264266                }
    265267        }
    266268        printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
    267                get_symtab_entry(getip(istate)));
     269            get_symtab_entry(getip(istate)));
    268270        printf("***Type 'exit' to exit kconsole.\n");
    269271        atomic_set(&haltstate,1);
     
    358360
    359361#ifdef CONFIG_SMP
    360 static void debug_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
     362static void
     363debug_ipi(int n __attribute__((unused)),
     364    istate_t *istate __attribute__((unused)))
    361365{
    362366        int i;
     
    374378        int i;
    375379
    376         for (i=0; i<BKPOINTS_MAX; i++)
     380        for (i = 0; i < BKPOINTS_MAX; i++)
    377381                breakpoints[i].address = NULL;
    378382       
     
    395399#endif
    396400       
    397         exc_register(VECTOR_DEBUG, "debugger",
    398                      debug_exception);
     401        exc_register(VECTOR_DEBUG, "debugger", debug_exception);
    399402#ifdef CONFIG_SMP
    400         exc_register(VECTOR_DEBUG_IPI, "debugger_smp",
    401                      debug_ipi);
     403        exc_register(VECTOR_DEBUG_IPI, "debugger_smp", debug_ipi);
    402404#endif
    403405}
Note: See TracChangeset for help on using the changeset viewer.