Kernel/x86-64 - Updated and debug

[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 9b3801b..d8b1124 100644 (file)
--- a/Kernel/arch/x86_64/include/arch.h
+++ b/Kernel/arch/x86_64/include/arch.h
@@ -5,9 +5,18 @@
 #ifndef _ARCH_H_
 #define _ARCH_H_
 
-#include <stdint.h>
-#define KERNEL_BASE    0xFFFF8000##00000000
+//#include <stdint.h>
+#define KERNEL_BASE    0xFFFFFFFF##80000000
 #define BITS   64
+#define PAGE_SIZE      0x1000
+
+#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
 
 // === Core Types ===
 typedef signed char    Sint8;
@@ -30,15 +39,19 @@ typedef Uint64      tPAddr;
 typedef Uint64 tVAddr;
 
 typedef Uint64 size_t;
+typedef char   BOOL;
 
-typedef volatile int    tSpinlock;
-#define IS_LOCKED(lockptr)      (!!(*(tSpinlock*)lockptr))
-#define LOCK(lockptr)   do {int v=1;\
-       while(v)\
-       __asm__ __volatile__("lock xchgl %0, (%2)":"=r"(v):"r"(1),"r"(lockptr));\
-       }while(0)
-#define RELEASE(lockptr)       __asm__ __volatile__("lock andl $0, (%0)"::"r"(lockptr));
-#define HALT()  __asm__ __volatile__ ("hlt")
+#define __ASM__        __asm__ __volatile__
+
+// === MACROS ===
+/**
+ * \brief Halt the CPU
+ */
+#define        HALT()  __asm__ __volatile__ ("sti;\n\thlt")
+/**
+ * \brief Fire a magic breakpoint (bochs)
+ */
+#define        MAGIC_BREAK()   __asm__ __volatile__ ("xchg %bx, %bx")
 
 // Systemcall Registers
 // TODO: Fix this structure
@@ -64,5 +77,32 @@ typedef struct sSyscallRegs
        Uint    Resvd5[1];      // SS   
 }      tSyscallRegs;
 
+/**
+ * \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
+};
+
+// === FUNCTIONS ===
+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);
+
+extern void    Debug_PutCharDebug(char ch);
+extern void    Debug_PutStringDebug(const char *Str);
+
 #endif