git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
proc.c
diff --git
a/Kernel/arch/x86/proc.c
b/Kernel/arch/x86/proc.c
index
2413a6e
..
76e96c9
100644
(file)
--- a/
Kernel/arch/x86/proc.c
+++ b/
Kernel/arch/x86/proc.c
@@
-10,6
+10,9
@@
# include <mp.h>
#endif
# include <mp.h>
#endif
+// === FLAGS ===
+#define DEBUG_TRACE_SWITCH 0
+
// === CONSTANTS ===
#define SWITCH_MAGIC 0xFFFACE55 // There is no code in this area
#define TIMER_DIVISOR 11931 //~100Hz
// === CONSTANTS ===
#define SWITCH_MAGIC 0xFFFACE55 // There is no code in this area
#define TIMER_DIVISOR 11931 //~100Hz
@@
-29,6
+32,7
@@
extern tThread *gActiveThreads;
extern tThread *gSleepingThreads;
extern tThread *gDeleteThreads;
extern tThread *Threads_GetNextToRun(int CPU);
extern tThread *gSleepingThreads;
extern tThread *gDeleteThreads;
extern tThread *Threads_GetNextToRun(int CPU);
+extern void Threads_Dump();
// === PROTOTYPES ===
void ArchThreads_Init();
// === PROTOTYPES ===
void ArchThreads_Init();
@@
-131,6
+135,14
@@
void ArchThreads_Init()
gCurrentThread = &gThreadZero;
#endif
gCurrentThread = &gThreadZero;
#endif
+ #if USE_PAE
+ gThreadZero.MemState.PDP[0] = 0;
+ gThreadZero.MemState.PDP[1] = 0;
+ gThreadZero.MemState.PDP[2] = 0;
+ #else
+ gThreadZero.MemState.CR3 = (Uint)gaInitPageDir - KERNEL_BASE;
+ #endif
+
// Set timer frequency
outb(0x43, 0x34); // Set Channel 0, Low/High, Rate Generator
outb(0x40, TIMER_DIVISOR&0xFF); // Low Byte of Divisor
// Set timer frequency
outb(0x43, 0x34); // Set Channel 0, Low/High, Rate Generator
outb(0x40, TIMER_DIVISOR&0xFF); // Low Byte of Divisor
@@
-297,12
+309,9
@@
int Proc_Clone(Uint *Err, Uint Flags)
newThread->SavedState.EIP = eip;
// Lock list and add to active
newThread->SavedState.EIP = eip;
// Lock list and add to active
- LOCK( &giThreadListLock );
- newThread->Next = gActiveThreads;
- gActiveThreads = newThread;
- giNumActiveThreads ++;
- giTotalTickets += newThread->NumTickets;
- RELEASE( &giThreadListLock );
+ Threads_AddActive(newThread);
+
+ Threads_Dump();
return newThread->TID;
}
return newThread->TID;
}
@@
-456,7
+465,7
@@
void Proc_Scheduler(int CPU)
// Check if there is any tasks running
if(giNumActiveThreads == 0) {
// Check if there is any tasks running
if(giNumActiveThreads == 0) {
- Log("No Active threads, sleeping
\n
");
+ Log("No Active threads, sleeping");
__asm__ __volatile__ ("hlt");
return;
}
__asm__ __volatile__ ("hlt");
return;
}
@@
-486,6
+495,14
@@
void Proc_Scheduler(int CPU)
return;
}
return;
}
+ #if DEBUG_TRACE_SWITCH
+ Log("Switching to task %i, CR3 = 0x%x, EIP = %p",
+ thread->TID,
+ thread->MemState.CR3,
+ thread->SavedState.EIP
+ );
+ #endif
+
// Set current thread
gCurrentThread = thread;
// Set current thread
gCurrentThread = thread;
UCC
git Repository :: git.ucc.asn.au