X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=18267576e53f4f9e968e991ac63760dccf2ec784;hb=246ff98ae5b16ef0e19fe082a9c900e9169a1f7b;hp=9c16b182adf658276c476e45a11815f0a926959b;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 9c16b182..18267576 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	// 
@@ -26,22 +26,28 @@
 #define BITS	32
 
 // - Processor/Machine Specific Features
-#if ARCH == i386
-// Uses no advanced features
-# define	USE_MP	0
-# define	USE_PAE	0
-#elif ARCH == i586
-// All Enabled
-# define	USE_MP	1
-# define	USE_PAE	1
-#else
+#if ARCH != i386 && ARCH != i486 && ARCH != i586
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
+#if USE_MP
+# define	MAX_CPUS	8
+#else
+# define	MAX_CPUS	1
+#endif
+
+#if USE_PAE
+# define	PHYS_BITS	48
+#else
+# define	PHYS_BITS	32
+#endif
+
 // === MACROS ===
+typedef volatile int	tSpinlock;
 #define LOCK(lockptr)	do {int v=1;\
 	while(v)__asm__ __volatile__("lock xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(lockptr));}while(0)
 #define	RELEASE(lockptr)	__asm__ __volatile__("lock andl $0, (%%edi)"::"D"(lockptr));
+#define	HALT()	__asm__ __volatile__ ("hlt")
 
 // === TYPES ===
 typedef unsigned int	Uint;	// Unsigned machine native integer
@@ -56,15 +62,9 @@ typedef signed long		Sint32;
 typedef signed long long	Sint64;
 typedef Uint	size_t;
 
-#if USE_PAE
 typedef Uint64	tPAddr;
-#else
-typedef Uint32	tPAddr;
-#endif
 typedef Uint32	tVAddr;
 
-typedef void (*tThreadFunction)(void*);
-
 typedef struct {
     Uint	gs, fs, es, ds;
     Uint	edi, esi, ebp, kesp;
@@ -109,7 +109,16 @@ typedef struct {
 	Uint8	BaseHi;
 } __attribute__ ((packed)) tGDT;
 
-// --- Interface Flags & Macros
-#define CLONE_VM	0x10
+typedef struct {
+	#if USE_PAE
+	Uint	PDPT[4];
+	#else
+	Uint	CR3;
+	#endif
+} tMemoryState;
+
+typedef struct {
+	Uint	EIP, ESP, EBP;
+} tTaskState;
 
 #endif	// !defined(_ARCH_H_)