Changeset 40239b9 in mainline

Timestamp:

2010-05-22T19:04:16Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4bd675d

Parents:

0d9dc6b

Message:

Fix a couple of occurrences of obsolete branch instruction with proper SPARC V9
branches. More dispensable NOP instructions killed.

Location:

kernel/arch/sparc64

Files:

• include/atomic.h (modified) (1 diff)
• src/trap/sun4u/trap_table.S (modified) (2 diffs)
• src/trap/sun4v/trap_table.S (modified) (8 diffs)

kernel/arch/sparc64/include/atomic.h

@@ -135 +135 @@
                         "brz %2, 0b\n"
                         "nop\n"
-                        "ba %%xcc, 1b\n"
-                        "nop\n"
+                        "ba,a %%xcc, 1b\n"
                 "2:\n"
                 : "+m" (*((atomic_count_t *) ptr)),

kernel/arch/sparc64/src/trap/sun4u/trap_table.S

@@ -481 +481 @@
         be %xcc, 1f
         nop
-0:      ba %xcc, 0b                             ! this is for debugging, if we ever get here
-        nop                                     ! it will be easy to find
+        ! this is for debugging, if we ever get here it will be easy to find
+0:      ba,a %xcc, 0b
 
 1:
@@ -546 +546 @@
 
 .if NOT(\is_syscall)
-        ba %xcc, 1f
-        nop
+        ba,a %xcc, 1f
 0:
         save %sp, -PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE, %sp

kernel/arch/sparc64/src/trap/sun4v/trap_table.S

@@ -71 +71 @@
 .org trap_table + TT_INSTRUCTION_ACCESS_MMU_MISS*ENTRY_SIZE
 .global instruction_access_mmu_miss_handler_tl0
-        ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
-        nop
+        ba,a %xcc, fast_instruction_access_mmu_miss_handler_tl0
 
 /* TT = 0x0a, TL = 0, instruction_access_error */
@@ -187 +186 @@
 .global data_access_mmu_miss_tl0
 data_access_mmu_miss_tl0:
-        ba %xcc, fast_data_access_mmu_miss_handler_tl0
-        nop
+        ba,a %xcc, fast_data_access_mmu_miss_handler_tl0
 
 /* TT = 0x32, TL = 0, data_access_error */
@@ -414 +412 @@
 .global instruction_access_mmu_miss_handler_tl1
         wrpr %g0, 1, %tl
-        ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
-        nop
+        ba,a %xcc, fast_instruction_access_mmu_miss_handler_tl0
 
 /* TT = 0x0a, TL > 0, instruction_access_error */
@@ -498 +495 @@
 .global data_access_mmu_miss_tl1
 data_access_mmu_miss_tl1:
-        ba %xcc, fast_data_access_mmu_miss_handler_tl1
-        nop
-
+        ba,a %xcc, fast_data_access_mmu_miss_handler_tl1
 
 /* TT = 0x32, TL > 0, data_access_error */
@@ -742 +737 @@
         rdpr %cwp, %l1
         cmp %l0, %l1
-        bz 4f                           ! CWP is ok
+        bz %xcc, 4f                     ! CWP is ok
         nop
 
@@ -785 +780 @@
         rdpr %tl, %g3
         cmp %g3, 1
-        be 1f
+        be %xcc, 1f
         nop
-0:      ba %xcc, 0b                             ! this is for debugging, if we ever get here
-        nop                                     ! it will be easy to find
+
+        ! this is for debugging, if we ever get here it will be easy to find
+0:      ba,a %xcc, 0b
 
 1:
@@ -957 +953 @@
         clr %g4
 5:      andcc %g7, UWB_ALIGNMENT - 1, %g0       ! alignment check
-        bz 6f                                   ! %g7 is UWB_ALIGNMENT-aligned, no more windows to refill
+        bz %xcc, 6f                             ! %g7 is UWB_ALIGNMENT-aligned, no more windows to refill
         nop
 
@@ -1066 +1062 @@
 
         PREEMPTIBLE_HANDLER_KERNEL
-        ba %xcc, 101f
-        nop
+        ba,a %xcc, 101f
 
         100: