Changes in kernel/arch/arm32/include/exception.h [598f90e:7a0359b] in mainline

File:

• kernel/arch/arm32/include/exception.h (modified) (2 diffs)

kernel/arch/arm32/include/exception.h

@@ -39 +39 @@
 
 #include <typedefs.h>
-#include <arch/istate.h>
+#include <arch/regutils.h>
+#include <trace.h>
 
 /** If defined, forces using of high exception vectors. */
@@ -84 +85 @@
 extern uintptr_t exc_stack;
 
+/** Struct representing CPU state saved when an exception occurs. */
+typedef struct istate {
+        uint32_t spsr;
+        uint32_t sp;
+        uint32_t lr;
+        
+        uint32_t r0;
+        uint32_t r1;
+        uint32_t r2;
+        uint32_t r3;
+        uint32_t r4;
+        uint32_t r5;
+        uint32_t r6;
+        uint32_t r7;
+        uint32_t r8;
+        uint32_t r9;
+        uint32_t r10;
+        uint32_t fp;
+        uint32_t r12;
+        
+        uint32_t pc;
+} istate_t;
+
+/** Set Program Counter member of given istate structure.
+ *
+ * @param istate  istate structure
+ * @param retaddr new value of istate's PC member
+ *
+ */
+NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+    uintptr_t retaddr)
+{
+        istate->pc = retaddr;
+}
+
+/** Return true if exception happened while in userspace. */
+NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+{
+        return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE;
+}
+
+/** Return Program Counter member of given istate structure. */
+NO_TRACE static inline unative_t istate_get_pc(istate_t *istate)
+{
+        return istate->pc;
+}
+
+NO_TRACE static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return istate->fp;
+}
+
 extern void install_exception_handlers(void);
 extern void exception_init(void);