X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=9a4f98d5731550fbe7d9bc6f7ca2ffe554f4e096;hb=fad68a47fc99c28c0557c06631b95277c8ed9159;hp=66d7a79259d667b10a66398b0568662293be1437;hpb=54bf151b1a05b74debdb5f3baec02c18406b74d1;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 66d7a792..9a4f98d5 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -9,6 +9,7 @@
 // - Base Defintions
 #define	KERNEL_BASE	0xC0000000
 #define BITS	32
+#define PAGE_SIZE	0x1000
 
 #define INVLPTR	((void*)-1)
 
@@ -17,7 +18,7 @@
 #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
 
@@ -58,7 +59,16 @@ struct sShortSpinlock {
 /**
  * \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 +88,7 @@ typedef signed long long	Sint64;
 typedef Uint	size_t;
 typedef char	BOOL;
 
-typedef Uint64	tPAddr;
+typedef Uint32	tPAddr;
 typedef Uint32	tVAddr;
 
 typedef struct {