X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Finclude%2Farch.h;h=d8b1124dc9d97af56567db8dedd595dbe3a07726;hb=2ebf89999759fc9d1ece6f98dfd439170995bb28;hp=d812a5140409dac6c508658d07d4305192867d39;hpb=3234a52a913609230ffc140c27542d421bb1b7d3;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/include/arch.h b/Kernel/arch/x86_64/include/arch.h
index d812a514..d8b1124d 100644
--- a/Kernel/arch/x86_64/include/arch.h
+++ b/Kernel/arch/x86_64/include/arch.h
@@ -5,29 +5,104 @@
 #ifndef _ARCH_H_
 #define _ARCH_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;
 typedef unsigned char	Uint8;
 typedef signed short	Sint16;
 typedef unsigned short	Uint16;
-typedef signed long	Sint32;
-typedef unsigned long	Uint32;
-typedef signed long long	Sint64;
-typedef unsigned long long	Uint64;
+typedef signed int	Sint32;
+typedef unsigned int	Uint32;
+#if __WORDSIZE == 64
+typedef signed long int	Sint64;
+typedef unsigned long int	Uint64;
+#else
+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;
+
+#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
+{
+	union {
+		Uint    Num;
+		Uint    Return;
+	};      // RAX
+	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
+};
 
-typedef int	tSpinlock;
+// === 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);
 
-#define LOCK(_ptr)
-#define RELEASE(_ptr)
+extern void	Debug_PutCharDebug(char ch);
+extern void	Debug_PutStringDebug(const char *Str);
 
 #endif