Replace rand() implementation - fixes threading lockups

[tpg/acess2.git] / Kernel / lib.c

diff --git a/Kernel/lib.c b/Kernel/lib.c
index 116dce6..2ce5c98 100644 (file)
--- 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
@@ -66,9 +66,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 +177,9 @@ 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)
+/**
+ * \brief VArg String Number Print Formatted
+ */
 int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
 {
        char    c, pad = ' ';
@@ -232,7 +232,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                        pad = ' ';
                
                // - Minimum length
-               if(c == '*') {
+               if(c == '*') {  // Dynamic length
                        minSize = val;
                        val = va_arg(args, Uint);
                        c = *__format++;
@@ -270,10 +270,14 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                {
                case 'd':
                case 'i':
-                       if( (isLongLong && val >> 63) || (!isLongLong && val >> 31) ) {
+                       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':
@@ -296,7 +300,7 @@ int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args)
                
                // String - Null Terminated Array
                case 's':
-                       p = (char*)(Uint)val;
+                       p = (char*)(tVAddr)val;
                printString:
                        if(!p)          p = "(null)";
                        len = strlen(p);
@@ -306,9 +310,8 @@ 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 = (char*)(tVAddr)val;
                        if(!p)  goto printString;
-                       //while(minSize--)      PUTCH(*p++);
                        while(minSize--)        PUTCH(*p++);
                        break;
                
@@ -659,7 +662,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;
        
@@ -673,21 +676,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 ) )
        {
@@ -745,7 +768,9 @@ int CheckMem(void *Mem, int NumBytes)
        }
        return 0;
 }
-/// \}
+/* *
+ * \}
+ */
 
 /**
  * \brief Search a string array for \a Needle