Merge commit 'eb98f1f2915446ef05120482a2fc353c76330b50' into mmap_binary

[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 8d8a14a..d82fc2c 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -58,7 +58,16 @@ struct sShortSpinlock {
 /**
  * \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)
  */
@@ -78,7 +87,7 @@ typedef signed long long      Sint64;
 typedef Uint   size_t;
 typedef char   BOOL;
 
-typedef Uint64 tPAddr;
+typedef Uint32 tPAddr;
 typedef Uint32 tVAddr;
 
 typedef struct {
@@ -123,9 +132,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);