X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Flib.c;h=7fa666fa41a2920bdc890ad20813f5c60dbd2bc1;hb=24c1359ec88d5c00e1e8376b46856519f706a440;hp=6b9ee1e6149f8cf6620e4718c2a68462259847aa;hpb=b37a72724f8584364a3b0f3c57882e803155e499;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/lib.c b/Kernel/arch/x86/lib.c
index 6b9ee1e6..7fa666fa 100644
--- a/Kernel/arch/x86/lib.c
+++ b/Kernel/arch/x86/lib.c
@@ -2,7 +2,7 @@
  * AcessOS Microkernel Version
  * lib.c
  */
-#include <common.h>
+#include <acess.h>
 
 // === CODE ===
 void Spinlock(int *lock)
@@ -49,10 +49,10 @@ 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)
 {
 	__asm__ __volatile__ (
 		"rep stosl;\n\t"
@@ -62,19 +62,34 @@ void *memset(void *Dest, int Val, Uint Num)
 	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, size_t Num)
+ * \brief Compare two pieces of memory
+ */
+int memcmp(const void *m1, const void *m2, size_t Num)
+{
+	while(Num--)
+	{
+		if(*(Uint8*)m1 != *(Uint8*)m2)	break;
+		m1 ++;
+		m2 ++;
+	}
+	return *(Uint8*)m1 - *(Uint8*)m2;
+}
 
 /**
- * \fn void *memcpy(void *Dest, 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, void *Src, Uint 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));
@@ -88,9 +103,10 @@ void *memcpy(void *Dest, void *Src, Uint Num)
 	return Dest;
 }
 /**
- * \fn void *memcpyd(void *Dest, 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, 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;
@@ -154,10 +170,31 @@ Uint64 __umoddi3(Uint64 Num, Uint64 Den)
 	return Num;
 }
 
+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);
+EXPORT(memcmp);
 //EXPORT(memcpyw);	EXPORT(memsetw);
 EXPORT(memcpyd);	EXPORT(memsetd);
 EXPORT(inb);	EXPORT(inw);	EXPORT(ind);
 EXPORT(outb);	EXPORT(outw);	EXPORT(outd);
 EXPORT(__udivdi3);	EXPORT(__umoddi3);
+
+EXPORT(LittleEndian16);	EXPORT(BigEndian16);
+EXPORT(LittleEndian32);	EXPORT(BigEndian32);