X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/1830630f2cc0aa3e1e44f7390614216395fdfe7a..0013b64e879f53d43df54b530d2c27525440cb9b:/lib/minilib.c diff --git a/lib/minilib.c b/lib/minilib.c index 677c77a..30412db 100644 --- a/lib/minilib.c +++ b/lib/minilib.c @@ -1,12 +1,66 @@ #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; - 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++); + 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--) + *(cdest++) = (unsigned char)data; } void memmove(void *dest, void *src, int bytes) @@ -21,8 +75,7 @@ void memmove(void *dest, void *src, int bytes) while (bytes--) *(--cdest) = *(--csrc); } else - while (bytes--) - *(cdest++) = *(csrc++); + memcpy(dest, src, bytes); } int memcmp (const char *a2, const char *a1, int bytes) { @@ -43,6 +96,16 @@ int strcmp (const char *a2, const char *a1) { } } +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; @@ -58,6 +121,15 @@ void strcpy(char *a2, const char *a1) } while (*(a1++)); } +void strcat(char *dest, char *src) +{ + while (*dest) + dest++; + while (*src) + *(dest++) = *(src++); + *(dest++) = *(src++); +} + void puts(const char *c) { putbytes(c, strlen(c)); @@ -86,3 +158,11 @@ 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); +}