Lots of work on the AcessNative kernel

[tpg/acess2.git] / Kernel / arch / x86 / lib.c

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index 1f56394..2160805 100644 (file)
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -5,6 +5,8 @@
 #include <acess.h>
 #include <threads.h>
 
+#define TRACE_LOCKS    1
+
 extern int     GetCPUNum(void);
 
 // === CODE ===
@@ -58,8 +60,8 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
        #endif
        
        #if LOCK_DISABLE_INTS
-       // Save interrupt state and clear interrupts
-       __ASM__ ("pushf;\n\tpop %%eax\n\tcli" : "=a"(IF));
+       // Save interrupt state
+       __ASM__ ("pushf;\n\tpop %0" : "=r"(IF));
        IF &= 0x200;    // AND out all but the interrupt flag
        #endif
        
@@ -93,11 +95,20 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
                #else
                __ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
                #endif
+               
+               #if LOCK_DISABLE_INTS
+               if( v ) __ASM__("sti"); // Re-enable interrupts
+               #endif
        }
        
        #if LOCK_DISABLE_INTS
+       __ASM__("cli");
        Lock->IF = IF;
        #endif
+       
+       #if TRACE_LOCKS
+       Log_Log("LOCK", "%p locked by %p\n", Lock, __builtin_return_address(0));
+       #endif
 }
 /**
  * \brief Release a short lock
@@ -105,6 +116,10 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
  */
 void SHORTREL(struct sShortSpinlock *Lock)
 {
+       #if TRACE_LOCKS
+       Log_Log("LOCK", "%p released by %p\n", Lock, __builtin_return_address(0));
+       #endif
+       
        #if STACKED_LOCKS
        if( Lock->Depth ) {
                Lock->Depth --;