/*
* Acess2
* - x86 Architecture
- * arch/i386/include/arch.h
+ * arch/x86/include/arch.h
*/
#ifndef _ARCH_H_
#define _ARCH_H_
// - Base Defintions
#define KERNEL_BASE 0xC0000000
#define BITS 32
+#define PAGE_SIZE 0x1000
#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
+#if ARCH != x86 && ARCH != x86_smp
# error "Unknown architecture '" #ARCH "'"
#endif
* \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
};
// === MACROS ===
/**
* \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)
*/
typedef Uint size_t;
typedef char BOOL;
-typedef Uint64 tPAddr;
+typedef Uint32 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 {
Uint Resvd4[1]; // SS
} tSyscallRegs;
-typedef struct {
- #if USE_PAE
- Uint PDPT[4];
- #else
- Uint CR3;
- #endif
-} tMemoryState;
-
-typedef struct {
- Uint EIP, ESP, EBP;
-} 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);