Changeset 7bdcc45 in mainline for kernel/arch/mips32/include/debugger.h

Timestamp:

2010-12-16T16:38:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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.

File:

• kernel/arch/mips32/include/debugger.h (modified) (2 diffs)

kernel/arch/mips32/include/debugger.h

@@ -58 +58 @@
 
 typedef struct  {
-        uintptr_t address;          /**< Breakpoint address */
-        unative_t instruction;      /**< Original instruction */
-        unative_t nextinstruction;  /**< Original instruction following break */
-        unsigned int flags;         /**< Flags regarding breakpoint */
+        uintptr_t address;         /**< Breakpoint address */
+        sysarg_t instruction;      /**< Original instruction */
+        sysarg_t nextinstruction;  /**< Original instruction following break */
+        unsigned int flags;        /**< Flags regarding breakpoint */
         size_t counter;
         void (*bkfunc)(void *, istate_t *);
@@ -68 +68 @@
 extern bpinfo_t breakpoints[BKPOINTS_MAX];
 
-extern bool is_jump(unative_t);
+extern bool is_jump(sysarg_t);
 
 extern void debugger_init(void);