Changeset e1c68e0c in mainline

Timestamp:

2006-03-07T10:09:40Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cd373bb

Parents:

83d2d0e

Message:

ia64 work.

• Another item had to be allocated on stack to remember new value written to ar.bspstore. Fix heavyweight interruption handler to calculate RSC.loadrs from the new value of ar.bspstore instead from the old one. Uncomment instructions switching ar.bspstore.
• Configure kernel with 512M of memory.

Location:

arch/ia64

Files:

• include/interrupt.h (modified) (1 diff)
• include/mm/memory_init.h (modified) (1 diff)
• src/ivt.S (modified) (5 diffs)

arch/ia64/include/interrupt.h

@@ -50 +50 @@
         __address ar_bsp;
         __address ar_bspstore;
+        __address ar_bspstore_new;
         __u64 ar_rnat;
         __u64 ar_ifs;

arch/ia64/include/mm/memory_init.h

@@ -32 +32 @@
 #include <config.h>
 
-#define get_memory_size()       CONFIG_MEMORY_SIZE
+#define get_memory_size()       (512*1024*1024)         /* 512M */
 
 #endif

arch/ia64/src/ivt.S

@@ -33 +33 @@
 #include <align.h>
 
-#define STACK_ITEMS             13
+#define STACK_ITEMS             14
 #define STACK_FRAME_SIZE        ALIGN_UP((STACK_ITEMS*STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT)
 
@@ -142 +142 @@
         
         /* assume kernel backing store */
-        /* mov ar.bspstore = r28 ;; */
+        mov ar.bspstore = r28 ;;
         
         mov r29 = ar.bsp
         
         st8 [r31] = r27, -8 ;;  /* save ar.rnat */
+        st8 [r31] = r28, -8 ;;  /* save new value written to ar.bspstore */
         st8 [r31] = r28, -8 ;;  /* save ar.bspstore */
         st8 [r31] = r29, -8     /* save ar.bsp */
@@ -162 +163 @@
         add r31 = STACK_SCRATCH_AREA_SIZE, r12 ;;
 
-        mov r28 = ar.bspstore           /* calculate loadrs (step 2) */
-        ld8 r29 = [r31], +8 ;;          /* load ar.bsp */
-        sub r27 = r29 , r28 ;;
+        ld8 r30 = [r31], +8 ;;          /* load ar.bsp */
+        ld8 r29 = [r31], +8 ;;          /* load ar.bspstore */
+        ld8 r28 = [r31], +8 ;;          /* load ar.bspstore_new */
+        sub r27 = r30 , r28 ;;          /* calculate loadrs (step 2) */
         shl r27 = r27, 16
 
@@ -174 +176 @@
         loadrs                          /* (step 3) */
 
-        ld8 r28 = [r31], +8 ;;          /* load ar.bspstore */
         ld8 r27 = [r31], +8 ;;          /* load ar.rnat */
         ld8 r26 = [r31], +8 ;;          /* load cr.ifs */
@@ -180 +181 @@
         ld8 r24 = [r31], +8 ;;          /* load ar.rsc */
 
-        /* mov ar.bspstore = r28 ;; */  /* (step 4) */
-        /* mov ar.rnat = r27 */         /* (step 5) */
+        mov ar.bspstore = r29 ;;        /* (step 4) */
+        mov ar.rnat = r27               /* (step 5) */
 
         mov ar.pfs = r25                /* (step 6) */