From d3a46a7874a4d535d6cb9ef00c451d0bbbb65e9c Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sun, 27 Sep 2009 14:06:02 +0800 Subject: [PATCH] Changed user stack to be at 8M --- Kernel/arch/x86/include/arch.h | 2 +- Kernel/lib.c | 15 +++------------ Kernel/threads.c | 6 +++--- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h index dd459c29..6a7ab45e 100644 --- a/Kernel/arch/x86/include/arch.h +++ b/Kernel/arch/x86/include/arch.h @@ -9,7 +9,7 @@ // - Memory Layout #define MM_USER_MIN 0x00200000 #define USER_STACK_SZ 0x00010000 -#define USER_STACK_TOP 0x00200000 +#define USER_STACK_TOP 0x00800000 #define MM_USER_MAX 0xBC000000 #define MM_PPD_MIN 0xBC000000 // Per-Process Data #define MM_PPD_VFS 0xBC000000 // diff --git a/Kernel/lib.c b/Kernel/lib.c index 88dc90c4..c1063516 100644 --- a/Kernel/lib.c +++ b/Kernel/lib.c @@ -319,21 +319,12 @@ Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year) */ Uint rand() { - #if 0 - Uint ret = giRandomState; - int roll = randomState & 31; - randomState = (randomState << roll) | (randomState >> (32-roll)); - randomState ^= 0x9A3C5E78; - return ret; - #else Uint old = giRandomState; + // Get the next state value giRandomState = (RANDOM_A*giRandomState + RANDOM_C) & 0xFFFFFFFF; - if(giRandomState == old) { - giRandomState += RANDOM_SPRUCE; - } - Log("giRandomState = 0x%x", giRandomState); + // Check if it has changed, and if it hasn't, change it + if(giRandomState == old) giRandomState += RANDOM_SPRUCE; return giRandomState; - #endif } EXPORT(timestamp); diff --git a/Kernel/threads.c b/Kernel/threads.c index 708c2ba0..3e98e448 100644 --- a/Kernel/threads.c +++ b/Kernel/threads.c @@ -552,12 +552,12 @@ tThread *Threads_GetNextToRun(int CPU) return gActiveThreads; } - Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i", - giNumActiveThreads, giTotalTickets); + //Log(" Threads_GetNextToRun: giNumActiveThreads=%i,giTotalTickets=%i", + // giNumActiveThreads, giTotalTickets); // Get the ticket number ticket = number = rand() % giTotalTickets; - Log(" Threads_GetNextToRun: ticket = %i", ticket); + //Log(" Threads_GetNextToRun: ticket = %i", ticket); // Find the next thread for(thread=gActiveThreads;thread;thread=thread->Next) -- 2.20.1