X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Flib.c;h=66c966036fa692954f97a76313f54df1b3670ae3;hb=41769c02317835472d7678d3531ecfc23df8e17a;hp=ab64d675941a83649a4c4041c4b3626b23c47774;hpb=85eb17b306404571aa39596946c87ad9bb1d9d13;p=tpg%2Facess2.git

diff --git a/Kernel/lib.c b/Kernel/lib.c
index ab64d675..66c96603 100644
--- a/Kernel/lib.c
+++ b/Kernel/lib.c
@@ -8,7 +8,7 @@
 #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
@@ -27,7 +27,7 @@ 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 *Str);
+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);
@@ -54,7 +54,8 @@ EXPORT(strcpy);
 EXPORT(strncpy);
 EXPORT(strcmp);
 EXPORT(strncmp);
-EXPORT(strdup);
+//EXPORT(strdup);
+EXPORT(_strdup);	// Takes File/Line too
 EXPORT(str_split);
 EXPORT(strpos8);
 EXPORT(DivUp);
@@ -66,9 +67,6 @@ EXPORT(CheckMem);
 EXPORT(ModUtil_LookupString);
 EXPORT(ModUtil_SetIdent);
 
-// === GLOBALS ===
-static Uint	giRandomState = RANDOM_SEED;
-
 // === CODE ===
 /**
  * \brief Convert a string into an integer
@@ -180,6 +178,13 @@ void itoa(char *buf, Uint num, int base, int minLength, char pad)
 	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 = ' ';
@@ -214,9 +219,6 @@ 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;
@@ -232,9 +234,8 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			pad = ' ';
 		
 		// - Minimum length
-		if(c == '*') {
-			minSize = val;
-			val = va_arg(args, Uint);
+		if(c == '*') {	// Dynamic length
+			minSize = va_arg(args, unsigned int);
 			c = *__format++;
 		}
 		else if('1' <= c && c <= '9')
@@ -256,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;
 			}
@@ -270,33 +268,51 @@ 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);
@@ -306,15 +322,15 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 			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++);
 			while(minSize--)	PUTCH(*p++);
 			break;
 		
 		// Single Character
 		case 'c':
 		default:
+			GETVAL();
 			PUTCH( (Uint8)val );
 			break;
 		}
@@ -448,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
@@ -456,9 +473,25 @@ 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
@@ -489,7 +522,6 @@ char **str_split(const char *__str, char __ch)
 	{
 		if(__str[i] == __ch) {
 			*start++ = '\0';
-			Log_Debug("Lib", "str_split: ret[%i] = '%s'", j-1, ret[j-1]);
 			ret[j++] = start;
 		}
 		else {
@@ -498,10 +530,6 @@ char **str_split(const char *__str, char __ch)
 	}
 	*start = '\0';
 	ret[j] = NULL;
-	Log_Debug("Lib", "str_split: ret[%i] = '%s'", j-1, ret[j-1]);
-	
-	for( j = 0; j < len; j++ )
-		Log_Debug("Lib", "str_split: ret[%i] = '%s'", j, ret[j]);
 	
 	return ret;
 }
@@ -664,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;
 	
@@ -678,21 +706,41 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year)
  */
 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 ) )
 	{
@@ -750,7 +798,9 @@ int CheckMem(void *Mem, int NumBytes)
 	}
 	return 0;
 }
-/// \}
+/* *
+ * \}
+ */
 
 /**
  * \brief Search a string array for \a Needle