Changeset 53f9821 in mainline for arch/ia32/include

Timestamp:

2006-03-20T20:32:17Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

018d957e

Parents:

9d3e185

Message:

Cleanup of spinlocks, now compiles both ia32 and amd64 with
and without DEBUG_SPINLOCKS. Made spinlocks inline.
Moved syscall_handler to generic (it was identical for ia32,amd64 & mips32).
Made slightly faster syscall for ia32.
Made better interrupt routines for ia32.
Allow not saving non-scratch registers during interrupt on ia32,amd64,mips32.
Aligned interrupt handlers on ia32,amd64, this should prevent problems
with different instruction lengths.

Location:

arch/ia32/include

Files:

• atomic.h (modified) (2 diffs)
• interrupt.h (modified) (1 diff)

arch/ia32/include/atomic.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <arch/barrier.h>
+#include <preemption.h>
 
 typedef struct { volatile __u32 count; } atomic_t;
@@ -101 +103 @@
 }
 
+/** Ia32 specific fast spinlock */
+static inline void atomic_lock_arch(atomic_t *val)
+{
+        __u32 tmp;
 
-extern void spinlock_arch(volatile int *val);
+        preemption_disable();
+        __asm__ volatile (
+                "0:;"
+#ifdef CONFIG_HT
+                "pause;" /* Pentium 4's HT love this instruction */
+#endif
+                "mov %0, %1;"
+                "testl %1, %1;"
+                "jnz 0b;"       /* Leightweight looping on locked spinlock */
+                
+                "incl %1;"      /* now use the atomic operation */
+                "xchgl %0, %1;"
+                "testl %1, %1;"
+                "jnz 0b;"
+                : "=m"(val->count),"=r"(tmp)
+                );
+        /*
+         * Prevent critical section code from bleeding out this way up.
+         */
+        CS_ENTER_BARRIER();
+}
 
 #endif

arch/ia32/include/interrupt.h

@@ -64 +64 @@
 
 struct istate {
+        __u32 eax;
+        __u32 ecx;
+        __u32 edx;
+        __u32 esi;
         __u32 edi;
-        __u32 esi;
         __u32 ebp;
-        __u32 esp;
         __u32 ebx;
-        __u32 edx;
-        __u32 ecx;
-        __u32 eax;
+
+        __u32 gs;
+        __u32 fs;
+        __u32 es;
+        __u32 ds;
+
         __u32 error_word;
         __u32 eip;