X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_string.c;h=c286a6dc6c734cdc6784d62c8c5bb92e471868b9;hb=1cd2958b5eb63b2ac63ced17447ba3b45c43f51a;hp=e98efd2bc0df116e11622f40a9e6913a5962afec;hpb=d38e1d6edeee83bfb1e3e3c6e2367faa5055bdfe;p=palacios.git diff --git a/palacios/src/palacios/vmm_string.c b/palacios/src/palacios/vmm_string.c index e98efd2..c286a6d 100644 --- a/palacios/src/palacios/vmm_string.c +++ b/palacios/src/palacios/vmm_string.c @@ -36,48 +36,17 @@ */ - -#define NEED_MEMSET 0 -#define NEED_MEMCPY 0 -#define NEED_MEMCMP 0 -#define NEED_STRLEN 0 -#define NEED_STRNLEN 0 -#define NEED_STRCMP 0 -#define NEED_STRNCMP 0 -#define NEED_STRCAT 0 -#define NEED_STRNCAT 0 -#define NEED_STRCPY 0 -#define NEED_STRNCPY 0 -#define NEED_STRDUP 0 -#define NEED_ATOI 0 -#define NEED_STRCHR 0 -#define NEED_STRRCHR 0 -#define NEED_STRPBRK 0 - - - +#include #include #include - -static float e = 0.00000001; - -double ceil(double x) { - if ((double)(x - (int)x) == 0) { - return (int)x; - } - return (int)(x + e) + 1; -} - - -#if NEED_MEMSET -void* memset(void* s, int c, size_t n) -{ - unsigned char* p = (unsigned char*) s; +#ifdef CONFIG_BUILT_IN_MEMSET +void * memset(void * s, int c, size_t n) { + uchar_t * p = (uchar_t *) s; while (n > 0) { - *p++ = (unsigned char) c; + *p++ = (uchar_t) c; --n; } @@ -85,11 +54,10 @@ void* memset(void* s, int c, size_t n) } #endif -#if NEED_MEMCPY -void* memcpy(void *dst, const void* src, size_t n) -{ - unsigned char* d = (unsigned char*) dst; - const unsigned char* s = (const unsigned char*) src; +#ifdef CONFIG_BUILT_IN_MEMCPY +void * memcpy(void * dst, const void * src, size_t n) { + uchar_t * d = (uchar_t *) dst; + const uchar_t * s = (const uchar_t *)src; while (n > 0) { *d++ = *s++; @@ -101,15 +69,18 @@ void* memcpy(void *dst, const void* src, size_t n) #endif -#if NEED_CMP -int memcmp(const void *s1_, const void *s2_, size_t n) -{ - const signed char *s1 = s1_, *s2 = s2_; +#ifdef CONFIG_BUILT_IN_MEMCMP +int memcmp(const void * s1_, const void * s2_, size_t n) { + const char * s1 = s1_; + const char * s2 = s2_; while (n > 0) { - int cmp = *s1 - *s2; - if (cmp != 0) + int cmp = (*s1 - *s2); + + if (cmp != 0) { return cmp; + } + ++s1; ++s2; } @@ -119,19 +90,21 @@ int memcmp(const void *s1_, const void *s2_, size_t n) #endif -#if NEED_STRLEN -size_t strlen(const char* s) -{ +#ifdef CONFIG_BUILT_IN_STRLEN +size_t strlen(const char * s) { size_t len = 0; - while (*s++ != '\0') + + while (*s++ != '\0') { ++len; + } + return len; } #endif -#if NEED_STRNLEN +#ifdef CONFIG_BUILT_IN_STRNLEN /* * This it a GNU extension. * It is like strlen(), but it will check at most maxlen @@ -140,23 +113,27 @@ size_t strlen(const char* s) * This is very useful for checking the length of untrusted * strings (e.g., from user space). */ -size_t strnlen(const char *s, size_t maxlen) -{ +size_t strnlen(const char * s, size_t maxlen) { size_t len = 0; - while (len < maxlen && *s++ != '\0') + + while ((len < maxlen) && (*s++ != '\0')) { ++len; + } + return len; } #endif -#if NEED_STRCMP -int strcmp(const char* s1, const char* s2) -{ +#ifdef CONFIG_BUILT_IN_STRCMP +int strcmp(const char * s1, const char * s2) { while (1) { - int cmp = *s1 - *s2; - if (cmp != 0 || *s1 == '\0' || *s2 == '\0') + int cmp = (*s1 - *s2); + + if ((cmp != 0) || (*s1 == '\0') || (*s2 == '\0')) { return cmp; + } + ++s1; ++s2; } @@ -164,14 +141,17 @@ int strcmp(const char* s1, const char* s2) #endif -#if NEED_STRNCMP -int strncmp(const char* s1, const char* s2, size_t limit) -{ +#ifdef CONFIG_BUILT_IN_STRNCMP +int strncmp(const char * s1, const char * s2, size_t limit) { size_t i = 0; + while (i < limit) { - int cmp = *s1 - *s2; - if (cmp != 0 || *s1 == '\0' || *s2 == '\0') + int cmp = (*s1 - *s2); + + if ((cmp != 0) || (*s1 == '\0') || (*s2 == '\0')) { return cmp; + } + ++s1; ++s2; ++i; @@ -183,14 +163,13 @@ int strncmp(const char* s1, const char* s2, size_t limit) #endif -#if NEED_STRCAT -char *strcat(char *s1, const char *s2) -{ - char *t1; +#ifdef CONFIG_BUILT_IN_STRCAT +char * strcat(char * s1, const char * s2) { + char * t1 = s1; + + while (*s1) { s1++; } + while (*s2) { *s1++ = *s2++; } - t1 = s1; - while (*s1) s1++; - while(*s2) *s1++ = *s2++; *s1 = '\0'; return t1; @@ -198,16 +177,20 @@ char *strcat(char *s1, const char *s2) #endif -#if NEED_STRNCAT -char *strncat(char *s1, const char *s2, size_t limit) -{ +#ifdef CONFIG_BUILT_IN_STRNCAT +char * strncat(char * s1, const char * s2, size_t limit) { size_t i = 0; - char *t1; + char * t1; + t1 = s1; - while (*s1) s1++; + + while (*s1) { s1++; } + while (i < limit) { - if(*s2 == '\0') break; - *s1++ = *s2++; + if (*s2 == '\0') { + break; + } + *s1++ = *s2++; } *s1 = '\0'; return t1; @@ -216,8 +199,8 @@ char *strncat(char *s1, const char *s2, size_t limit) -#if NEED_STRCPY -char *strcpy(char *dest, const char *src) +#ifdef CONFIG_BUILT_IN_STRCPY +char * strcpy(char * dest, const char * src) { char *ret = dest; @@ -231,15 +214,15 @@ char *strcpy(char *dest, const char *src) #endif -#if NEED_STRNCPY -char *strncpy(char *dest, const char *src, size_t limit) -{ - char *ret = dest; +#ifdef CONFIG_BUILT_IN_STRNCPY +char * strncpy(char * dest, const char * src, size_t limit) { + char * ret = dest; - while (*src != '\0' && limit > 0) { + while ((*src != '\0') && (limit > 0)) { *dest++ = *src++; --limit; } + if (limit > 0) *dest = '\0'; @@ -249,9 +232,8 @@ char *strncpy(char *dest, const char *src, size_t limit) -#if NEED_STRDUP -char *strdup(const char *s1) -{ +#ifdef CONFIG_BUILT_IN_STRDUP +char * strdup(const char * s1) { char *ret; ret = V3_Malloc(strlen(s1) + 1); @@ -264,15 +246,14 @@ char *strdup(const char *s1) -#if NEED_ATOI -int atoi(const char *buf) -{ +#ifdef CONFIG_BUILT_IN_ATOI +int atoi(const char * buf) { int ret = 0; - while (*buf >= '0' && *buf <= '9') { - ret *= 10; - ret += *buf - '0'; - buf++; + while ((*buf >= '0') && (*buf <= '9')) { + ret *= 10; + ret += (*buf - '0'); + buf++; } return ret; @@ -280,12 +261,11 @@ int atoi(const char *buf) #endif -#if NEED_STRCHR -char *strchr(const char *s, int c) -{ +#ifdef CONFIG_BUILT_IN_STRCHR +char * strchr(const char * s, int c) { while (*s != '\0') { if (*s == c) - return (char *) s; + return (char *)s; ++s; } return 0; @@ -293,31 +273,32 @@ char *strchr(const char *s, int c) #endif -#if NEED_STRRCHR -char *strrchr(const char *s, int c) -{ +#ifdef CONFIG_BUILT_IN_STRRCHR +char * strrchr(const char * s, int c) { size_t len = strlen(s); - const char *p = s + len; + const char * p = s + len; while (p > s) { --p; - if (*p == c) - return (char*) p; + + if (*p == c) { + return (char *)p; + } } return 0; } #endif -#if NEED_STRPBRK -char *strpbrk(const char *s, const char *accept) -{ +#ifdef CONFIG_BUILT_IN_STRPBRK +char * strpbrk(const char * s, const char * accept) { size_t setLen = strlen(accept); while (*s != '\0') { size_t i; for (i = 0; i < setLen; ++i) { - if (*s == accept[i]) - return (char *) s; + if (*s == accept[i]) { + return (char *)s; + } } ++s; }