Changeset 5c089c3a in mainline

Timestamp:

2006-03-13T21:20:46Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

27810c5

Parents:

631ca4d

Message:

ia64 work.
Support for SYSCALL4.
Fix user stack initial address.

Location:

arch/ia64

Files:

• include/interrupt.h (modified) (1 diff)
• src/ia64.c (modified) (2 diffs)
• src/interrupt.c (modified) (1 diff)
• src/ivt.S (modified) (2 diffs)

arch/ia64/include/interrupt.h

@@ -71 +71 @@
         __u64 in2;
         __u64 in3;
+        __u64 in4;
 } __attribute__ ((packed));
 

arch/ia64/src/ia64.c

@@ -36 +36 @@
 #include <arch/types.h>
 #include <arch/context.h>
+#include <arch/stack.h>
 #include <arch/mm/page.h>
 #include <mm/as.h>
@@ -84 +85 @@
         rsc.mode = 3;                           /* eager mode */
 
-        switch_to_userspace(entry, USTACK_ADDRESS+PAGE_SIZE-1, USTACK_ADDRESS, psr.value, rsc.value);
+        switch_to_userspace(entry, USTACK_ADDRESS+PAGE_SIZE-ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT), USTACK_ADDRESS, psr.value, rsc.value);
 
         while (1) {

arch/ia64/src/interrupt.c

@@ -187 +187 @@
         }
 
-        if (istate->in3 < SYSCALL_END)
-                return syscall_table[istate->in3](istate->in0, istate->in1, istate->in2);
+        if (istate->in4 < SYSCALL_END)
+                return syscall_table[istate->in4](istate->in0, istate->in1, istate->in2, istate->in3);
         else
-                panic("Undefined syscall %d", istate->in3);
+                panic("Undefined syscall %d", istate->in4);
                 
         return -1;

arch/ia64/src/ivt.S

@@ -33 +33 @@
 #include <align.h>
 
-#define STACK_ITEMS             18
+#define STACK_ITEMS             19
 #define STACK_FRAME_SIZE        ALIGN_UP((STACK_ITEMS*STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT)
 
@@ -131 +131 @@
          * Note that p5 is a preserved predicate register and we make use of it.
          */
-        
+
+(p6)    st8 [r31] = r36, -8 ;;          /* save in4 */  
 (p6)    st8 [r31] = r35, -8 ;;          /* save in3 */
 (p6)    st8 [r31] = r34, -8 ;;          /* save in2 */
 (p6)    st8 [r31] = r33, -8 ;;          /* save in1 */
 (p6)    st8 [r31] = r32, -8 ;;          /* save in0 */
-(p5)    add r31 = -32, r31 ;;
+(p5)    add r31 = -40, r31 ;;
     
         st8 [r31] = r30, -8 ;;          /* save old stack pointer */