Changeset 6843a9c in mainline for uspace/lib/c/arch/ia64/include/fibril.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/lib/c/arch/ia64/include/fibril.h (modified) (2 diffs)

uspace/lib/c/arch/ia64/include/fibril.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcia64        
+/** @addtogroup libcia64
  * @{
  */
@@ -45 +45 @@
  * No need to allocate scratch area.
  */
-#define SP_DELTA        (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
+#define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
-#define PFM_MASK        (~0x3fffffffff)
+#define PFM_MASK  (~0x3fffffffff)
 
-#define PSTHREAD_INITIAL_STACK_PAGES_NO 2
 /* Stack is divided into two equal parts (for memory stack and register stack). */
-#define PSTHREAD_INITIAL_STACK_DIVISION 2  
+#define FIBRIL_INITIAL_STACK_DIVISION  2
 
-#define context_set(c, _pc, stack, size, tls)                                                           \
-        do {                                                                                            \
-                (c)->pc = (uint64_t) _pc;                                                               \
-                (c)->bsp = ((uint64_t) stack) + size / PSTHREAD_INITIAL_STACK_DIVISION;                                                         \
-                (c)->ar_pfs &= PFM_MASK;                                                                \
-                (c)->sp = ((uint64_t) stack) + ALIGN_UP((size / PSTHREAD_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - SP_DELTA;          \
-                (c)->tp = (uint64_t) tls;                                                               \
-        } while (0);
-        
+#define context_set(c, _pc, stack, size, tls) \
+        do { \
+                (c)->pc = (uint64_t) _pc; \
+                (c)->bsp = ((uint64_t) stack) + \
+                    size / FIBRIL_INITIAL_STACK_DIVISION; \
+                (c)->ar_pfs &= PFM_MASK; \
+                (c)->sp = ((uint64_t) stack) + \
+                    ALIGN_UP((size / FIBRIL_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \
+                    SP_DELTA; \
+                (c)->tp = (uint64_t) tls; \
+        } while (0)
 
 /*