Update

[l4.git] / kernel / fiasco / src / kern / ia32 / shortcut.h

diff --git a/kernel/fiasco/src/kern/ia32/shortcut.h b/kernel/fiasco/src/kern/ia32/shortcut.h
index 4eaff71ad315e7d86cb0e63f1ee4cab8a7a796f5..e74ff905b97a9ec4fa05a0054e8af7a216555115 100644 (file)
--- a/kernel/fiasco/src/kern/ia32/shortcut.h
+++ b/kernel/fiasco/src/kern/ia32/shortcut.h
@@ -3,32 +3,6 @@
 
 #include "globalconfig.h"
 
-// thread_state consts
-#define Thread_ready                   0x1
-#define Thread_utcb_ip_sp              0x2
-#define Thread_receiving               0x4
-#define Thread_polling                 0x8
-#define        Thread_ipc_in_progress          0x10
-#define Thread_send_in_progress                0x20
-#define Thread_busy                    0x40
-#define Thread_cancel                  0x100
-#define Thread_dead                    0x200
-#define Thread_delayed_deadline                0x2000
-#define Thread_delayed_ipc             0x4000
-#define Thread_fpu_owner               0x8000
-#define Thread_alien_or_vcpu_user      0x810000
-#define Thread_dis_alien               0x20000
-#define Thread_transfer_in_progress     0x80000
-
-#define Thread_ipc_sending_mask        (Thread_send_in_progress                | \
-                                       Thread_polling)
-#define Thread_ipc_receiving_mask      (Thread_receiving               | \
-                                       Thread_busy                     | \
-                                        Thread_transfer_in_progress)
-#define Thread_ipc_mask                (Thread_ipc_in_progress         | \
-                                       Thread_ipc_sending_mask         | \
-                                       Thread_ipc_receiving_mask)
-
 // stackframe structure
 #ifdef CONFIG_BIT32
 #define REG_ECX
@@ -43,29 +17,8 @@
 #define REG_EFL        (9*4)
 #define REG_ESP        (10*4)
 #define REG_SS (11*4)
-#else
-
-
-
-/*
-#define REG_RAX                (THREAD_BLOCK_SIZE - 6*8)
-#define REG_RBP                (THREAD_BLOCK_SIZE - 7*8)
-#define REG_RBX                (THREAD_BLOCK_SIZE - 8*8)
-#define REG_RDI                (THREAD_BLOCK_SIZE - 9*8)
-#define REG_RSI                (THREAD_BLOCK_SIZE - 10*8)
 
-#define REG_RDX                (THREAD_BLOCK_SIZE - 11*8)      
-#define REG_RCX                (THREAD_BLOCK_SIZE - 12*8)
-
-#define REG_R8         (THREAD_BLOCK_SIZE - 13*8)
-#define REG_R9         (THREAD_BLOCK_SIZE - 14*8)
-#define REG_R10                (THREAD_BLOCK_SIZE - 15*8)
-#define REG_R11                (THREAD_BLOCK_SIZE - 16*8)
-#define REG_R12                (THREAD_BLOCK_SIZE - 17*8)
-#define REG_R13                (THREAD_BLOCK_SIZE - 18*8)
-#define REG_R14                (THREAD_BLOCK_SIZE - 19*8)
-#define REG_R15                (THREAD_BLOCK_SIZE - 20*8)
-*/
+#else /* 64bit */
 
 #define REG_R15
 #define REG_R14 (1*8)
@@ -90,15 +43,6 @@
 
 #endif
 
-#ifdef CONFIG_ABI_X0
-#  define RETURN_DOPE 0x6000 // three dwords
-#  define TCB_ADDRESS_MASK 0x01fff800
-#else
-#  define RETURN_DOPE 0x4000 // two dwords
-#  define TCB_ADDRESS_MASK 0x1ffff800
-#endif
-
-
 #if defined(CONFIG_JDB) && defined(CONFIG_JDB_ACCOUNTING)
 
 #define CNT_CONTEXT_SWITCH     incl (VAL__MEM_LAYOUT__TBUF_STATUS_PAGE+ \