Changed spinlock mechananisim

[tpg/acess2.git] / Kernel / arch / x86 / include / arch.h

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 7735568..67a6290 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -29,44 +29,48 @@
 
 #define __ASM__        __asm__ __volatile__
 
+#define LONGLOCK_NUM_THREADS   8
+
 // === MACROS ===
-typedef volatile int   tSpinlock;
-#define IS_LOCKED(lockptr)     (!!(*(tSpinlock*)lockptr))
-/**
- * \brief Inter-Process interrupt (does a Yield)
- */
-#define LOCK(lockptr)  do {\
-       int v=1;\
-       while(v) {\
-               __ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-               if(v) Threads_Yield();\
-       }\
-}while(0)
+struct sShortSpinlock {
+       volatile int    Lock;
+        int    IF;
+};
 /**
- * \brief Tight spinlock (does a HLT)
+ * \brief Determine if a short spinlock is locked
  */
-#define TIGHTLOCK(lockptr)     do{\
-       int v=1;\
-       while(v) {\
-               __ASM__("xchgl %%eax,(%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-               if(v) __ASM__("hlt");\
-       }\
-}while(0)
+static inline int IS_LOCKED(struct sShortSpinlock *Lock) {
+       return !!Lock->Lock;
+}
 /**
- * \brief Very Tight spinlock (short inter-cpu lock)
+ * \brief Acquire a Short Spinlock
+ * \note Stops interrupts, so be careful
  */
-#define VTIGHTLOCK(lockptr)    do{\
-       int v=1;\
-       while(v)__ASM__("xchgl %%eax,(%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-}while(0)
+static inline void SHORTLOCK(struct sShortSpinlock *Lock) {
+        int    v = 1;
+       __ASM__ ("pushf;\n\tpop %%eax" : "=a"(Lock->IF));
+       Lock->IF &= 0x200;
+       __ASM__ ("cli");        // Stop task switches
+       // Wait for another CPU to release
+       while(v)
+               __ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
+}
 /**
- * \brief Release a held spinlock
+ * \brief Release a short lock
  */
-#define        RELEASE(lockptr)        __ASM__("lock andl $0, (%%edi)"::"D"(lockptr));
+static inline void SHORTREL(struct sShortSpinlock *Lock) {
+       Lock->Lock = 0;
+       #if 0
+       __ASM__ ("pushf;\n\tor %0, (%%esp);\n\tpopf" : : "a"(Lock->IF));
+       #else
+       if(Lock->IF)    __ASM__ ("sti");
+       #endif
+}
 /**
  * \brief Halt the CPU
  */
 #define        HALT()  __asm__ __volatile__ ("hlt")
+#define        MAGIC_BREAK()   __asm__ __volatile__ ("xchg %bx, %bx")
 
 // === TYPES ===
 typedef unsigned int   Uint;   // Unsigned machine native integer