X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=66c966036fa692954f97a76313f54df1b3670ae3;hb=d5834686ad14b66420060192445f06bce85db389;hp=967c03ac2d9ee9aa0a090e87a30d64eb5b187d34;hpb=ff1aacd48c7b616508c1d4e7a7ba03f741ee2cda;p=tpg%2Facess2.git diff --git a/Kernel/lib.c b/Kernel/lib.c index 967c03ac..66c96603 100644 --- a/Kernel/lib.c +++ b/Kernel/lib.c @@ -8,16 +8,64 @@ #define RANDOM_SEED 0xACE55052 #define RANDOM_A 0x00731ADE #define RANDOM_C 12345 -#define RANDOM_SPRUCE 0xf12b02b +#define RANDOM_SPRUCE 0xf12b039 // Jan Feb Mar Apr May Jun Jul Aug Sept Oct Nov Dec const short DAYS_BEFORE[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; #define UNIX_TO_2K ((30*365*3600*24) + (7*3600*24)) //Normal years + leap years // === PROTOTYPES === + int atoi(const char *string); +void itoa(char *buf, Uint num, int base, int minLength, char pad); + int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args); + int sprintf(char *__s, const char *__format, ...); + int tolower(int c); + int strucmp(const char *Str1, const char *Str2); + int strpos(const char *Str, char Ch); + Uint8 ByteSum(void *Ptr, int Size); +size_t strlen(const char *__s); +char *strcpy(char *__str1, const char *__str2); +char *strncpy(char *__str1, const char *__str2, size_t max); + int strcmp(const char *str1, const char *str2); + int strncmp(const char *str1, const char *str2, size_t num); +char *_strdup(const char *File, int Line, const char *Str); +char **str_split(const char *__str, char __ch); + int strpos8(const char *str, Uint32 Search); int ReadUTF8(Uint8 *str, Uint32 *Val); + int WriteUTF8(Uint8 *str, Uint32 Val); + int DivUp(int num, int dem); +Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year); +Uint rand(void); + int CheckString(char *String); + int CheckMem(void *Mem, int NumBytes); + int ModUtil_LookupString(char **Array, char *Needle); + int ModUtil_SetIdent(char *Dest, char *Value); -// === GLOBALS === -static Uint giRandomState = RANDOM_SEED; +// === EXPORTS === +EXPORT(atoi); +EXPORT(itoa); +EXPORT(vsnprintf); +EXPORT(sprintf); +EXPORT(tolower); +EXPORT(strucmp); +EXPORT(strpos); +EXPORT(ByteSum); +EXPORT(strlen); +EXPORT(strcpy); +EXPORT(strncpy); +EXPORT(strcmp); +EXPORT(strncmp); +//EXPORT(strdup); +EXPORT(_strdup); // Takes File/Line too +EXPORT(str_split); +EXPORT(strpos8); +EXPORT(DivUp); +EXPORT(ReadUTF8); +EXPORT(WriteUTF8); +EXPORT(timestamp); +EXPORT(CheckString); +EXPORT(CheckMem); +EXPORT(ModUtil_LookupString); +EXPORT(ModUtil_SetIdent); // === CODE === /** @@ -26,9 +74,16 @@ static Uint giRandomState = RANDOM_SEED; int atoi(const char *string) { int ret = 0; + int bNeg = 0; + + //Log("atoi: (string='%s')", string); // Clear non-numeric characters - while( !('0' <= *string && *string <= '9') ) string++; + while( !('0' <= *string && *string <= '9') && *string != '-' ) string++; + if( *string == '-' ) { + bNeg = 1; + while( !('0' <= *string && *string <= '9') ) string++; + } if(*string == '0') { @@ -37,32 +92,34 @@ int atoi(const char *string) { // Hex string ++; - for( ;; ) { - ret *= 16; - if('0' <= *string && *string <= '9') + for( ;; string ++ ) + { + if('0' <= *string && *string <= '9') { + ret *= 16; ret += *string - '0'; - else if('A' <= *string && *string <= 'F') + } + else if('A' <= *string && *string <= 'F') { + ret *= 16; ret += *string - 'A' + 10; - else if('a' <= *string && *string <= 'f') + } + else if('a' <= *string && *string <= 'f') { + ret *= 16; ret += *string - 'a' + 10; + } else break; - string ++; } } - else + else // Octal { - for( ;; ) + for( ; '0' <= *string && *string <= '7'; string ++ ) { ret *= 8; - if('0' <= *string && *string <= '7') - ret += *string - '0'; - else - break; + ret += *string - '0'; } } } - else + else // Decimal { for( ; '0' <= *string && *string <= '9'; string++) { @@ -70,6 +127,11 @@ int atoi(const char *string) ret += *string - '0'; } } + + if(bNeg) ret = -ret; + + //Log("atoi: RETURN %i", ret); + return ret; } @@ -108,16 +170,34 @@ void itoa(char *buf, Uint num, int base, int minLength, char pad) buf[i] = 0; } -#define PUTCH(c) do{if(pos==__maxlen)break;if(__s){__s[pos++]=(c);}else{pos++;}}while(0) +/** + * \brief Append a character the the vsnprintf output + */ +#define PUTCH(c) do{\ + char ch=(c);\ + if(pos==__maxlen){return pos;}\ + if(__s){__s[pos++]=ch;}else{pos++;}\ + }while(0) +#define GETVAL() do {\ + if(isLongLong) val = va_arg(args, Uint64);\ + else val = va_arg(args, unsigned int);\ + }while(0) +/** + * \brief VArg String Number Print Formatted + */ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) { char c, pad = ' '; - int minSize = 0; + int minSize = 0, len; char tmpBuf[34]; // For Integers char *p = NULL; int isLongLong = 0; Uint64 val; size_t pos = 0; + // Flags + int bPadLeft = 0; + + //Log("vsnprintf: (__s=%p, __maxlen=%i, __format='%s', ...)", __s, __maxlen, __format); while((c = *__format++) != 0) { @@ -125,6 +205,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) if(c != '%') { PUTCH(c); continue; } c = *__format++; + //Log("pos = %i", pos); // Literal % if(c == '%') { PUTCH('%'); continue; } @@ -138,8 +219,11 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) goto printString; } - // Get Argument - val = va_arg(args, Uint); + // - Padding Side Flag + if(c == '+') { + bPadLeft = 1; + c = *__format++; + } // - Padding if(c == '0') { @@ -150,8 +234,11 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) pad = ' '; // - Minimum length - minSize = 1; - if('1' <= c && c <= '9') + if(c == '*') { // Dynamic length + minSize = va_arg(args, unsigned int); + c = *__format++; + } + else if('1' <= c && c <= '9') { minSize = 0; while('0' <= c && c <= '9') @@ -161,6 +248,8 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) c = *__format++; } } + else + minSize = 1; // - Default, Long or LongLong? isLongLong = 0; @@ -168,9 +257,6 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) { c = *__format++; if(c == 'l') { - #if BITS == 32 - val |= (Uint64)va_arg(args, Uint) << 32; - #endif c = *__format++; isLongLong = 1; } @@ -182,40 +268,61 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) { case 'd': case 'i': - if( (isLongLong && val >> 63) || (!isLongLong && val >> 31) ) { + GETVAL(); + if( isLongLong && val >> 63 ) { PUTCH('-'); val = -val; } + else if( !isLongLong && val >> 31 ) { + PUTCH('-'); + val = -(Sint32)val; + } itoa(p, val, 10, minSize, pad); goto printString; case 'u': + GETVAL(); itoa(p, val, 10, minSize, pad); goto printString; + case 'X': + #if BITS == 64 + isLongLong = 1; // TODO: Handle non-x86 64-bit archs + #endif + GETVAL(); + itoa(p, val, 16, minSize, pad); + goto printString; + case 'x': + GETVAL(); itoa(p, val, 16, minSize, pad); goto printString; case 'o': + GETVAL(); itoa(p, val, 8, minSize, pad); goto printString; case 'b': + GETVAL(); itoa(p, val, 2, minSize, pad); goto printString; case 'B': //Boolean + val = va_arg(args, unsigned int); if(val) p = "True"; else p = "False"; goto printString; // String - Null Terminated Array case 's': - p = (char*)(Uint)val; + p = va_arg(args, char*); // Get Argument printString: if(!p) p = "(null)"; + len = strlen(p); + if( !bPadLeft ) while(len++ < minSize) PUTCH(pad); while(*p) PUTCH(*p++); + if( bPadLeft ) while(len++ < minSize) PUTCH(pad); break; case 'C': // Non-Null Terminated Character Array - p = (char*)(Uint)val; + p = va_arg(args, char*); if(!p) goto printString; while(minSize--) PUTCH(*p++); break; @@ -223,6 +330,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) // Single Character case 'c': default: + GETVAL(); PUTCH( (Uint8)val ); break; } @@ -230,7 +338,6 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args) if(__s && pos != __maxlen) __s[pos] = '\0'; - return pos; } @@ -262,7 +369,7 @@ int tolower(int c) } /** - * \fn int strucmp(char *Str1, char *Str2) + * \fn int strucmp(const char *Str1, const char *Str2) * \brief Compare \a Str1 and \a Str2 case-insensitively */ int strucmp(const char *Str1, const char *Str2) @@ -309,7 +416,7 @@ Uint strlen(const char *__str) } /** - * \fn char *strcpy(const char *__str1, const char *__str2) + * \fn char *strcpy(char *__str1, const char *__str2) * \brief Copy a string to a new location */ char *strcpy(char *__str1, const char *__str2) @@ -321,7 +428,7 @@ char *strcpy(char *__str1, const char *__str2) } /** - * \fn char *strcpy(const char *__str1, const char *__str2) + * \fn char *strncpy(char *__str1, const char *__str2, size_t max) * \brief Copy a string to a new location */ char *strncpy(char *__str1, const char *__str2, size_t max) @@ -357,6 +464,7 @@ int strncmp(const char *Str1, const char *Str2, size_t num) return *Str1-*Str2; } +#if 0 /** * \fn char *strdup(const char *Str) * \brief Duplicates a string @@ -365,9 +473,66 @@ char *strdup(const char *Str) { char *ret; ret = malloc(strlen(Str)+1); + if( !ret ) return NULL; strcpy(ret, Str); return ret; } +#else + +/** + * \fn char *_strdup(const char *File, int Line, const char *Str) + * \brief Duplicates a string + */ +char *_strdup(const char *File, int Line, const char *Str) +{ + char *ret; + ret = Heap_Allocate(File, Line, strlen(Str)+1); + if( !ret ) return NULL; + strcpy(ret, Str); + return ret; +} +#endif + +/** + * \brief Split a string using the passed character + * \return NULL terminated array of strings on the heap + * \param __str String to split + * \param __ch Character to split by + */ +char **str_split(const char *__str, char __ch) +{ + int i, j; + int len = 1; + char **ret; + char *start; + + for( i = 0; __str[i]; i++ ) + { + if(__str[i] == __ch) + len ++; + } + + ret = malloc( sizeof(char*)*(len+1) + (i + 1) ); + if( !ret ) return NULL; + + j = 1; + start = (char *)&ret[len+1]; + ret[0] = start; + for( i = 0; __str[i]; i++ ) + { + if(__str[i] == __ch) { + *start++ = '\0'; + ret[j++] = start; + } + else { + *start++ = __str[i]; + } + } + *start = '\0'; + ret[j] = NULL; + + return ret; +} /** * \fn int DivUp(int num, int dem) @@ -527,7 +692,7 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year) ) && month > 1) // Leap year and after feb stamp += 3600*24; - stamp += ((365*4+1) * ((year-2000)&~3)) * 3600*24; // Foour Year Segments + stamp += ((365*4+1) * ((year-2000)&~3)) * 3600*24; // Four Year Segments stamp += ((year-2000)&3) * 365*3600*24; // Inside four year segment stamp += UNIX_TO_2K; @@ -539,23 +704,43 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year) * \brief Pseudo random number generator * \note Unknown effectiveness (made up on the spot) */ -Uint rand() +Uint rand(void) { - Uint old = giRandomState; + #if 0 + static Uint state = RANDOM_SEED; + Uint old = state; // Get the next state value - giRandomState = (RANDOM_A*giRandomState + RANDOM_C) & 0xFFFFFFFF; + giRandomState = (RANDOM_A*state + RANDOM_C); // Check if it has changed, and if it hasn't, change it - if(giRandomState == old) giRandomState += RANDOM_SPRUCE; - return giRandomState; + if(state == old) state += RANDOM_SPRUCE; + return state; + #else + // http://en.wikipedia.org/wiki/Xorshift + // 2010-10-03 + static Uint32 x = 123456789; + static Uint32 y = 362436069; + static Uint32 z = 521288629; + static Uint32 w = 88675123; + Uint32 t; + + t = x ^ (x << 11); + x = y; y = z; z = w; + return w = w ^ (w >> 19) ^ t ^ (t >> 8); + #endif } -/// \name Memory Validation -/// \{ +/* * + * \name Memory Validation + * \{ + */ /** * \brief Checks if a string resides fully in valid memory */ int CheckString(char *String) { + if( !MM_GetPhysAddr( (tVAddr)String ) ) + return 0; + // Check 1st page if( MM_IsUser( (tVAddr)String ) ) { @@ -613,7 +798,9 @@ int CheckMem(void *Mem, int NumBytes) } return 0; } -/// \} +/* * + * \} + */ /** * \brief Search a string array for \a Needle @@ -636,17 +823,3 @@ int ModUtil_SetIdent(char *Dest, char *Value) strncpy(Dest, Value, 32); return 1; } - -EXPORT(strlen); -EXPORT(strdup); -EXPORT(strcmp); -EXPORT(strncmp); -EXPORT(strcpy); -EXPORT(strncpy); - -EXPORT(timestamp); -EXPORT(ReadUTF8); -EXPORT(CheckMem); -EXPORT(CheckString); -EXPORT(ModUtil_LookupString); -EXPORT(ModUtil_SetIdent);