X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=755ecdfdb7877a59cf32b24e089ae25a2158f7df;hb=eb98f1f2915446ef05120482a2fc353c76330b50;hp=773556840a9dca2ca272d5fc2884ef3fff67a422;hpb=a506fc15c09f7d8f178a7c7d9658b5bf45778128;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 77355684..755ecdfd 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -9,6 +9,13 @@
 // - Base Defintions
 #define	KERNEL_BASE	0xC0000000
 #define BITS	32
+#define PAGE_SIZE	0x1000
+
+#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 && ARCH != i486 && ARCH != i586
@@ -29,44 +36,43 @@
 
 #define __ASM__	__asm__ __volatile__
 
-// === MACROS ===
-typedef volatile int	tSpinlock;
-#define IS_LOCKED(lockptr)	(!!(*(tSpinlock*)lockptr))
-/**
- * \brief Inter-Process interrupt (does a Yield)
- */
-#define LOCK(lockptr)	do {\
-	int v=1;\
-	while(v) {\
-		__ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-		if(v) Threads_Yield();\
-	}\
-}while(0)
+// === Spinlocks ===
 /**
- * \brief Tight spinlock (does a HLT)
+ * \brief Short Spinlock structure
  */
-#define TIGHTLOCK(lockptr)	do{\
-	int v=1;\
-	while(v) {\
-		__ASM__("xchgl %%eax,(%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-		if(v) __ASM__("hlt");\
-	}\
-}while(0)
-/**
- * \brief Very Tight spinlock (short inter-cpu lock)
- */
-#define VTIGHTLOCK(lockptr)	do{\
-	int v=1;\
-	while(v)__ASM__("xchgl %%eax,(%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-}while(0)
+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 ===
 /**
- * \brief Release a held spinlock
+ * \brief Halt the CPU (shorter version of yield)
  */
-#define	RELEASE(lockptr)	__ASM__("lock andl $0, (%%edi)"::"D"(lockptr));
+#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 Halt the CPU
+ * \brief Fire a magic breakpoint (bochs)
  */
-#define	HALT()	__asm__ __volatile__ ("hlt")
+#define	MAGIC_BREAK()	__asm__ __volatile__ ("xchg %bx, %bx")
 
 // === TYPES ===
 typedef unsigned int	Uint;	// Unsigned machine native integer
@@ -80,17 +86,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 {
@@ -126,6 +133,16 @@ typedef struct {
 
 typedef struct {
 	Uint	EIP, ESP, EBP;
+	Uint32	UserCS, UserEIP;
 } tTaskState;
 
+// === FUNCTIONS ===
+extern void	Debug_PutCharDebug(char ch);
+extern void	Debug_PutStringDebug(const char *String);
+
+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_)