Kernel - x86 Fixed a couple of bugs

[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 bc4e0af..ade7491 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -6,35 +6,18 @@
 #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 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
-// 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 != i386 && ARCH != i486 && ARCH != i586
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
@@ -50,11 +33,45 @@
 # define       PHYS_BITS       32
 #endif
 
+#define __ASM__        __asm__ __volatile__
+
+// === Spinlocks ===
+/**
+ * \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 ===
-#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
@@ -68,23 +85,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 {
@@ -110,18 +122,6 @@ 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];
@@ -132,9 +132,16 @@ typedef struct {
 
 typedef struct {
        Uint    EIP, ESP, EBP;
+       Uint32  UserCS, UserEIP;
 } tTaskState;
 
-// --- Interface Flags & Macros
-#define CLONE_VM       0x10
+// === 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_)