X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=9307ada3ce4cc0f17fe6d835bf1400ff653d82ab;hb=7aa331d83b8dd23d3ca7530fa582cec528df274a;hp=67a629016f6839576c7bbf30fb921dffa5decacb;hpb=7d881c2e5fef91a6570e46ef69a5d4a5cf0e8b4d;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 67a62901..9307ada3 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -9,9 +9,15 @@
 // - Base Defintions
 #define	KERNEL_BASE	0xC0000000
 #define BITS	32
+#define PAGE_SIZE	0x1000
+
+#define INVLPTR	((void*)-1)
+
+// Allow nested spinlocks?
+#define LOCK_DISABLE_INTS	1
 
 // - Processor/Machine Specific Features
-#if ARCH != i386 && ARCH != i486 && ARCH != i586
+#if ARCH != x86 && ARCH != x86_smp
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
@@ -29,47 +35,35 @@
 
 #define __ASM__	__asm__ __volatile__
 
-#define LONGLOCK_NUM_THREADS	8
-
-// === MACROS ===
-struct sShortSpinlock {
-	volatile int	Lock;
-	 int	IF;
-};
+// === Spinlocks ===
 /**
- * \brief Determine if a short spinlock is locked
+ * \brief Short Spinlock structure
  */
-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");
+struct sShortSpinlock {
+	volatile int	Lock;	//!< Lock value
+	
+	#if LOCK_DISABLE_INTS
+	 int	IF;	//!< Interrupt state on call to SHORTLOCK
 	#endif
-}
+};
+
+// === MACROS ===
 /**
- * \brief Halt the CPU
+ * \brief Halt the CPU (shorter version of yield)
  */
+#if 1
+#define	HALT()	do { \
+	Uint32	flags; \
+	__asm__ __volatile__ ("pushf;pop %0" : "=a"(flags)); \
+	if( !(flags & 0x200) )	Panic("HALT called with interrupts disabled"); \
+	__asm__ __volatile__ ("hlt"); \
+} while(0)
+#else
 #define	HALT()	__asm__ __volatile__ ("hlt")
+#endif
+/**
+ * \brief Fire a magic breakpoint (bochs)
+ */
 #define	MAGIC_BREAK()	__asm__ __volatile__ ("xchg %bx, %bx")
 
 // === TYPES ===
@@ -84,17 +78,18 @@ 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	tPAddr;
 typedef Uint32	tVAddr;
 
 typedef struct {
-    Uint	gs, fs, es, ds;
-    Uint	edi, esi, ebp, kesp;
-	Uint	ebx, edx, ecx, eax;
-    Uint	int_num, err_code;
-    Uint	eip, cs;
-	Uint	eflags, esp, ss;
+	Uint32	gs, fs, es, ds;
+	Uint32	edi, esi, ebp, kesp;
+	Uint32	ebx, edx, ecx, eax;
+	Uint32	int_num, err_code;
+	Uint32	eip, cs;
+	Uint32	eflags, esp, ss;
 } tRegs;
 
 typedef struct {
@@ -120,16 +115,13 @@ typedef struct {
 	Uint	Resvd4[1];	// SS
 } tSyscallRegs;
 
-typedef struct {
-	#if USE_PAE
-	Uint	PDPT[4];
-	#else
-	Uint	CR3;
-	#endif
-} tMemoryState;
+// === FUNCTIONS ===
+extern void	Debug_PutCharDebug(char ch);
+extern void	Debug_PutStringDebug(const char *String);
 
-typedef struct {
-	Uint	EIP, ESP, EBP;
-} tTaskState;
+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_)