Cleanup (debug statements removed)

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

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index 9287d9c..3d951d4 100644 (file)
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -5,6 +5,12 @@
 #include <acess.h>
 #include <threads.h>
 
+#define TRACE_LOCKS    0
+
+#if TRACE_LOCKS
+extern struct sShortSpinlock   glDebug_Lock;
+#endif
+
 extern int     GetCPUNum(void);
 
 // === CODE ===
@@ -58,8 +64,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,18 +99,31 @@ 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
+       if( Lock != &glDebug_Lock )
+       {
+               //Log_Log("LOCK", "%p locked by %p", Lock, __builtin_return_address(0));
+               LogF("Lock %p locked by %p\n", Lock, __builtin_return_address(0));
+       }
+       #endif
 }
 /**
  * \brief Release a short lock
  * \param Lock Lock pointer
  */
 void SHORTREL(struct sShortSpinlock *Lock)
-{
+{      
        #if STACKED_LOCKS
        if( Lock->Depth ) {
                Lock->Depth --;
@@ -112,6 +131,14 @@ void SHORTREL(struct sShortSpinlock *Lock)
        }
        #endif
        
+       #if TRACE_LOCKS
+       if( Lock != &glDebug_Lock )
+       {
+               //Log_Log("LOCK", "%p released by %p", Lock, __builtin_return_address(0));
+               LogF("Lock %p released by %p\n", Lock, __builtin_return_address(0));
+       }
+       #endif
+       
        #if LOCK_DISABLE_INTS
        // Lock->IF can change anytime once Lock->Lock is zeroed
        if(Lock->IF) {
@@ -189,15 +216,16 @@ void *memsetd(void *Dest, Uint32 Val, size_t Num)
  */
 int memcmp(const void *m1, const void *m2, size_t Num)
 {
-       if( Num == 0 )  return 1;       // No bytes are always identical
+       if( Num == 0 )  return 0;       // No bytes are always identical
        
        while(Num--)
        {
-               if(*(Uint8*)m1 != *(Uint8*)m2)  break;
+               if(*(Uint8*)m1 != *(Uint8*)m2)
+                       return *(Uint8*)m1 - *(Uint8*)m2;
                m1 ++;
                m2 ++;
        }
-       return *(Uint8*)m1 - *(Uint8*)m2;
+       return 0;
 }
 
 /**
@@ -254,6 +282,21 @@ Uint64 __udivdi3(Uint64 Num, Uint64 Den)
        if(Num < Den*2) return 1;
        if(Num == Den*2)        return 2;
        
+       #if 1
+       i = 0;  // Shut up
+       P[0] = Num;
+       P[1] = Den;
+       __asm__ __volatile__ (
+               "fildq %2\n\t"  // Num
+               "fildq %1\n\t"  // Den
+               "fdivp\n\t"
+               "fistpq %0"
+               : "=m" (q)
+               : "m" (P[0]), "m" (P[1])
+               );
+               
+       //Log("%llx / %llx = %llx\n", Num, Den, q);
+       #else
        // Restoring division, from wikipedia
        // http://en.wikipedia.org/wiki/Division_(digital)
        P[0] = Num;     P[1] = 0;
@@ -275,6 +318,7 @@ Uint64 __udivdi3(Uint64 Num, Uint64 Den)
                        P[1] += Den;
                }
        }
+       #endif
        
        return q;
 }