Changeset 17a20bc in mainline

Timestamp:

2005-11-07T13:47:17Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

83817ea

Parents:

77593a76

Message:

ia64 work.
Do not break memory stack alignment in heavyweight interrupt handler.
Reserve scratch area for nested procedure calls on memory stack.

Location:

arch/ia64

Files:

• include/context.h (modified) (1 diff)
• include/stack.h (added)
• src/ivt.S (modified) (4 diffs)

arch/ia64/include/context.h

@@ -33 +33 @@
 #include <typedefs.h>
 #include <align.h>
-
-#define STACK_ITEM_SIZE                 16
-#define STACK_ALIGNMENT                 16
-#define REGISTER_STACK_ALIGNMENT        8
+#include <arch/stack.h>
 
 /*

arch/ia64/src/ivt.S

@@ -27 +27 @@
 #
 
+#include <arch/stack.h>
+
+#define STACK_ITEMS             12
+#define STACK_FRAME_SIZE        ((STACK_ITEMS*STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE)
+
+#if (STACK_FRAME_SIZE % STACK_ALIGNMENT != 0)
+#error Memory stack must be 16-byte aligned.
+#endif
 
 /** Heavyweight interrupt handler
@@ -58 +66 @@
         
     /* 4. save registers in bank 0 into memory stack */
-        add r12 = -8, r12 ;;
-        
-        st8 [r12] = r29, -8 ;;  /* save predicate registers */
-
-        st8 [r12] = r24, -8 ;;  /* save cr.iip */
-        st8 [r12] = r25, -8 ;;  /* save cr.ipsr */
-        st8 [r12] = r26, -8 ;;  /* save cr.iipa */
-        st8 [r12] = r27, -8 ;;  /* save cr.isr */
-        st8 [r12] = r28, -8 ;;  /* save cr.ifa */               
+        add r31 = -8, r12 ;;
+        add r12 = -STACK_FRAME_SIZE, r12 ;;
+        
+        st8 [r31] = r29, -8 ;;  /* save predicate registers */
+
+        st8 [r31] = r24, -8 ;;  /* save cr.iip */
+        st8 [r31] = r25, -8 ;;  /* save cr.ipsr */
+        st8 [r31] = r26, -8 ;;  /* save cr.iipa */
+        st8 [r31] = r27, -8 ;;  /* save cr.isr */
+        st8 [r31] = r28, -8 ;;  /* save cr.ifa */               
 
     /* 5. RSE switch from interrupted context */
@@ -75 +84 @@
         mov r26 = cr.ifs
         
-        st8 [r12] = r24, -8     /* save ar.rsc */
-        st8 [r12] = r25, -8     /* save ar.pfs */
-        st8 [r12] = r26, -8     /* save ar.ifs */
+        st8 [r31] = r24, -8     /* save ar.rsc */
+        st8 [r31] = r25, -8     /* save ar.pfs */
+        st8 [r31] = r26, -8     /* save ar.ifs */
         
         and r30 = ~3, r24
@@ -90 +99 @@
         mov r29 = ar.bsp
         
-        st8 [r12] = r27, -8     /* save ar.rnat */
-        st8 [r12] = r28, -8     /* save ar.bspstore */
-        st8 [r12] = r29         /* save ar.bsp */
+        st8 [r31] = r27, -8     /* save ar.rnat */
+        st8 [r31] = r28, -8     /* save ar.bspstore */
+        st8 [r31] = r29         /* save ar.bsp */
         
         mov ar.rsc = r24        /* restore RSE's setting */