Merge branch 'master' of [email protected]: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 045986f..66d7a79 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -10,9 +10,11 @@
 #define        KERNEL_BASE     0xC0000000
 #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      0
+#define LOCK_DISABLE_INTS      1
 
 // - Processor/Machine Specific Features
 #if ARCH != i386 && ARCH != i486 && ARCH != i586
@@ -54,7 +56,7 @@ struct sShortSpinlock {
 
 // === MACROS ===
 /**
- * \brief Halt the CPU
+ * \brief Halt the CPU (shorter version of yield)
  */
 #define        HALT()  __asm__ __volatile__ ("hlt")
 /**
@@ -80,12 +82,12 @@ typedef Uint64      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 {
@@ -121,9 +123,13 @@ typedef struct {
 
 typedef struct {
        Uint    EIP, ESP, EBP;
+       Uint32  UserCS, UserEIP;
 } 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);