Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9b6bec in mainline for kernel/arch/mips32/src/debugger.c


Ignore:
Timestamp:
2010-12-14T20:19:41Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
11658b64
Parents:
37f7cfe (diff), 228e490 (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

Extra changes: ipcarg_t is sysarg_t and
IPC_GET_METHOD is IPC_GET_IMETHOD.

File:
1 edited

Legend:

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

    r37f7cfe ra9b6bec  
    134134 *
    135135 */
    136 bool is_jump(unative_t instr)
     136bool is_jump(sysarg_t instr)
    137137{
    138138        unsigned int i;
     
    166166                        return 0;
    167167                } else if ((breakpoints[i].address == (uintptr_t) argv->intval +
    168                     sizeof(unative_t)) || (breakpoints[i].address ==
    169                     (uintptr_t) argv->intval - sizeof(unative_t))) {
     168                    sizeof(sysarg_t)) || (breakpoints[i].address ==
     169                    (uintptr_t) argv->intval - sizeof(sysarg_t))) {
    170170                        printf("Adjacent breakpoints not supported, conflict "
    171171                            "with %d.\n", i);
     
    194194       
    195195        cur->address = (uintptr_t) argv->intval;
    196         cur->instruction = ((unative_t *) cur->address)[0];
    197         cur->nextinstruction = ((unative_t *) cur->address)[1];
     196        cur->instruction = ((sysarg_t *) cur->address)[0];
     197        cur->nextinstruction = ((sysarg_t *) cur->address)[1];
    198198        if (argv == &add_argv) {
    199199                cur->flags = 0;
     
    209209       
    210210        /* Set breakpoint */
    211         *((unative_t *) cur->address) = 0x0d;
     211        *((sysarg_t *) cur->address) = 0x0d;
    212212        smc_coherence(cur->address);
    213213       
     
    341341                /* Reinst only breakpoint */
    342342                if ((breakpoints[i].flags & BKPOINT_REINST) &&
    343                     (fireaddr == breakpoints[i].address + sizeof(unative_t))) {
     343                    (fireaddr == breakpoints[i].address + sizeof(sysarg_t))) {
    344344                        cur = &breakpoints[i];
    345345                        break;
Note: See TracChangeset for help on using the changeset viewer.