Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Kernel / arch / x86 / include / arch.h

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 7735568..8a98705 100644 (file)
--- 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,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,44 +35,36 @@
 
 #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 {
+       volatile int    Lock;   //!< Lock value
+       
+       #if LOCK_DISABLE_INTS
+        int    IF;     //!< Interrupt state on call to SHORTLOCK
+       #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 +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 {
@@ -116,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_)