Changeset cefb126 in mainline for kernel/arch/abs32le/include/interrupt.h

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/abs32le/include/interrupt.h (modified) (5 diffs)

kernel/arch/abs32le/include/interrupt.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <verify.h>
 
 #define IVT_ITEMS  0
@@ -54 +55 @@
 
 static inline int istate_from_uspace(istate_t *istate)
+    REQUIRES_EXTENT_MUTABLE(istate)
 {
         /* On real hardware this checks whether the interrupted
@@ -62 +64 @@
 
 static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
+    WRITES(&istate->ip)
 {
         /* On real hardware this sets the instruction pointer. */
@@ -69 +72 @@
 
 static inline unative_t istate_get_pc(istate_t *istate)
+    REQUIRES_EXTENT_MUTABLE(istate)
 {
         /* On real hardware this returns the instruction pointer. */
@@ -76 +80 @@
 
 static inline unative_t istate_get_fp(istate_t *istate)
+    REQUIRES_EXTENT_MUTABLE(istate)
 {
         /* On real hardware this returns the frame pointer. */