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

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 6a7ab45e..8a987058 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -1,40 +1,23 @@
 /*
  * Acess2
  * - x86 Architecture
- * arch/i386/include/arch.h
+ * arch/x86/include/arch.h
  */
 #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
+#define PAGE_SIZE	0x1000
+
+#define INVLPTR	((void*)-1)
+
+// Allow nested spinlocks?
+#define LOCK_DISABLE_INTS	1
 
 // - Processor/Machine Specific Features
-#if ARCH == i386
-// Uses no advanced features
-# define	USE_MP	0
-# define	USE_PAE	0
-#elif ARCH == i586
-// All Enabled
-# define	USE_MP	1
-# define	USE_PAE	1
-#else
+#if ARCH != x86 && ARCH != x86_smp
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
@@ -44,11 +27,44 @@
 # define	MAX_CPUS	1
 #endif
 
+#if USE_PAE
+# define	PHYS_BITS	48
+#else
+# define	PHYS_BITS	32
+#endif
+
+#define __ASM__	__asm__ __volatile__
+
+// === Spinlocks ===
+/**
+ * \brief Short Spinlock structure
+ */
+struct sShortSpinlock {
+	volatile int	Lock;	//!< Lock value
+	
+	#if LOCK_DISABLE_INTS
+	 int	IF;	//!< Interrupt state on call to SHORTLOCK
+	#endif
+};
+
 // === MACROS ===
-#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 (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 ===
 typedef unsigned int	Uint;	// Unsigned machine native integer
@@ -62,23 +78,18 @@ typedef signed short	Sint16;
 typedef signed long		Sint32;
 typedef signed long long	Sint64;
 typedef Uint	size_t;
+typedef char	BOOL;
 
-#if USE_PAE
-typedef Uint64	tPAddr;
-#else
 typedef Uint32	tPAddr;
-#endif
 typedef Uint32	tVAddr;
 
-typedef void (*tThreadFunction)(void*);
-
 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 {
@@ -104,31 +115,13 @@ typedef struct {
 	Uint	Resvd4[1];	// SS
 } tSyscallRegs;
 
-typedef struct {
-	Uint16	LimitLow;
-	Uint16	BaseLow;
-	Uint8	BaseMid;
-	Uint8	Access;
-	struct {
-		unsigned LimitHi:	4;
-		unsigned Flags:		4;
-	} __attribute__ ((packed));
-	Uint8	BaseHi;
-} __attribute__ ((packed)) tGDT;
-
-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);
 
-// --- Interface Flags & Macros
-#define CLONE_VM	0x10
+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_)