X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=0fec144e65bc7ef77c0d9c8656c55a07d5c09d8f;hb=15999a03acd4083fb2618c92bebbc557813c5084;hp=4007a71f190b6307be756708fe94beb8a43d1e39;hpb=54746c855c6e2fe42fde9f93b0ce3f41aeefc2e5;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 4007a71f..0fec144e 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -6,23 +6,8 @@
 #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
 
 // - Processor/Machine Specific Features
@@ -42,13 +27,73 @@
 # define	PHYS_BITS	32
 #endif
 
+#define __ASM__	__asm__ __volatile__
+
+// === Spinlocks ===
+/**
+ * \brief Short Spinlock structure
+ */
+struct sShortSpinlock {
+	volatile int	Lock;	//!< Lock value
+	 int	IF;	//!< Interrupt state on call to SHORTLOCK
+};
+/**
+ * \brief Determine if a short spinlock is locked
+ * \param Lock	Lock pointer
+ */
+static inline int IS_LOCKED(struct sShortSpinlock *Lock) {
+	return !!Lock->Lock;
+}
+/**
+ * \brief Acquire a Short Spinlock
+ * \param Lock	Lock pointer
+ * 
+ * This type of mutex should only be used for very short sections of code,
+ * or in places where a Mutex_* would be overkill, such as appending
+ * an element to linked list (usually two assignement lines in C)
+ * 
+ * \note This type of lock halts interrupts, so ensure that no timing
+ * functions are called while it is held.
+ */
+static inline void SHORTLOCK(struct sShortSpinlock *Lock) {
+	 int	v = 1;
+	 int	IF;
+	// int	val = GetCPUNum() + 1;
+	
+	// Save interrupt state and clear interrupts
+	__ASM__ ("pushf;\n\tcli;\n\tpop %%eax" : "=a"(IF));
+	IF &= 0x200;
+	
+	// Wait for another CPU to release
+	while(v)
+		__ASM__("xchgl %%ecx, (%%edi)":"=c"(v):"a"(1),"D"(&Lock->Lock));
+	
+	Lock->IF = IF;
+}
+/**
+ * \brief Release a short lock
+ * \param Lock	Lock pointer
+ */
+static inline void SHORTREL(struct sShortSpinlock *Lock) {
+	// Lock->IF can change anytime once Lock->Lock is zeroed
+	if(Lock->IF) {
+		Lock->Lock = 0;
+		__ASM__ ("sti");
+	}
+	else {
+		Lock->Lock = 0;
+	}
+}
+
 // === MACROS ===
-typedef volatile int	tSpinlock;
-#define IS_LOCKED(lockptr)	(!!(*(tSpinlock*)lockptr))
-#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
+ */
 #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