X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/31be35cda26f033fe62db673a8a973f0b15c9de7..0013b64e879f53d43df54b530d2c27525440cb9b:/lib/minilib.c?ds=sidebyside

diff --git a/lib/minilib.c b/lib/minilib.c
index f64f3b1..30412db 100644
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -1,26 +1,84 @@
 #include "console.h"
+#include <minilib.h>
+#include <output.h>
 
-void memcpy(unsigned char *a2, unsigned char *a1, int bytes)
+/* We have both _memcpy and memcpy, because gcc might be able to do better in lwip.
+ * For small things, gcc inlines its memcpy, but for large things, we call out
+ * to this memcpy.
+ */
+void _memcpy(void *dest, const void *src, int bytes)
 {
+	/* I hate everyone */
+	/* Since we otherwise compile with -O0, we might as well manually speed this up a bit. */
+	
+	char *cdest = dest;
+	const char *csrc = src;
+	int *idest;
+	const int *isrc;
+	int nwords;
+	
+	/* Align to src (picked arbitrarily; might as well align to something) */
+	while (bytes && ((unsigned int)csrc & 3))
+	{
+		*(cdest++) = *(csrc++);
+		bytes--;
+	}
+	
+	idest = (int *)cdest;
+	isrc = (const int *)csrc;
+	
+	nwords = bytes / 4;
+	bytes -= bytes & ~3;
+	if (nwords != 0)
+		switch(nwords % 8)	/* They see me Duff'sin'.  They hatin'. */
+			do {
+		case  0:	nwords--; *(idest++) = *(isrc++);
+		case  7:	nwords--; *(idest++) = *(isrc++);
+		case  6:	nwords--; *(idest++) = *(isrc++);
+		case  5:	nwords--; *(idest++) = *(isrc++);
+		case  4:	nwords--; *(idest++) = *(isrc++);
+		case  3:	nwords--; *(idest++) = *(isrc++);
+		case  2:	nwords--; *(idest++) = *(isrc++);
+		case  1:	nwords--; *(idest++) = *(isrc++);
+			} while (nwords);
+	
+	cdest = (char *)idest;
+	csrc = (const char *)isrc;
+	while (bytes)	/* Clean up the remainder */
+	{
+		*(cdest++) = *(csrc++);
+		bytes--;
+	}
+}
+
+void memcpy(void *dest, const void *src, int bytes)
+{
+	_memcpy(dest, src, bytes);
+}
+
+void memset(void *dest, int data, int bytes)
+{
+	unsigned char *cdest = dest;
 	while (bytes--)
-		*(a2++) = *(a1++);
+		*(cdest++) = (unsigned char)data;
 }
 
-void memmove(unsigned char *dest, unsigned char *src, int bytes)
+void memmove(void *dest, void *src, int bytes)
 {
-	if ((dest > src) && (dest <= (src + bytes)))
+	char * cdest = dest;
+	char * csrc = src;
+	if ((cdest > csrc) && (cdest <= (csrc + bytes)))
 	{
 		/* do it backwards! */
-		dest += bytes;
-		src += bytes;
+		cdest += bytes;
+		csrc += bytes;
 		while (bytes--)
-			*(--dest) = *(--src);
+			*(--cdest) = *(--csrc);
 	} else
-		while (bytes--)
-			*(dest++) = *(src++);
+		memcpy(dest, src, bytes);
 }
 
-int memcmp (unsigned char *a2, unsigned char *a1, int bytes) {
+int memcmp (const char *a2, const char *a1, int bytes) {
 	while (bytes--)
 	{
 		if (*(a2++) != *(a1++))
@@ -29,7 +87,7 @@ int memcmp (unsigned char *a2, unsigned char *a1, int bytes) {
 	return 0;
 }
 
-int strcmp (unsigned char *a2, unsigned char *a1) {
+int strcmp (const char *a2, const char *a1) {
 	while (1) {
 		if (*a2 != *a1) return 1;
 		if (*a2 == 0) return 0;
@@ -38,7 +96,17 @@ int strcmp (unsigned char *a2, unsigned char *a1) {
 	}
 }
 
-int strlen(char *c)
+int strncmp (const char *a2, const char *a1, int n) {
+	while (n--) {
+		if (*a2 != *a1) return 1;
+		if (*a2 == 0) return 0;
+		a1++;
+		a2++;
+	}
+	return 0;
+}
+
+int strlen(const char *c)
 {
 	int l = 0;
 	while (*(c++))
@@ -46,20 +114,29 @@ int strlen(char *c)
 	return l;
 }
 
-void strcpy(unsigned char *a2, unsigned char *a1)
+void strcpy(char *a2, const char *a1)
 {
 	do {
 		*(a2++) = *a1;
 	} while (*(a1++));
 }
 
-void puts(char *c)
+void strcat(char *dest, char *src)
+{
+	while (*dest)
+		dest++;
+	while (*src)
+		*(dest++) = *(src++);
+	*(dest++) = *(src++);
+}
+
+void puts(const char *c)
 {
 	putbytes(c, strlen(c));
 }
 
 static char hexarr[] = "0123456789ABCDEF";
-void tohex(unsigned char *s, unsigned long l)
+void tohex(char *s, unsigned long l)
 {
 	int i;
 	for (i = 0; i < 8; i++)
@@ -71,10 +148,21 @@ void tohex(unsigned char *s, unsigned long l)
 
 void puthex(unsigned long l)
 {
-	unsigned char d[9];
+	char d[9];
 	d[8] = 0;
 	tohex(d, l);
 	puts(d);
 }
 
+unsigned short htons(unsigned short in)
+{
+	return (in >> 8) | (in << 8);
+}
 
+unsigned int htonl(unsigned int in)
+{
+	return ((in & 0xff) << 24) |
+	       ((in & 0xff00) << 8) |
+	       ((in & 0xff0000UL) >> 8) |
+	       ((in & 0xff000000UL) >> 24);
+}