Changeset a82500ce in mainline

Timestamp:

2006-03-12T17:32:01Z (19 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

de6b301

Parents:

12f952e5

Message:

Two frame stack (standard stack + RSE) on Itanium

Files:

• arch/ia64/include/mm/frame.h (modified) (1 diff)
• arch/ia64/src/mm/tlb.c (modified) (1 diff)
• arch/ia64/src/proc/scheduler.c (modified) (1 diff)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/proc/thread.c (modified) (1 diff)

arch/ia64/include/mm/frame.h

@@ -30 +30 @@
 #define __ia64_FRAME_H__
 
-/*
- * Frame is defined to be 64K long.
- * Such a relatively big frame size is used because of kernel stack requirements
- * and organization. Portion of the stack reserved for RSE must be at least 16K
- * long. If the memory stack is to have some space allocated, the next available
- * frame size (i.e. 64K) needs to be used.
- */
-#define FRAME_WIDTH   16        /* 64K */
+#define FRAME_WIDTH   14        /* 64K */
 #define FRAME_SIZE              (1<<FRAME_WIDTH)
 
 extern void frame_arch_init(void);
 
+
+#define ARCH_STACK_FRAMES TWO_FRAMES
+
 #endif

arch/ia64/src/mm/tlb.c

@@ -89 +89 @@
 {
         /* TODO */
-}
+        tlb_invalidate_all();
+}
+
+
+void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt)
+{
+
+
+}
+
 
 /** Insert data into data translation cache.

arch/ia64/src/proc/scheduler.c

@@ -63 +63 @@
                 "bsw.1\n"
                 :
-                : "r" (((__address) THREAD->kstack) + ALIGN_UP(sizeof(the_t), REGISTER_STACK_ALIGNMENT)),
-                  "r" (&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA]));
+                : /*"r" (((__address) THREAD->kstack) + ALIGN_UP(sizeof(the_t), REGISTER_STACK_ALIGNMENT)),*/
+                  "r" (&THREAD->kstack[THREAD_STACK_SIZE]),
+                  "r" (&THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA])
+                );
 }
 

generic/include/mm/frame.h

@@ -37 +37 @@
 #include <mm/buddy.h>
 #include <arch/mm/page.h>
+#include <arch/mm/frame.h>
 
 #define ONE_FRAME       0
+#define TWO_FRAMES      1
+
+#ifdef ARCH_STACK_FRAMES
+#define STACK_FRAMES ARCH_STACK_FRAMES
+#else
+#define STACK_FRAMES ONE_FRAME
+#endif
+
 
 #define ZONES_MAX       16      /**< Maximum number of zones in system */

generic/src/proc/thread.c

@@ -117 +117 @@
 #endif  
 
-        pfn = frame_alloc_rc(ONE_FRAME, FRAME_KA | kmflags,&status);
+        pfn = frame_alloc_rc(STACK_FRAMES, FRAME_KA | kmflags,&status);
         if (status) {
 #ifdef ARCH_HAS_FPU