#define _ARCH_H_
//#include <stdint.h>
-//#define KERNEL_BASE 0xFFFF8000##00000000
+#define USER_MAX 0x00007FFF##FFFFF000
#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
typedef Uint64 tVAddr;
typedef Uint64 size_t;
+typedef char BOOL;
#define __ASM__ __asm__ __volatile__
/**
* \brief Halt the CPU
*/
-#define HALT() __asm__ __volatile__ ("hlt")
+#define HALT() __asm__ __volatile__ ("sti;\n\thlt")
/**
* \brief Fire a magic breakpoint (bochs)
*/
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 Arg2; // RSI
+ Uint Arg3; // RDX
+ Uint Arg4; // RCX
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 _Flags;
+ Uint _IP;
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
- int IF; //!< Interrupt state on call to SHORTLOCK
-};
-/**
- * \brief Determine if a short spinlock is locked
- * \param Lock Lock pointer
- */
-static inline int IS_LOCKED(struct sShortSpinlock *Lock) {
- return !!Lock->Lock;
-}
-/**
- * \brief Acquire a Short Spinlock
- * \param Lock Lock pointer
- *
- * This type of mutex should only be used for very short sections of code,
- * or in places where a Mutex_* would be overkill, such as appending
- * an element to linked list (usually two assignement lines in C)
- *
- * \note This type of lock halts interrupts, so ensure that no timing
- * functions are called while it is held.
- */
-static inline void SHORTLOCK(struct sShortSpinlock *Lock) {
- int v = 1;
-
- // Save interrupt state
- __ASM__ ("pushf;\n\tpop %%rax" : "=a"(Lock->IF));
- Lock->IF &= 0x200;
-
- // Stop interrupts
- __ASM__ ("cli");
+ #endif
- // Wait for another CPU to release
- while(v)
- __ASM__("xchgl %%eax, (%%rdi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
-}
-/**
- * \brief Release a short lock
- * \param Lock Lock pointer
- */
-static inline void SHORTREL(struct sShortSpinlock *Lock) {
- Lock->Lock = 0;
- #if 0 // Which is faster?, meh the test is simpler
- __ASM__ ("pushf;\n\tor %0, (%%rsp);\n\tpopf" : : "a"(Lock->IF));
- #else
- if(Lock->IF) __ASM__ ("sti");
+ #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);
+
+// TODO: Move this to acess.h
+extern tPAddr MM_AllocateZero(tVAddr VAddr);
#endif