Working on x86_64 build

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

diff --git a/Kernel/arch/x86_64/include/arch.h b/Kernel/arch/x86_64/include/arch.h
index 0e5cb61..e43bd97 100644 (file)
--- a/Kernel/arch/x86_64/include/arch.h
+++ b/Kernel/arch/x86_64/include/arch.h
@@ -10,8 +10,10 @@
 #define KERNEL_BASE    0xFFFFFFFF##80000000
 #define BITS   64
 
-#define STACKED_LOCKS  0
-#define LOCK_DISABLE_INTS      1
+#define STACKED_LOCKS  2       // 0: No, 1: Per-CPU, 2: Per-Thread
+#define LOCK_DISABLE_INTS      0
+
+#define INVLPTR        ((void*)0x0FFFFFFFFFFFFFFFULL)
 
 //#define INT_MAX      0x7FFFFFFF
 //#define UINT_MAX     0xFFFFFFFF
@@ -45,7 +47,7 @@ typedef char  BOOL;
 /**
  * \brief Halt the CPU
  */
-#define        HALT()  __asm__ __volatile__ ("hlt")
+#define        HALT()  __asm__ __volatile__ ("sti;\n\thlt")
 /**
  * \brief Fire a magic breakpoint (bochs)
  */