X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Fthreads.h;h=f23c5b5656540b53d2976ec40a29b442d9022aa4;hb=a79ebcb3a2e206251f44e99376ec2ed6c2bacc63;hp=644d0333ac1e7a42419ec80bf534b63c2bbb17c1;hpb=f119d0e5b18b7286d04fc536a94e0f96e3c51714;p=tpg%2Facess2.git

diff --git a/Kernel/include/threads.h b/Kernel/include/threads.h
index 644d0333..f23c5b56 100644
--- a/Kernel/include/threads.h
+++ b/Kernel/include/threads.h
@@ -5,6 +5,7 @@
 
 #include <arch.h>
 #include <signal.h>
+#include <proc.h>
 
 typedef struct sMessage
 {
@@ -16,30 +17,39 @@ typedef struct sMessage
 
 typedef struct sThread
 {
+	// --- threads.c's
+	//  0
 	struct sThread	*Next;	//!< Next thread in list
-	 int	IsLocked;	//!< Thread's spinlock
-	 int	Status;		//!< Thread Status
+	tSpinlock	IsLocked;	//!< Thread's spinlock
+	volatile int	Status;		//!< Thread Status
 	 int	RetStatus;	//!< Return Status
 	
+	// 16
 	Uint	TID;	//!< Thread ID
 	Uint	TGID;	//!< Thread Group (Process)
 	Uint	PTID;	//!< Parent Thread ID
 	Uint	UID, GID;	//!< User and Group
 	char	*ThreadName;	//!< Name of thread
 	
-	tVAddr	KernelStack;	//!< Kernel Stack Base
+	// --- arch/proc.c's responsibility
+	// 40
+	//! Kernel Stack Base
+	tVAddr	KernelStack;
 	
+	// 44 (x86)
 	//! Memory Manager State
 	tMemoryState	MemState;
 	
+	// 48 (x86)
 	//! State on task switch
 	tTaskState	SavedState;
 	
-	 int	CurSignal;	//!< Signal currently being handled (0 for none)
-	tVAddr	SignalHandlers[NSIG];	//!< Signal Handler List
-	tTaskState	SignalState;	//!< Saved state for signal handler
+	// --- threads.c's
+	// 60
+	 int	CurFaultNum;	//!< Current fault number, 0: none
+	tVAddr	FaultHandler;	//!< Fault Handler
 	
-	tMsg	*Messages;	//!< Message Queue
+	tMsg * volatile	Messages;	//!< Message Queue
 	tMsg	*LastMessage;	//!< Last Message (speeds up insertion)
 	
 	 int	Quantum, Remaining;	//!< Quantum Size and remaining timesteps
@@ -58,9 +68,22 @@ enum {
 	THREAD_STAT_DEAD
 };
 
+enum eFaultNumbers
+{
+	FAULT_MISC,
+	FAULT_PAGE,
+	FAULT_ACCESS,
+	FAULT_DIV0,
+	FAULT_OPCODE,
+	FAULT_FLOAT
+};
+
+#define GETMSG_IGNORE	((void*)-1)
+
 // === FUNCTIONS ===
 extern tThread	*Proc_GetCurThread();
 extern tThread	*Threads_GetThread(Uint TID);
 extern void	Threads_Wake(tThread *Thread);
+extern void	Threads_AddActive(tThread *Thread);
 
 #endif