#define KERNEL_BASE 0xC0000000
#define BITS 32
+#define INVLPTR ((void*)-1)
+
+// Allow nested spinlocks?
+#define STACKED_LOCKS 2 // 0: No, 1: Per-CPU, 2: Per-Thread
+#define LOCK_DISABLE_INTS 1
+
// - Processor/Machine Specific Features
#if ARCH != i386 && ARCH != i486 && ARCH != i586
# error "Unknown architecture '" #ARCH "'"
#define __ASM__ __asm__ __volatile__
-#define LONGLOCK_NUM_THREADS 8
-
-// === MACROS ===
-struct sShortSpinlock {
- volatile int Lock;
- int IF;
-};
+// === Spinlocks ===
/**
- * \brief Determine if a short spinlock is locked
+ * \brief Short Spinlock structure
*/
-static inline int IS_LOCKED(struct sShortSpinlock *Lock) {
- return !!Lock->Lock;
-}
-/**
- * \brief Acquire a Short Spinlock
- * \note Stops interrupts, so be careful
- */
-static inline void SHORTLOCK(struct sShortSpinlock *Lock) {
- int v = 1;
- __ASM__ ("pushf;\n\tpop %%eax" : "=a"(Lock->IF));
- Lock->IF &= 0x200;
- __ASM__ ("cli"); // Stop task switches
- // Wait for another CPU to release
- while(v)
- __ASM__("xchgl %%eax, (%%edi)":"=a"(v):"a"(1),"D"(&Lock->Lock));
-}
-/**
- * \brief Release a short lock
- */
-static inline void SHORTREL(struct sShortSpinlock *Lock) {
- Lock->Lock = 0;
- #if 0
- __ASM__ ("pushf;\n\tor %0, (%%esp);\n\tpopf" : : "a"(Lock->IF));
+struct sShortSpinlock {
+ #if STACKED_LOCKS == 2
+ volatile void *Lock; //!< Lock value
#else
- if(Lock->IF) __ASM__ ("sti");
+ 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
+};
+
+// === MACROS ===
/**
- * \brief Halt the CPU
+ * \brief Halt the CPU (shorter version of yield)
*/
+#if 1
+#define HALT() do { \
+ Uint32 flags; \
+ __asm__ __volatile__ ("pushf;pop %0" : "=a"(flags)); \
+ if( !(flags & 0x200) ) Panic("HALT called with interrupts disabled"); \
+ __asm__ __volatile__ ("hlt"); \
+} while(0)
+#else
#define HALT() __asm__ __volatile__ ("hlt")
+#endif
+/**
+ * \brief Fire a magic breakpoint (bochs)
+ */
#define MAGIC_BREAK() __asm__ __volatile__ ("xchg %bx, %bx")
// === TYPES ===
typedef signed long Sint32;
typedef signed long long Sint64;
typedef Uint size_t;
+typedef char BOOL;
typedef Uint64 tPAddr;
typedef Uint32 tVAddr;
typedef struct {
- Uint gs, fs, es, ds;
- Uint edi, esi, ebp, kesp;
- Uint ebx, edx, ecx, eax;
- Uint int_num, err_code;
- Uint eip, cs;
- Uint eflags, esp, ss;
+ Uint32 gs, fs, es, ds;
+ Uint32 edi, esi, ebp, kesp;
+ Uint32 ebx, edx, ecx, eax;
+ Uint32 int_num, err_code;
+ Uint32 eip, cs;
+ Uint32 eflags, esp, ss;
} tRegs;
typedef struct {
typedef struct {
Uint EIP, ESP, EBP;
+ Uint32 UserCS, UserEIP;
} tTaskState;
+// === FUNCTIONS ===
+extern void Debug_PutCharDebug(char ch);
+extern void Debug_PutStringDebug(const char *String);
+
+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);
+
#endif // !defined(_ARCH_H_)