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
Added some very pedantic warning flags
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
lib.c
diff --git
a/Kernel/arch/x86/lib.c
b/Kernel/arch/x86/lib.c
index
f3f190d
..
5fa9d12
100644
(file)
--- a/
Kernel/arch/x86/lib.c
+++ b/
Kernel/arch/x86/lib.c
@@
-5,8
+5,19
@@
#include <acess.h>
#include <threads.h>
#include <acess.h>
#include <threads.h>
+#define TRACE_LOCKS 0
+
+#if TRACE_LOCKS
+extern struct sShortSpinlock glDebug_Lock;
+#endif
+
+// === IMPRORTS ===
extern int GetCPUNum(void);
extern int GetCPUNum(void);
+// === PROTOTYPES ==
+Uint64 __udivdi3(Uint64 Num, Uint64 Den);
+Uint64 __umoddi3(Uint64 Num, Uint64 Den);
+
// === CODE ===
/**
* \brief Determine if a short spinlock is locked
// === CODE ===
/**
* \brief Determine if a short spinlock is locked
@@
-58,8
+69,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
+96,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,18
+104,31
@@
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
+ 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)
}
/**
* \brief Release a short lock
* \param Lock Lock pointer
*/
void SHORTREL(struct sShortSpinlock *Lock)
-{
+{
#if STACKED_LOCKS
if( Lock->Depth ) {
Lock->Depth --;
#if STACKED_LOCKS
if( Lock->Depth ) {
Lock->Depth --;
@@
-112,6
+136,14
@@
void SHORTREL(struct sShortSpinlock *Lock)
}
#endif
}
#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) {
#if LOCK_DISABLE_INTS
// Lock->IF can change anytime once Lock->Lock is zeroed
if(Lock->IF) {
@@
-189,13
+221,18
@@
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)
{
+ const Uint8 *d1 = m1;
+ const Uint8 *d2 = m2;
+ if( Num == 0 ) return 0; // No bytes are always identical
+
while(Num--)
{
while(Num--)
{
- if(*(Uint8*)m1 != *(Uint8*)m2) break;
- m1 ++;
- m2 ++;
+ if(*d1 != *d2)
+ return *d1 - *d2;
+ d1 ++;
+ d2 ++;
}
}
- return
*(Uint8*)m1 - *(Uint8*)m2
;
+ return
0
;
}
/**
}
/**
@@
-252,6
+289,21
@@
Uint64 __udivdi3(Uint64 Num, Uint64 Den)
if(Num < Den*2) return 1;
if(Num == Den*2) return 2;
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;
// Restoring division, from wikipedia
// http://en.wikipedia.org/wiki/Division_(digital)
P[0] = Num; P[1] = 0;
@@
-273,6
+325,7
@@
Uint64 __udivdi3(Uint64 Num, Uint64 Den)
P[1] += Den;
}
}
P[1] += Den;
}
}
+ #endif
return q;
}
return q;
}
UCC
git Repository :: git.ucc.asn.au