Changeset d59c046 in mainline

Timestamp:

2013-02-20T20:53:42Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a4e23f8c

Parents:

005b765

Message:

Test for a user istate can be only done by looking at CS and its RPL.

Location:

kernel/arch

Files:

• amd64/include/istate.h (modified) (1 diff)
• ia32/include/istate.h (modified) (1 diff)

kernel/arch/amd64/include/istate.h

@@ -66 +66 @@
 } istate_t;
 
+#define RPL_USER        3
+
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return !(istate->rip & UINT64_C(0x8000000000000000));
+        return (istate->cs & RPL_USER) == RPL_USER;
 }
 

kernel/arch/ia32/include/istate.h

@@ -68 +68 @@
 } istate_t;
 
+#define RPL_USER        3
+
 /** Return true if exception happened while in userspace */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return !(istate->eip & UINT32_C(0x80000000));
+        return (istate->cs & RPL_USER) == RPL_USER;
 }