Changeset 8005218 in mainline

Timestamp:

2005-10-19T12:58:02Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

37e9dbd

Parents:

4b2c872d

Message:

Make context_set() reset ar.pfs.pfm (especially ar.pfs.pfm.sol) so that register stack does not underflow.

File:

• arch/ia64/include/context.h (modified) (2 diffs)

arch/ia64/include/context.h

@@ -34 +34 @@
 #include <align.h>
 
-#define STACK_ITEM_SIZE 16
-#define STACK_ALIGNMENT 16
+#define STACK_ITEM_SIZE                 16
+#define STACK_ALIGNMENT                 16
+#define REGISTER_STACK_ALIGNMENT        8
 
 /*
@@ -45 +46 @@
 #define SP_DELTA        (0+STACK_ITEM_SIZE)
 
+#define PFM_MASK        (~0x3fffffffff)
+
 #ifdef context_set
 #undef context_set
 #endif
 
-#define context_set(c, _pc, stack, size)                                                \
-        (c)->pc = (__address) _pc;                                                      \
-        (c)->bsp = ((__address) stack) + ALIGN(sizeof(the_t), STACK_ALIGNMENT);         \
+#define context_set(c, _pc, stack, size)                                                                \
+        (c)->pc = (__address) _pc;                                                                      \
+        (c)->bsp = ((__address) stack) + ALIGN(sizeof(the_t), REGISTER_STACK_ALIGNMENT);                \
+        (c)->ar_pfs &= PFM_MASK;                                                                        \
         (c)->sp = ((__address) stack) + ALIGN((size), STACK_ALIGNMENT) - SP_DELTA;