Changeset cfa70add in mainline for kernel/arch/sparc64/include

Timestamp:

2006-09-03T23:37:14Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fd85ae5

Parents:

002e613

Message:

sparc64 update.

• Prototype userspace layer implementation that at least relates to sparc64 and compiles cleanly.
• Fixes for kernel's preemptible_handler and code related to running userspace.
• Enable userspace. Several dozen instructions are now run in userspace! We are pretty near the userspace milestone for sparc64.

Location:

kernel/arch/sparc64/include

Files:

• asm.h (modified) (1 diff)
• mm/as.h (modified) (1 diff)
• mm/tlb.h (modified) (1 diff)
• trap/mmu.h (modified) (1 diff)

kernel/arch/sparc64/include/asm.h

@@ -331 +331 @@
 extern void write_to_ig_g6(uint64_t val);
 
-extern void switch_to_userspace(uint64_t pc, uint64_t sp);
+extern void switch_to_userspace(uint64_t pc, uint64_t sp, uint64_t uarg);
 
 #endif

kernel/arch/sparc64/include/mm/as.h

@@ -43 +43 @@
 #define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0xffffffffffffffff
 
-#define USTACK_ADDRESS_ARCH     (0x7fffffffffffffff-(PAGE_SIZE-1))
+#define USTACK_ADDRESS_ARCH     (0xffffffffffffffffULL-(PAGE_SIZE-1))
 
 extern void as_arch_init(void);

kernel/arch/sparc64/include/mm/tlb.h

@@ -180 +180 @@
 static inline void mmu_secondary_context_write(uint64_t v)
 {
-        asi_u64_write(ASI_DMMU, VA_PRIMARY_CONTEXT_REG, v);
+        asi_u64_write(ASI_DMMU, VA_SECONDARY_CONTEXT_REG, v);
         flush();
 }

kernel/arch/sparc64/include/trap/mmu.h

@@ -128 +128 @@
 .macro HANDLE_MMU_TRAPS_FROM_SPILL_OR_FILL
         rdpr %tl, %g1
-        dec %g1
-        brz %g1, 0f                     ! if TL was 1, skip
+        sub %g1, 1, %g2
+        brz %g2, 0f                     ! if TL was 1, skip
         nop
-        wrpr %g1, 0, %tl                ! TL--
-        rdpr %tt, %g2
-        cmp %g2, TT_SPILL_1_NORMAL
-        be 0f                           ! trap from spill_1_normal
-        cmp %g2, TT_FILL_1_NORMAL
-        be 0f                           ! trap from fill_1_normal
-        inc %g1
-        wrpr %g1, 0, %tl                ! another trap, TL++
+        wrpr %g2, 0, %tl                ! TL--
+        rdpr %tt, %g3
+        cmp %g3, TT_SPILL_1_NORMAL
+        be 0f                           ! trap from spill_1_normal?
+        cmp %g3, TT_FILL_1_NORMAL
+        bne,a 0f                        ! trap from fill_1_normal? (negated condition)
+        wrpr %g1, 0, %tl                ! TL++
 0:
 .endm