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

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/include/debugger.h

    r37f7cfe ra9b6bec  
    5858
    5959typedef struct  {
    60         uintptr_t address;          /**< Breakpoint address */
    61         unative_t instruction;      /**< Original instruction */
    62         unative_t nextinstruction;  /**< Original instruction following break */
    63         unsigned int flags;         /**< Flags regarding breakpoint */
     60        uintptr_t address;         /**< Breakpoint address */
     61        sysarg_t instruction;      /**< Original instruction */
     62        sysarg_t nextinstruction;  /**< Original instruction following break */
     63        unsigned int flags;        /**< Flags regarding breakpoint */
    6464        size_t counter;
    6565        void (*bkfunc)(void *, istate_t *);
     
    6868extern bpinfo_t breakpoints[BKPOINTS_MAX];
    6969
    70 extern bool is_jump(unative_t);
     70extern bool is_jump(sysarg_t);
    7171
    7272extern void debugger_init(void);
Note: See TracChangeset for help on using the changeset viewer.