X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=f9813ed5aceaa348ce177bfca683d5acdd7c19ea;hb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;hp=ccd1875f94401e5bc561143810fd33d95eb476ed;hpb=1303ed4cedc2e01316d2d033f3dd0b50b190ef81;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index ccd1875f..f9813ed5 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -6,39 +6,18 @@
 #ifndef _ARCH_H_
 #define _ARCH_H_
 
-// - Memory Layout
-#define	MM_USER_MIN	0x00200000
-#define	USER_STACK_SZ	0x00010000
-#define	USER_STACK_TOP	0x00800000
-#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
 
+#define INVLPTR	((void*)-1)
+
+// Allow nested spinlocks?
+#define STACKED_LOCKS	2	// 0: No, 1: Per-CPU, 2: Per-Thread
+#define LOCK_DISABLE_INTS	1
+
 // - Processor/Machine Specific Features
-#if ARCH == i386
-// Uses no advanced features
-# define	USE_MP	0
-# define	USE_PAE	0
-#elif ARCH == i486
-// MP Only
-# define	USE_MP	1
-# 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
 
@@ -54,12 +33,36 @@
 # define	PHYS_BITS	32
 #endif
 
+#define __ASM__	__asm__ __volatile__
+
+// === Spinlocks ===
+/**
+ * \brief Short Spinlock structure
+ */
+struct sShortSpinlock {
+	#if STACKED_LOCKS == 2
+	volatile void	*Lock;	//!< Lock value
+	#else
+	volatile int	Lock;	//!< Lock value
+	#endif
+	
+	#if LOCK_DISABLE_INTS
+	 int	IF;	//!< Interrupt state on call to SHORTLOCK
+	#endif
+	#if STACKED_LOCKS
+	 int	Depth;
+	#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));
+/**
+ * \brief Halt the CPU (shorter version of yield)
+ */
 #define	HALT()	__asm__ __volatile__ ("hlt")
+/**
+ * \brief Fire a magic breakpoint (bochs)
+ */
+#define	MAGIC_BREAK()	__asm__ __volatile__ ("xchg %bx, %bx")
 
 // === TYPES ===
 typedef unsigned int	Uint;	// Unsigned machine native integer
@@ -73,16 +76,17 @@ typedef signed short	Sint16;
 typedef signed long		Sint32;
 typedef signed long long	Sint64;
 typedef Uint	size_t;
+typedef char	BOOL;
 
 typedef Uint64	tPAddr;
 typedef Uint32	tVAddr;
 
 typedef struct {
-    Uint	gs, fs, es, ds;
-    Uint	edi, esi, ebp, kesp;
+	Uint	gs, fs, es, ds;
+	Uint	edi, esi, ebp, kesp;
 	Uint	ebx, edx, ecx, eax;
-    Uint	int_num, err_code;
-    Uint	eip, cs;
+	Uint	int_num, err_code;
+	Uint	eip, cs;
 	Uint	eflags, esp, ss;
 } tRegs;
 
@@ -109,18 +113,6 @@ typedef struct {
 	Uint	Resvd4[1];	// SS
 } 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;
-
 typedef struct {
 	#if USE_PAE
 	Uint	PDPT[4];
@@ -133,4 +125,10 @@ typedef struct {
 	Uint	EIP, ESP, EBP;
 } tTaskState;
 
+// === FUNCTIONS ===
+extern int	IS_LOCKED(struct sShortSpinlock *Lock);
+extern int	CPU_HAS_LOCK(struct sShortSpinlock *Lock);
+extern void	SHORTLOCK(struct sShortSpinlock *Lock);
+extern void	SHORTREL(struct sShortSpinlock *Lock);
+
 #endif	// !defined(_ARCH_H_)