Changeset cfa70add in mainline for kernel/arch/sparc64/include/trap/mmu.h

Timestamp:

2006-09-03T23:37:14Z (18 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.

File:

• kernel/arch/sparc64/include/trap/mmu.h (modified) (1 diff)

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