X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Finclude%2Farch.h;h=c2c622e56d3f66ab1cd1a8fd9ec3e472786c0e00;hb=9c61cf12758c0977ee1dc5791cba638fd3437ba6;hp=e076b08e3773865567737ed7404a97acbb5f5f89;hpb=a79ebcb3a2e206251f44e99376ec2ed6c2bacc63;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/include/arch.h b/Kernel/arch/x86_64/include/arch.h
index e076b08e..c2c622e5 100644
--- a/Kernel/arch/x86_64/include/arch.h
+++ b/Kernel/arch/x86_64/include/arch.h
@@ -5,10 +5,19 @@
 #ifndef _ARCH_H_
 #define _ARCH_H_
 
-#include <stdint.h>
-#define KERNEL_BASE	0xFFFF8000##00000000
+//#include <stdint.h>
+//#define KERNEL_BASE	0xFFFF8000##00000000
+#define KERNEL_BASE	0xFFFFFFFF##80000000
 #define BITS	64
 
+#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;
 typedef unsigned char	Uint8;
@@ -24,45 +33,76 @@ typedef signed long long int	Sint64;
 typedef unsigned long long int	Uint64;
 #endif
 
+typedef Sint64	Sint;
 typedef Uint64	Uint;
 typedef Uint64	tPAddr;
 typedef Uint64	tVAddr;
 
-//typedef unsigned int	size_t;
 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 %%eax, (%%edi)":"=a"(v):"a"(1),"D"(lockptr));\
-	}while(0)
-#define RELEASE(lockptr)	__asm__ __volatile__("lock andl $0, (%%edi)"::"D"(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
 typedef struct sSyscallRegs
 {
-	Uint    Arg4, Arg5;     // RDI, RSI
-	Uint    Arg6;   // RBP
-	Uint    Resvd2[1];      // Kernel RSP
 	union {
-	        Uint    Arg1;
-	        Uint    Error;
-	};      // RBX
-	union {
-	        Uint    Arg3;
-	        Uint    RetHi;  // High 64 bits of ret
-	};      // RDX
-	Uint    Arg2;   // RCX
-	union {
-	        Uint    Num;
-	        Uint    Return;
+		Uint    Num;
+		Uint    Return;
 	};      // RAX
-	Uint    Resvd3[5];      // Int, Err, rip, CS, ...
-	Uint    StackPointer;   // RSP
-	Uint    Resvd4[1];      // SS	
+	Uint    Arg4;	// RCX
+	Uint	Arg3;	// RDX
+	Uint    Error;	// RBX
+	Uint    Resvd1[2];	// Kernel RSP, RBP
+	Uint	Arg2;	// RSI
+	Uint	Arg1;	// RDI
+	Uint	Arg5;	// R8
+	Uint	Arg6;	// R9
+	Uint	Resvd2[6];	// R10 - R15
+	Uint	Resvd3[5];	// IntNum, ErrCode, RIP, CS, RFLAGS
+	
+	Uint	Resvd4[5];      // Int, Err, rip, CS, ...
+	Uint	StackPointer;   // RSP
+	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