Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 40239b9 in mainline


Ignore:
Timestamp:
2010-05-22T19:04:16Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
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:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/sparc64/include/atomic.h

    r0d9dc6b r40239b9  
    135135                        "brz %2, 0b\n"
    136136                        "nop\n"
    137                         "ba %%xcc, 1b\n"
    138                         "nop\n"
     137                        "ba,a %%xcc, 1b\n"
    139138                "2:\n"
    140139                : "+m" (*((atomic_count_t *) ptr)),
  • kernel/arch/sparc64/src/trap/sun4u/trap_table.S

    r0d9dc6b r40239b9  
    481481        be %xcc, 1f
    482482        nop
    483 0:      ba %xcc, 0b                             ! this is for debugging, if we ever get here
    484         nop                                     ! it will be easy to find
     483        ! this is for debugging, if we ever get here it will be easy to find
     4840:      ba,a %xcc, 0b
    485485
    4864861:
     
    546546
    547547.if NOT(\is_syscall)
    548         ba %xcc, 1f
    549         nop
     548        ba,a %xcc, 1f
    5505490:
    551550        save %sp, -PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE, %sp
  • kernel/arch/sparc64/src/trap/sun4v/trap_table.S

    r0d9dc6b r40239b9  
    7171.org trap_table + TT_INSTRUCTION_ACCESS_MMU_MISS*ENTRY_SIZE
    7272.global instruction_access_mmu_miss_handler_tl0
    73         ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
    74         nop
     73        ba,a %xcc, fast_instruction_access_mmu_miss_handler_tl0
    7574
    7675/* TT = 0x0a, TL = 0, instruction_access_error */
     
    187186.global data_access_mmu_miss_tl0
    188187data_access_mmu_miss_tl0:
    189         ba %xcc, fast_data_access_mmu_miss_handler_tl0
    190         nop
     188        ba,a %xcc, fast_data_access_mmu_miss_handler_tl0
    191189
    192190/* TT = 0x32, TL = 0, data_access_error */
     
    414412.global instruction_access_mmu_miss_handler_tl1
    415413        wrpr %g0, 1, %tl
    416         ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
    417         nop
     414        ba,a %xcc, fast_instruction_access_mmu_miss_handler_tl0
    418415
    419416/* TT = 0x0a, TL > 0, instruction_access_error */
     
    498495.global data_access_mmu_miss_tl1
    499496data_access_mmu_miss_tl1:
    500         ba %xcc, fast_data_access_mmu_miss_handler_tl1
    501         nop
    502 
     497        ba,a %xcc, fast_data_access_mmu_miss_handler_tl1
    503498
    504499/* TT = 0x32, TL > 0, data_access_error */
     
    742737        rdpr %cwp, %l1
    743738        cmp %l0, %l1
    744         bz 4f                           ! CWP is ok
     739        bz %xcc, 4f                     ! CWP is ok
    745740        nop
    746741
     
    785780        rdpr %tl, %g3
    786781        cmp %g3, 1
    787         be 1f
     782        be %xcc, 1f
    788783        nop
    789 0:      ba %xcc, 0b                             ! this is for debugging, if we ever get here
    790         nop                                     ! it will be easy to find
     784
     785        ! this is for debugging, if we ever get here it will be easy to find
     7860:      ba,a %xcc, 0b
    791787
    7927881:
     
    957953        clr %g4
    9589545:      andcc %g7, UWB_ALIGNMENT - 1, %g0       ! alignment check
    959         bz 6f                                   ! %g7 is UWB_ALIGNMENT-aligned, no more windows to refill
     955        bz %xcc, 6f                             ! %g7 is UWB_ALIGNMENT-aligned, no more windows to refill
    960956        nop
    961957
     
    10661062
    10671063        PREEMPTIBLE_HANDLER_KERNEL
    1068         ba %xcc, 101f
    1069         nop
     1064        ba,a %xcc, 101f
    10701065
    10711066        100:
Note: See TracChangeset for help on using the changeset viewer.