#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
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 *Str);
- int DivUp(int num, int dem);
+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);
EXPORT(strncpy);
EXPORT(strcmp);
EXPORT(strncmp);
-EXPORT(strdup);
-EXPORT(DivUp);
+//EXPORT(strdup);
+EXPORT(_strdup); // Takes File/Line too
+EXPORT(str_split);
EXPORT(strpos8);
+EXPORT(DivUp);
EXPORT(ReadUTF8);
EXPORT(WriteUTF8);
EXPORT(timestamp);
EXPORT(ModUtil_LookupString);
EXPORT(ModUtil_SetIdent);
-// === GLOBALS ===
-static Uint giRandomState = RANDOM_SEED;
-
// === CODE ===
/**
* \brief Convert a string into an integer
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;
+ int bPadLeft = 0;
//Log("vsnprintf: (__s=%p, __maxlen=%i, __format='%s', ...)", __s, __maxlen, __format);
goto printString;
}
- // Get Argument
- val = va_arg(args, Uint);
- //Log("val = %x", val);
+ // - Padding Side Flag
+ if(c == '+') {
+ bPadLeft = 1;
+ c = *__format++;
+ }
// - Padding
if(c == '0') {
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')
c = *__format++;
}
}
+ else
+ minSize = 1;
// - Default, Long or LongLong?
isLongLong = 0;
{
c = *__format++;
if(c == 'l') {
- #if BITS == 32
- val |= (Uint64)va_arg(args, Uint) << 32;
- #endif
c = *__format++;
isLongLong = 1;
}
{
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':
+ 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:
- //Log("p = '%s'", p);
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;
// Single Character
case 'c':
default:
+ GETVAL();
PUTCH( (Uint8)val );
break;
}
return *Str1-*Str2;
}
+#if 0
/**
* \fn char *strdup(const char *Str)
* \brief Duplicates a string
{
char *ret;
ret = malloc(strlen(Str)+1);
+ if( !ret ) return NULL;
strcpy(ret, Str);
return ret;
}
+#endif
+
+/**
+ * \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;
+}
+
+/**
+ * \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)
) && 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;
*/
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 ) )
{
}
return 0;
}
-/// \}
+/* *
+ * \}
+ */
/**
* \brief Search a string array for \a Needle
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au