X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Flib.c;h=175f9a5550f5cde85acfb9b070968b9bedfcab48;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=f3f190d45e263cc06135b89db9d86cf126b94cbb;hpb=18b264927674c480481466c40368554fb72f560f;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index f3f190d4..175f9a55 100644
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -1,11 +1,37 @@
 /*
- * AcessOS Microkernel Version
- * lib.c
+ * Acess2
+ *
+ * arch/x86/lib.c
+ * - General arch-specific stuff
  */
 #include <acess.h>
-#include <threads.h>
+#include <threads_int.h>
+#include <arch_int.h>
+#include <hal_proc.h>	// GetCPUNum
 
-extern int	GetCPUNum(void);
+#define TRACE_LOCKS	0
+
+#define DEBUG_TO_E9	1
+#define DEBUG_TO_SERIAL	1
+#define	SERIAL_PORT	0x3F8
+#define	GDB_SERIAL_PORT	0x2F8
+
+// === IMPRORTS ===
+#if TRACE_LOCKS
+extern struct sShortSpinlock	glDebug_Lock;
+extern tMutex	glPhysAlloc;
+#define TRACE_LOCK_COND	(Lock != &glDebug_Lock && Lock != &glThreadListLock && Lock != &glPhysAlloc.Protector)
+//#define TRACE_LOCK_COND	(Lock != &glDebug_Lock && Lock != &glPhysAlloc.Protector)
+#endif
+
+// === PROTOTYPES ==
+Uint64	__divmod64(Uint64 Num, Uint64 Den, Uint64 *Rem);
+Uint64	__udivdi3(Uint64 Num, Uint64 Den);
+Uint64	__umoddi3(Uint64 Num, Uint64 Den);
+
+// === GLOBALS ===
+ int	gbDebug_SerialSetup = 0;
+ int	gbGDB_SerialSetup = 0;
 
 // === CODE ===
 /**
@@ -23,15 +49,20 @@ int IS_LOCKED(struct sShortSpinlock *Lock)
  */
 int CPU_HAS_LOCK(struct sShortSpinlock *Lock)
 {
-	#if STACKED_LOCKS == 1
 	return Lock->Lock == GetCPUNum() + 1;
-	#elif STACKED_LOCKS == 2
-	return Lock->Lock == Proc_GetCurThread();
-	#else
-	return 0;
-	#endif
 }
 
+void __AtomicTestSetLoop(Uint *Ptr, Uint Value)
+{
+	__ASM__(
+		"1:\n\t"
+		"xor %%eax, %%eax;\n\t"
+		"lock cmpxchgl %0, (%1);\n\t"
+		"jnz 1b;\n\t"
+		:: "r"(Value), "r"(Ptr)
+		: "eax" // EAX clobbered
+		);
+}
 /**
  * \brief Acquire a Short Spinlock
  * \param Lock	Lock pointer
@@ -47,56 +78,34 @@ int CPU_HAS_LOCK(struct sShortSpinlock *Lock)
  */
 void SHORTLOCK(struct sShortSpinlock *Lock)
 {
-	 int	v = 1;
-	#if LOCK_DISABLE_INTS
 	 int	IF;
-	#endif
-	#if STACKED_LOCKS == 1
 	 int	cpu = GetCPUNum() + 1;
-	#elif STACKED_LOCKS == 2
-	void	*thread = Proc_GetCurThread();
-	#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 STACKED_LOCKS == 1
-	if( Lock->Lock == cpu ) {
-		Lock->Depth ++;
-		return ;
-	}
-	#elif STACKED_LOCKS == 2
-	if( Lock->Lock == thread ) {
-		Lock->Depth ++;
-		return ;
+	#if TRACE_LOCKS
+	if( TRACE_LOCK_COND )
+	{
+		//Log_Log("LOCK", "%p locked by %p", Lock, __builtin_return_address(0));
+		Debug("%i %p obtaining %p (Called by %p)", cpu-1,  __builtin_return_address(0), Lock, __builtin_return_address(1));
 	}
 	#endif
 	
-	// Wait for another CPU to release
-	while(v) {
-		// CMPXCHG:
-		//  If r/m32 == EAX, set ZF and set r/m32 = r32
-		//  Else, clear ZF and set EAX = r/m32
-		#if STACKED_LOCKS == 1
-		__ASM__("lock cmpxchgl %2, (%3)"
-			: "=a"(v)
-			: "a"(0), "r"(cpu), "r"(&Lock->Lock)
-			);
-		#elseif 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
-	}
+	__ASM__("cli");
 	
-	#if LOCK_DISABLE_INTS
+	// Wait for another CPU to release
+	__AtomicTestSetLoop( (Uint*)&Lock->Lock, cpu );
 	Lock->IF = IF;
+	
+	#if TRACE_LOCKS
+	if( TRACE_LOCK_COND )
+	{
+		//Log_Log("LOCK", "%p locked by %p", Lock, __builtin_return_address(0));
+		Debug("%i %p locked by %p\t%p", cpu-1, Lock, __builtin_return_address(0), __builtin_return_address(1));
+//		Debug("got it");
+	}
 	#endif
 }
 /**
@@ -104,15 +113,15 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
  * \param Lock	Lock pointer
  */
 void SHORTREL(struct sShortSpinlock *Lock)
-{
-	#if STACKED_LOCKS
-	if( Lock->Depth ) {
-		Lock->Depth --;
-		return ;
+{	
+	#if TRACE_LOCKS
+	if( TRACE_LOCK_COND )
+	{
+		//Log_Log("LOCK", "%p released by %p", Lock, __builtin_return_address(0));
+		Debug("Lock %p released by %p\t%p", Lock, __builtin_return_address(0), __builtin_return_address(1));
 	}
 	#endif
 	
-	#if LOCK_DISABLE_INTS
 	// Lock->IF can change anytime once Lock->Lock is zeroed
 	if(Lock->IF) {
 		Lock->Lock = 0;
@@ -121,9 +130,69 @@ void SHORTREL(struct sShortSpinlock *Lock)
 	else {
 		Lock->Lock = 0;
 	}
-	#else
-	Lock->Lock = 0;
+}
+
+// === DEBUG IO ===
+#if USE_GDB_STUB
+int putDebugChar(char ch)
+{
+	if(!gbGDB_SerialSetup) {
+		outb(GDB_SERIAL_PORT + 1, 0x00);    // Disable all interrupts
+		outb(GDB_SERIAL_PORT + 3, 0x80);    // Enable DLAB (set baud rate divisor)
+		outb(GDB_SERIAL_PORT + 0, 0x0C);    // Set divisor to 12 (lo byte) 9600 baud
+		outb(GDB_SERIAL_PORT + 1, 0x00);    //  (base is         (hi byte)
+		outb(GDB_SERIAL_PORT + 3, 0x03);    // 8 bits, no parity, one stop bit (8N1)
+		outb(GDB_SERIAL_PORT + 2, 0xC7);    // Enable FIFO with 14-byte threshold and clear it
+		outb(GDB_SERIAL_PORT + 4, 0x0B);    // IRQs enabled, RTS/DSR set
+		gbGDB_SerialSetup = 1;
+	}
+	while( (inb(GDB_SERIAL_PORT + 5) & 0x20) == 0 );
+	outb(GDB_SERIAL_PORT, ch);
+	return 0;
+}
+int getDebugChar(void)
+{
+	if(!gbGDB_SerialSetup) {
+		outb(GDB_SERIAL_PORT + 1, 0x00);    // Disable all interrupts
+		outb(GDB_SERIAL_PORT + 3, 0x80);    // Enable DLAB (set baud rate divisor)
+		outb(GDB_SERIAL_PORT + 0, 0x0C);    // Set divisor to 12 (lo byte) 9600 baud
+		outb(GDB_SERIAL_PORT + 1, 0x00);    //                   (hi byte)
+		outb(GDB_SERIAL_PORT + 3, 0x03);    // 8 bits, no parity, one stop bit
+		outb(GDB_SERIAL_PORT + 2, 0xC7);    // Enable FIFO with 14-byte threshold and clear it
+		outb(GDB_SERIAL_PORT + 4, 0x0B);    // IRQs enabled, RTS/DSR set
+		gbGDB_SerialSetup = 1;
+	}
+	while( (inb(GDB_SERIAL_PORT + 5) & 1) == 0)	;
+	return inb(GDB_SERIAL_PORT);
+}
+#endif	/* USE_GDB_STUB */
+
+void Debug_PutCharDebug(char ch)
+{
+	#if DEBUG_TO_E9
+	__asm__ __volatile__ ( "outb %%al, $0xe9" :: "a"(((Uint8)ch)) );
 	#endif
+	
+	#if DEBUG_TO_SERIAL
+	if(!gbDebug_SerialSetup) {
+		outb(SERIAL_PORT + 1, 0x00);	// Disable all interrupts
+		outb(SERIAL_PORT + 3, 0x80);	// Enable DLAB (set baud rate divisor)
+		outb(SERIAL_PORT + 0, 0x0C);	// Set divisor to 12 (lo byte) 9600 baud
+		outb(SERIAL_PORT + 1, 0x00);	//                   (hi byte)
+		outb(SERIAL_PORT + 3, 0x03);	// 8 bits, no parity, one stop bit
+		outb(SERIAL_PORT + 2, 0xC7);	// Enable FIFO with 14-byte threshold and clear it
+		outb(SERIAL_PORT + 4, 0x0B);	// IRQs enabled, RTS/DSR set
+		gbDebug_SerialSetup = 1;
+	}
+	while( (inb(SERIAL_PORT + 5) & 0x20) == 0 );
+	outb(SERIAL_PORT, ch);
+	#endif
+}
+
+void Debug_PutStringDebug(const char *String)
+{
+	while(*String)
+		Debug_PutCharDebug(*String++);
 }
 
 // === IO Commands ===
@@ -189,13 +258,18 @@ void *memsetd(void *Dest, Uint32 Val, 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--)
 	{
-		if(*(Uint8*)m1 != *(Uint8*)m2)	break;
-		m1 ++;
-		m2 ++;
+		if(*d1 != *d2)
+			return *d1 - *d2;
+		d1 ++;
+		d2 ++;
 	}
-	return *(Uint8*)m1 - *(Uint8*)m2;
+	return 0;
 }
 
 /**
@@ -204,9 +278,47 @@ int memcmp(const void *m1, const void *m2, size_t Num)
  */
 void *memcpy(void *Dest, const void *Src, size_t Num)
 {
-	if( ((Uint)Dest & 3) || ((Uint)Src & 3) )
-		__asm__ __volatile__ ("rep movsb" :: "D" (Dest), "S" (Src), "c" (Num));
-	else {
+	tVAddr	dst = (tVAddr)Dest;
+	tVAddr	src = (tVAddr)Src;
+	if( (dst & 3) != (src & 3) )
+	{
+		__asm__ __volatile__ ("rep movsb" :: "D" (dst), "S" (src), "c" (Num));
+//		Debug("\nmemcpy:Num=0x%x by %p (UA)", Num, __builtin_return_address(0));
+	}
+	#if 1
+	else if( Num > 128 && (dst & 15) == (src & 15) )
+	{
+		char	tmp[16+15];	// Note, this is a hack to save/restor xmm0
+		 int	count = 16 - (dst & 15);
+//		Debug("\nmemcpy:Num=0x%x by %p (SSE)", Num, __builtin_return_address(0));
+		if( count < 16 )
+		{
+			Num -= count;
+			__asm__ __volatile__ ("rep movsb" : "=D"(dst),"=S"(src): "0"(dst), "1"(src), "c"(count));
+		}
+		
+		count = Num / 16;
+		__asm__ __volatile__ (
+			"movdqa 0(%5), %%xmm0;\n\t"
+			"1:\n\t"
+			"movdqa 0(%1), %%xmm0;\n\t"
+			"movdqa %%xmm0, 0(%0);\n\t"
+			"add $16,%0;\n\t"
+			"add $16,%1;\n\t"
+			"loop 1b;\n\t"
+			"movdqa %%xmm0, 0(%5);\n\t"
+			: "=r"(dst),"=r"(src)
+			: "0"(dst), "1"(src), "c"(count), "r" (((tVAddr)tmp+15)&~15)
+			);
+
+		count = Num & 15;
+		if(count)
+			__asm__ __volatile__ ("rep movsb" :: "D"(dst), "S"(src), "c"(count));
+	}
+	#endif
+	else
+	{
+//		Debug("\nmemcpy:Num=0x%x by %p", Num, __builtin_return_address(0));
 		__asm__ __volatile__ (
 			"rep movsl;\n\t"
 			"mov %3, %%ecx;\n\t"
@@ -215,6 +327,7 @@ void *memcpy(void *Dest, const void *Src, size_t Num)
 	}
 	return Dest;
 }
+
 /**
  * \fn void *memcpyd(void *Dest, const void *Src, size_t Num)
  * \brief Copy \a Num DWORDs from \a Src to \a Dest
@@ -225,17 +338,36 @@ void *memcpyd(void *Dest, const void *Src, size_t Num)
 	return Dest;
 }
 
+#include "../helpers.h"
+
+DEF_DIVMOD(64);
+
+Uint64 DivMod64U(Uint64 Num, Uint64 Div, Uint64 *Rem)
+{
+	if( Div < 0x100000000ULL && Num < 0xFFFFFFFF * Div ) {
+		Uint32	rem, ret_32;
+		__asm__ __volatile__(
+			"div %4"
+			: "=a" (ret_32), "=d" (rem)
+			: "a" ( (Uint32)(Num & 0xFFFFFFFF) ), "d" ((Uint32)(Num >> 32)), "r" (Div)
+			);
+		if(Rem)	*Rem = rem;
+		return ret_32;
+	}
+
+	return __divmod64(Num, Div, Rem);
+}
+
 /**
  * \fn Uint64 __udivdi3(Uint64 Num, Uint64 Den)
  * \brief Divide two 64-bit integers
  */
 Uint64 __udivdi3(Uint64 Num, Uint64 Den)
 {
-	Uint64	P[2];
-	Uint64	q = 0;
-	 int	i;
-	
-	if(Den == 0)	__asm__ __volatile__ ("int $0x0");
+	if(Den == 0) {
+		__asm__ __volatile__ ("int $0x0");
+		return -1;
+	}
 	// Common speedups
 	if(Num <= 0xFFFFFFFF && Den <= 0xFFFFFFFF)
 		return (Uint32)Num / (Uint32)Den;
@@ -251,30 +383,8 @@ Uint64 __udivdi3(Uint64 Num, Uint64 Den)
 	if(Num < Den)	return 0;
 	if(Num < Den*2)	return 1;
 	if(Num == Den*2)	return 2;
-	
-	// Restoring division, from wikipedia
-	// http://en.wikipedia.org/wiki/Division_(digital)
-	P[0] = Num;	P[1] = 0;
-	for( i = 64; i--; )
-	{
-		// P <<= 1;
-		P[1] = (P[1] << 1) | (P[0] >> 63);
-		P[0] = P[0] << 1;
-		
-		// P -= Den << 64
-		P[1] -= Den;
-		
-		// P >= 0
-		if( !(P[1] & (1ULL<<63)) ) {
-			q |= (Uint64)1 << (63-i);
-		}
-		else {
-			//q |= 0 << (63-i);
-			P[1] += Den;
-		}
-	}
-	
-	return q;
+
+	return __divmod64(Num, Den, NULL);
 }
 
 /**
@@ -283,7 +393,11 @@ Uint64 __udivdi3(Uint64 Num, Uint64 Den)
  */
 Uint64 __umoddi3(Uint64 Num, Uint64 Den)
 {
-	if(Den == 0)	__asm__ __volatile__ ("int $0x0");	// Call Div by Zero Error
+	Uint64	ret = 0;
+	if(Den == 0) {
+		__asm__ __volatile__ ("int $0x0");	// Call Div by Zero Error
+		return -1;
+	}
 	if(Den == 1)	return 0;	// Speed Hacks
 	if(Den == 2)	return Num & 1;	// Speed Hacks
 	if(Den == 4)	return Num & 3;	// Speed Hacks
@@ -297,25 +411,10 @@ Uint64 __umoddi3(Uint64 Num, Uint64 Den)
 	if(Num >> 32 == 0 && Den >> 32 == 0)
 		return (Uint32)Num % (Uint32)Den;
 	
-	return Num - __udivdi3(Num, Den) * Den;
+	__divmod64(Num, Den, &ret);
+	return ret;
 }
 
-Uint16 LittleEndian16(Uint16 Val)
-{
-	return Val;
-}
-Uint16 BigEndian16(Uint16 Val)
-{
-	return ((Val&0xFF)<<8) | ((Val>>8)&0xFF);
-}
-Uint32 LittleEndian32(Uint32 Val)
-{
-	return Val;
-}
-Uint32 BigEndian32(Uint32 Val)
-{
-	return ((Val&0xFF)<<24) | ((Val&0xFF00)<<8) | ((Val>>8)&0xFF00) | ((Val>>24)&0xFF);
-}
 
 // --- EXPORTS ---
 EXPORT(memcpy);	EXPORT(memset);
@@ -326,9 +425,6 @@ EXPORT(inb);	EXPORT(inw);	EXPORT(ind);
 EXPORT(outb);	EXPORT(outw);	EXPORT(outd);
 EXPORT(__udivdi3);	EXPORT(__umoddi3);
 
-EXPORT(LittleEndian16);	EXPORT(BigEndian16);
-EXPORT(LittleEndian32);	EXPORT(BigEndian32);
-
 EXPORT(SHORTLOCK);
 EXPORT(SHORTREL);
 EXPORT(IS_LOCKED);