Changeset ee454eb in mainline for kernel/arch/sparc64/src/proc/scheduler.c

Timestamp:

2006-08-30T15:50:29Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

beb3926a

Parents:

e11ae91

Message:

sparc64 work.
More bits needed to reach the userspace milestone were added.
The preemptible_handler(), still a prototype, now contains all functionality it needs.
Some sanitation was added to functions expecting page-aligned pointers to
userspace window buffer.

File:

• kernel/arch/sparc64/src/proc/scheduler.c (modified) (3 diffs)

kernel/arch/sparc64/src/proc/scheduler.c

@@ -79 +79 @@
                  */
                 ASSERT(THREAD->arch.uspace_window_buffer);
-                uintptr_t uw_buf = (uintptr_t) THREAD->arch.uspace_window_buffer;
+                uintptr_t uw_buf = ALIGN_DOWN((uintptr_t) THREAD->arch.uspace_window_buffer, PAGE_SIZE);
                 if (!overlaps(uw_buf, PAGE_SIZE, base, 1<<KERNEL_PAGE_WIDTH)) {
                         /*
                          * The buffer is not covered by the 4M locked kernel DTLB entry.
                          */
-                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (uintptr_t) uw_buf);
+                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, uw_buf);
                         dtlb_insert_mapping(uw_buf, KA2PA(uw_buf), PAGESIZE_8K, true, true);
                 }
@@ -127 +127 @@
                 flushw();       /* force all userspace windows into memory */
                 
-                uintptr_t uw_buf = (uintptr_t) THREAD->arch.uspace_window_buffer;
+                uintptr_t uw_buf = ALIGN_DOWN((uintptr_t) THREAD->arch.uspace_window_buffer, PAGE_SIZE);
                 if (!overlaps(uw_buf, PAGE_SIZE, base, 1<<KERNEL_PAGE_WIDTH)) {
                         /*
@@ -134 +134 @@
                          * Demap it.
                          */
-                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, (uintptr_t) uw_buf);
+                        dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_NUCLEUS, uw_buf);
                 }