#include <acess.h>
#include <threads.h>
+#define TRACE_LOCKS 1
+
extern int GetCPUNum(void);
// === CODE ===
#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
: "=a"(v)
: "a"(0), "r"(cpu), "r"(&Lock->Lock)
);
- #elseif STACKED_LOCKS == 2
+ #elif STACKED_LOCKS == 2
__ASM__("lock cmpxchgl %2, (%3)"
: "=a"(v)
: "a"(0), "r"(thread), "r"(&Lock->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
*/
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 --;
*/
int memcmp(const void *m1, const void *m2, size_t Num)
{
+ 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;
}
/**
EXPORT(LittleEndian16); EXPORT(BigEndian16);
EXPORT(LittleEndian32); EXPORT(BigEndian32);
+
+EXPORT(SHORTLOCK);
+EXPORT(SHORTREL);
+EXPORT(IS_LOCKED);