git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
0ca98f9
..
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>
#include <acess.h>
#include <threads.h>
+#define TRACE_LOCKS 1
+
extern int GetCPUNum(void);
// === CODE ===
extern int GetCPUNum(void);
// === CODE ===
@@
-58,8
+60,8
@@
void SHORTLOCK(struct sShortSpinlock *Lock)
#endif
#if LOCK_DISABLE_INTS
#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
IF &= 0x200; // AND out all but the interrupt flag
#endif
@@
-85,7
+87,7
@@
void SHORTLOCK(struct sShortSpinlock *Lock)
: "=a"(v)
: "a"(0), "r"(cpu), "r"(&Lock->Lock)
);
: "=a"(v)
: "a"(0), "r"(cpu), "r"(&Lock->Lock)
);
- #el
se
if STACKED_LOCKS == 2
+ #elif STACKED_LOCKS == 2
__ASM__("lock cmpxchgl %2, (%3)"
: "=a"(v)
: "a"(0), "r"(thread), "r"(&Lock->Lock)
__ASM__("lock cmpxchgl %2, (%3)"
: "=a"(v)
: "a"(0), "r"(thread), "r"(&Lock->Lock)
@@
-93,11
+95,20
@@
void SHORTLOCK(struct sShortSpinlock *Lock)
#else
__ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
#endif
#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
}
#if LOCK_DISABLE_INTS
+ __ASM__("cli");
Lock->IF = IF;
#endif
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
}
/**
* \brief Release a short lock
@@
-105,6
+116,10
@@
void SHORTLOCK(struct sShortSpinlock *Lock)
*/
void SHORTREL(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 --;
#if STACKED_LOCKS
if( Lock->Depth ) {
Lock->Depth --;
@@
-189,13
+204,16
@@
void *memsetd(void *Dest, Uint32 Val, size_t Num)
*/
int memcmp(const void *m1, const void *m2, size_t Num)
{
*/
int memcmp(const void *m1, const void *m2, size_t Num)
{
+ if( Num == 0 ) return 0; // No bytes are always identical
+
while(Num--)
{
while(Num--)
{
- if(*(Uint8*)m1 != *(Uint8*)m2) break;
+ if(*(Uint8*)m1 != *(Uint8*)m2)
+ return *(Uint8*)m1 - *(Uint8*)m2;
m1 ++;
m2 ++;
}
m1 ++;
m2 ++;
}
- return
*(Uint8*)m1 - *(Uint8*)m2
;
+ return
0
;
}
/**
}
/**
@@
-328,3
+346,7
@@
EXPORT(__udivdi3); EXPORT(__umoddi3);
EXPORT(LittleEndian16); EXPORT(BigEndian16);
EXPORT(LittleEndian32); EXPORT(BigEndian32);
EXPORT(LittleEndian16); EXPORT(BigEndian16);
EXPORT(LittleEndian32); EXPORT(BigEndian32);
+
+EXPORT(SHORTLOCK);
+EXPORT(SHORTREL);
+EXPORT(IS_LOCKED);
UCC
git Repository :: git.ucc.asn.au