X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=67a629016f6839576c7bbf30fb921dffa5decacb;hb=7d881c2e5fef91a6570e46ef69a5d4a5cf0e8b4d;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..67a62901 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -6,42 +6,71 @@
 #ifndef _ARCH_H_
 #define _ARCH_H_
 
-// - Memory Layout
-#define	MM_USER_MIN	0x00200000
-#define	USER_STACK_SZ	0x00010000
-#define	USER_STACK_TOP	0x00200000
-#define	MM_USER_MAX	0xBC000000
-#define	MM_PPD_MIN	0xBC000000	// Per-Process Data
-#define	MM_PPD_VFS	0xBC000000	// 
-#define MM_PPD_CFG	0xBFFFF000	// 
-#define	MM_PPD_MAX	0xB0000000
+// - Base Defintions
 #define	KERNEL_BASE	0xC0000000
-#define	MM_KHEAP_BASE	0xC0400000	// C+4MiB
-#define	MM_KHEAP_MAX	0xCF000000	//
-#define MM_KERNEL_VFS	0xCF000000	// 
-#define MM_KUSER_CODE	0xCFFF0000	// 16 Pages
-#define	MM_MODULE_MIN	0xD0000000	// Lowest Module Address
-#define MM_MODULE_MAX	0xF0000000	// 512 MiB
-
 #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
+
+#define __ASM__	__asm__ __volatile__
+
+#define LONGLOCK_NUM_THREADS	8
+
 // === MACROS ===
-#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));
+struct sShortSpinlock {
+	volatile int	Lock;
+	 int	IF;
+};
+/**
+ * \brief Determine if a short spinlock is locked
+ */
+static inline int IS_LOCKED(struct sShortSpinlock *Lock) {
+	return !!Lock->Lock;
+}
+/**
+ * \brief Acquire a Short Spinlock
+ * \note Stops interrupts, so be careful
+ */
+static inline void SHORTLOCK(struct sShortSpinlock *Lock) {
+	 int	v = 1;
+	__ASM__ ("pushf;\n\tpop %%eax" : "=a"(Lock->IF));
+	Lock->IF &= 0x200;
+	__ASM__ ("cli");	// Stop task switches
+	// Wait for another CPU to release
+	while(v)
+		__ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
+}
+/**
+ * \brief Release a short lock
+ */
+static inline void SHORTREL(struct sShortSpinlock *Lock) {
+	Lock->Lock = 0;
+	#if 0
+	__ASM__ ("pushf;\n\tor %0, (%%esp);\n\tpopf" : : "a"(Lock->IF));
+	#else
+	if(Lock->IF)	__ASM__ ("sti");
+	#endif
+}
+/**
+ * \brief Halt the CPU
+ */
+#define	HALT()	__asm__ __volatile__ ("hlt")
+#define	MAGIC_BREAK()	__asm__ __volatile__ ("xchg %bx, %bx")
 
 // === TYPES ===
 typedef unsigned int	Uint;	// Unsigned machine native integer
@@ -56,15 +85,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;
@@ -98,18 +121,15 @@ typedef struct {
 } tSyscallRegs;
 
 typedef struct {
-	Uint16	LimitLow;
-	Uint16	BaseLow;
-	Uint8	BaseMid;
-	Uint8	Access;
-	struct {
-		unsigned LimitHi:	4;
-		unsigned Flags:		4;
-	} __attribute__ ((packed));
-	Uint8	BaseHi;
-} __attribute__ ((packed)) tGDT;
+	#if USE_PAE
+	Uint	PDPT[4];
+	#else
+	Uint	CR3;
+	#endif
+} tMemoryState;
 
-// --- Interface Flags & Macros
-#define CLONE_VM	0x10
+typedef struct {
+	Uint	EIP, ESP, EBP;
+} tTaskState;
 
 #endif	// !defined(_ARCH_H_)