Kernel/x86 - Fixed usage of Proc_Clone

[tpg/acess2.git] / Kernel / arch / x86 / include / arch.h

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 045986f..755ecdf 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -9,10 +9,13 @@
 // - 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      0
+#define LOCK_DISABLE_INTS      1
 
 // - Processor/Machine Specific Features
 #if ARCH != i386 && ARCH != i486 && ARCH != i586
@@ -54,9 +57,18 @@ struct sShortSpinlock {
 
 // === 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)
  */
@@ -76,16 +88,16 @@ typedef signed long long    Sint64;
 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 {
@@ -121,9 +133,13 @@ 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);