Changeset 04803bf in mainline for kernel/arch/ia32/include/istate.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/arch/ia32/include/istate.h (moved) (moved from kernel/generic/include/synch/rwlock.h ) (2 diffs)

kernel/arch/ia32/include/istate.h

@@ -27 +27 @@
  */
 
-/** @addtogroup sync
+/** @addtogroup ia32interrupt
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_RWLOCK_H_
-#define KERN_RWLOCK_H_
+#ifndef KERN_ia32_ISTATE_H_
+#define KERN_ia32_ISTATE_H_
 
-#include <arch/types.h>
-#include <synch/mutex.h>
-#include <synch/synch.h>
-#include <synch/spinlock.h>
+#ifdef KERNEL
 
-typedef enum {
-        RWLOCK_NONE,
-        RWLOCK_READER,
-        RWLOCK_WRITER
-} rwlock_type_t;
+#include <typedefs.h>
+#include <trace.h>
 
-typedef struct {
-        SPINLOCK_DECLARE(lock);
-        /**
-         * Mutex for writers, readers can bypass it if readers_in is positive.
+#else /* KERNEL */
+
+#include <sys/types.h>
+
+#define NO_TRACE
+
+#endif /* KERNEL */
+
+typedef struct istate {
+        /*
+         * The strange order of the GPRs is given by the requirement to use the
+         * istate structure for both regular interrupts and exceptions as well
+         * as for syscall handlers which use this order as an optimization.
          */
-        mutex_t exclusive;
-        /** Number of readers in critical section. */
-        size_t readers_in;
-} rwlock_t;
+        uint32_t edx;
+        uint32_t ecx;
+        uint32_t ebx;
+        uint32_t esi;
+        uint32_t edi;
+        uint32_t ebp;
+        uint32_t eax;
+        
+        uint32_t ebp_frame;  /* imitation of frame pointer linkage */
+        uint32_t eip_frame;  /* imitation of return address linkage */
+        
+        uint32_t gs;
+        uint32_t fs;
+        uint32_t es;
+        uint32_t ds;
+        
+        uint32_t error_word;  /* real or fake error word */
+        uint32_t eip;
+        uint32_t cs;
+        uint32_t eflags;
+        uint32_t esp;         /* only if istate_t is from uspace */
+        uint32_t ss;          /* only if istate_t is from uspace */
+} istate_t;
 
-#define rwlock_write_lock(rwl) \
-        _rwlock_write_lock_timeout((rwl), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
-#define rwlock_read_lock(rwl) \
-        _rwlock_read_lock_timeout((rwl), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
-#define rwlock_write_trylock(rwl) \
-        _rwlock_write_lock_timeout((rwl), SYNCH_NO_TIMEOUT, \
-            SYNCH_FLAGS_NON_BLOCKING)
-#define rwlock_read_trylock(rwl) \
-        _rwlock_read_lock_timeout((rwl), SYNCH_NO_TIMEOUT, \
-            SYNCH_FLAGS_NON_BLOCKING)
-#define rwlock_write_lock_timeout(rwl, usec) \
-        _rwlock_write_lock_timeout((rwl), (usec), SYNCH_FLAGS_NONE)
-#define rwlock_read_lock_timeout(rwl, usec) \
-        _rwlock_read_lock_timeout((rwl), (usec), SYNCH_FLAGS_NONE)
+/** 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));
+}
 
-extern void rwlock_initialize(rwlock_t *rwl);
-extern void rwlock_read_unlock(rwlock_t *rwl);
-extern void rwlock_write_unlock(rwlock_t *rwl);
-extern int _rwlock_read_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
-extern int _rwlock_write_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
+NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+    uintptr_t retaddr)
+{
+        istate->eip = retaddr;
+}
+
+NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+{
+        return istate->eip;
+}
+
+NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+{
+        return istate->ebp;
+}
 
 #endif