Commit GDB patch from Jacob Potter.

[netwatch.git] / lib / minilib.c

diff --git a/lib/minilib.c b/lib/minilib.c
index 664a0b42a7abe24229793a7490fd5b5cc934a923..935d0c40bc5fb25f62dd5d30bac40e09ec1d6b24 100644 (file)
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -1,12 +1,70 @@
+/* minilib.c
+ * General-purpose C library routines.
+ * NetWatch system management mode administration console
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree.
+ *
+ */
+

 #include "console.h"
 #include <minilib.h>
 #include "console.h"
 #include <minilib.h>

+#include <output.h>

 
 

-void memcpy(void *dest, const void *src, 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;
        char *cdest = dest;
        const char *csrc = src;

-       while (bytes--)
+       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++);
                *(cdest++) = *(csrc++);

+               bytes--;
+       }
+}
+
+void memcpy(void *dest, const void *src, int bytes)
+{
+       _memcpy(dest, src, bytes);

 }
 
 void memset(void *dest, int data, int bytes)
 }
 
 void memset(void *dest, int data, int bytes)


@@ -16,6 +74,17 @@ void memset(void *dest, int data, int bytes)
                *(cdest++) = (unsigned char)data;
 }
 
                *(cdest++) = (unsigned char)data;
 }
 

+void *memchr(const void *buf, char c, int maxlen)
+{
+       const char * cbuf = buf;
+       while (maxlen--)
+       {
+               if (*cbuf == c) return (void *)cbuf;
+               cbuf++;
+       }
+       return 0;
+}
+

 void memmove(void *dest, void *src, int bytes)
 {
        char * cdest = dest;
 void memmove(void *dest, void *src, int bytes)
 {
        char * cdest = dest;


@@ -28,8 +97,7 @@ void memmove(void *dest, void *src, int bytes)
                while (bytes--)
                        *(--cdest) = *(--csrc);
        } else
                while (bytes--)
                        *(--cdest) = *(--csrc);
        } else

-               while (bytes--)
-                       *(cdest++) = *(csrc++);
+               memcpy(dest, src, bytes);

 }
 
 int memcmp (const char *a2, const char *a1, int bytes) {
 }
 
 int memcmp (const char *a2, const char *a1, int bytes) {


@@ -100,6 +168,12 @@ void tohex(char *s, unsigned long l)
        }
 }
 
        }
 }
 

+void btohex(char *s, unsigned char c)
+{
+       s[0] = hexarr[c >> 4];
+       s[1] = hexarr[c & 0xF];
+}
+

 void puthex(unsigned long l)
 {
        char d[9];
 void puthex(unsigned long l)
 {
        char d[9];