X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Flib.c;h=969332b09e810a2f919c42b12788d108dc4eb6ee;hb=54bf151b1a05b74debdb5f3baec02c18406b74d1;hp=9287d9c3d7f811c194627e16fd771628c499e278;hpb=41769c02317835472d7678d3531ecfc23df8e17a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index 9287d9c3..969332b0 100644
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -3,10 +3,29 @@
  * lib.c
  */
 #include <acess.h>
-#include <threads.h>
+#include <threads_int.h>
 
+#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;
+#endif
 extern int	GetCPUNum(void);
 
+// === PROTOTYPES ==
+Uint64	__udivdi3(Uint64 Num, Uint64 Den);
+Uint64	__umoddi3(Uint64 Num, Uint64 Den);
+
+// === GLOBALS ===
+ int	gbDebug_SerialSetup = 0;
+ int	gbGDB_SerialSetup = 0;
+
 // === CODE ===
 /**
  * \brief Determine if a short spinlock is locked
@@ -58,8 +77,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 +112,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 +144,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) {
@@ -126,6 +166,69 @@ void SHORTREL(struct sShortSpinlock *Lock)
 	#endif
 }
 
+// === 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
+		gbDebug_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
+		gbDebug_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 ===
 void outb(Uint16 Port, Uint8 Data)
 {
@@ -189,15 +292,18 @@ 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
+	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;
 }
 
 /**
@@ -254,6 +360,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 +396,7 @@ Uint64 __udivdi3(Uint64 Num, Uint64 Den)
 			P[1] += Den;
 		}
 	}
+	#endif
 	
 	return q;
 }