X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Flib.c;h=c499c7a8ed06be6f664f8b39663bc355c1b7fbaa;hb=4d04d710e6d90ac28524925859a7ef621c675bcb;hp=a3c4fa6bea2d86ef320c1422ec13c88a8832c668;hpb=a4ce2e60f783c9e71447edc03f20f937b8abf35a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index a3c4fa6b..c499c7a8 100644
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -49,32 +49,35 @@ Uint32 ind(Uint16 Port)
 }
 
 /**
- * \fn void *memset(void *Dest, int Val, Uint Num)
+ * \fn void *memset(void *Dest, int Val, size_t Num)
  * \brief Do a byte granuality set of Dest
  */
-void *memset(void *Dest, int Val, Uint Num)
+void *memset(void *Dest, int Val, size_t Num)
 {
+	Uint32	val = Val&0xFF;
+	val |= val << 8;
+	val |= val << 16;
 	__asm__ __volatile__ (
 		"rep stosl;\n\t"
 		"mov %3, %%ecx;\n\t"
 		"rep stosb"
-		:: "D" (Dest), "a" (Val), "c" (Num/4), "r" (Num&3));
+		:: "D" (Dest), "a" (val), "c" (Num/4), "r" (Num&3));
 	return Dest;
 }
 /**
- * \fn void *memsetd(void *Dest, Uint Val, Uint Num)
+ * \brief Set double words
  */
-void *memsetd(void *Dest, Uint Val, Uint Num)
+void *memsetd(void *Dest, Uint32 Val, size_t Num)
 {
 	__asm__ __volatile__ ("rep stosl" :: "D" (Dest), "a" (Val), "c" (Num));
 	return Dest;
 }
 
 /**
- * \fn int memcmp(const void *m1, const void *m2, Uint Num)
+ * \fn int memcmp(const void *m1, const void *m2, size_t Num)
  * \brief Compare two pieces of memory
  */
-int memcmp(const void *m1, const void *m2, Uint Num)
+int memcmp(const void *m1, const void *m2, size_t Num)
 {
 	while(Num--)
 	{
@@ -86,12 +89,12 @@ int memcmp(const void *m1, const void *m2, Uint Num)
 }
 
 /**
- * \fn void *memcpy(void *Dest, const void *Src, Uint Num)
+ * \fn void *memcpy(void *Dest, const void *Src, size_t Num)
  * \brief Copy \a Num bytes from \a Src to \a Dest
  */
-void *memcpy(void *Dest, const void *Src, Uint Num)
+void *memcpy(void *Dest, const void *Src, size_t Num)
 {
-	if((Uint)Dest & 3 || (Uint)Src & 3)
+	if( ((Uint)Dest & 3) || ((Uint)Src & 3) )
 		__asm__ __volatile__ ("rep movsb" :: "D" (Dest), "S" (Src), "c" (Num));
 	else {
 		__asm__ __volatile__ (
@@ -103,10 +106,10 @@ void *memcpy(void *Dest, const void *Src, Uint Num)
 	return Dest;
 }
 /**
- * \fn void *memcpyd(void *Dest, const void *Src, Uint Num)
+ * \fn void *memcpyd(void *Dest, const void *Src, size_t Num)
  * \brief Copy \a Num DWORDs from \a Src to \a Dest
  */
-void *memcpyd(void *Dest, const void *Src, Uint Num)
+void *memcpyd(void *Dest, const void *Src, size_t Num)
 {
 	__asm__ __volatile__ ("rep movsl" :: "D" (Dest), "S" (Src), "c" (Num));
 	return Dest;
@@ -118,10 +121,15 @@ void *memcpyd(void *Dest, const void *Src, Uint Num)
  */
 Uint64 __udivdi3(Uint64 Num, Uint64 Den)
 {
-	Uint64	ret = 0;
+	Uint64	P[2];
+	Uint64	q = 0;
+	 int	i;
 	
-	if(Den == 0)	__asm__ __volatile__ ("int $0x0");	// Call Div by Zero Error
-	if(Den == 1)	return Num;	// Speed Hacks
+	if(Den == 0)	__asm__ __volatile__ ("int $0x0");
+	// Common speedups
+	if(Num <= 0xFFFFFFFF && Den <= 0xFFFFFFFF)
+		return (Uint32)Num / (Uint32)Den;
+	if(Den == 1)	return Num;
 	if(Den == 2)	return Num >> 1;	// Speed Hacks
 	if(Den == 4)	return Num >> 2;	// Speed Hacks
 	if(Den == 8)	return Num >> 3;	// Speed Hacks
@@ -130,19 +138,33 @@ Uint64 __udivdi3(Uint64 Num, Uint64 Den)
 	if(Den == 1024)	return Num >> 10;	// Speed Hacks
 	if(Den == 2048)	return Num >> 11;	// Speed Hacks
 	if(Den == 4096)	return Num >> 12;
+	if(Num < Den)	return 0;
+	if(Num < Den*2)	return 1;
+	if(Num == Den*2)	return 2;
 	
-	if(Num >> 32 == 0 && Den >> 32 == 0)
-		return (Uint32)Num / (Uint32)Den;
-	
-	//Log("__udivdi3: (Num={0x%x:%x}, Den={0x%x:%x})",
-	//	Num>>32, Num&0xFFFFFFFF,
-	//	Den>>32, Den&0xFFFFFFFF);
-	
-	while(Num > Den) {
-		ret ++;
-		Num -= Den;
+	// 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 ret;
+	
+	return q;
 }
 
 /**
@@ -165,9 +187,7 @@ Uint64 __umoddi3(Uint64 Num, Uint64 Den)
 	if(Num >> 32 == 0 && Den >> 32 == 0)
 		return (Uint32)Num % (Uint32)Den;
 	
-	while(Num > Den)
-		Num -= Den;
-	return Num;
+	return Num - __udivdi3(Num, Den) * Den;
 }
 
 Uint16 LittleEndian16(Uint16 Val)