X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=8a9870589b27b0010b2798f4696965729f34f70b;hb=a2495c6ea4f4cab16b5d339ae511428e92e89e73;hp=8d8a14a00188ae282b5e0b80f61d7e1b4e0364d4;hpb=adbdc45e64c40f7d3a022caedeb22f5e95dcd12a;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 8d8a14a0..8a987058 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -1,7 +1,7 @@
 /*
  * Acess2
  * - x86 Architecture
- * arch/i386/include/arch.h
+ * arch/x86/include/arch.h
  */
 #ifndef _ARCH_H_
 #define _ARCH_H_
@@ -9,15 +9,15 @@
 // - 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
+#if ARCH != x86 && ARCH != x86_smp
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
@@ -40,25 +40,27 @@
  * \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 ===
 /**
  * \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)
  */
@@ -78,7 +80,7 @@ typedef signed long long	Sint64;
 typedef Uint	size_t;
 typedef char	BOOL;
 
-typedef Uint64	tPAddr;
+typedef Uint32	tPAddr;
 typedef Uint32	tVAddr;
 
 typedef struct {
@@ -113,19 +115,10 @@ typedef struct {
 	Uint	Resvd4[1];	// SS
 } tSyscallRegs;
 
-typedef struct {
-	#if USE_PAE
-	Uint	PDPT[4];
-	#else
-	Uint	CR3;
-	#endif
-} tMemoryState;
-
-typedef struct {
-	Uint	EIP, ESP, EBP;
-} 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);