Changeset 0242621 in mainline


Ignore:
Timestamp:
2010-05-21T22:57:52Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
71d0d737, 7c8e1e1
Parents:
819a768
Message:

Use proper SPARC V9 branch instructions.

Location:
kernel/arch/sparc64/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/src/sun4v/start.S

    r819a768 r0242621  
    219219        ! on APs skip executing the following code
    220220        cmp %l7, 0
    221         be 1f
     221        be %xcc, 1f
    222222        nop
    223223
    … …  
    260260
    2612610:
    262         ba 0b
     262        ba %xcc, 0b
    263263        nop
    264264
    … …  
    295295        /* Not reached. */
    2962960:
    297         ba 0b
     297        ba %xcc, 0b
    298298        nop
    299299
    … …  
    314314before_ap_boots:
    315315        setx 0x80400000, %g0, %o0
    316         ba kernel_image_start
     316        ba %xcc, kernel_image_start
    317317        nop
    318318

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

    r819a768 r0242621  
    7171.org trap_table + TT_INSTRUCTION_ACCESS_MMU_MISS*ENTRY_SIZE
    7272.global instruction_access_mmu_miss_handler_tl0
    73         ba fast_instruction_access_mmu_miss_handler_tl0
     73        ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
    7474        nop
    7575
    … …  
    187187.global data_access_mmu_miss_tl0
    188188data_access_mmu_miss_tl0:
    189         ba fast_data_access_mmu_miss_handler_tl0
     189        ba %xcc, fast_data_access_mmu_miss_handler_tl0
    190190        nop
    191191
    … …  
    394394.global trap_instruction_\cur\()_tl0
    395395trap_instruction_\cur\()_tl0:
    396         ba trap_instruction_handler
     396        ba %xcc, trap_instruction_handler
    397397        mov \cur, %g2
    398398.endr
    … …  
    414414.global instruction_access_mmu_miss_handler_tl1
    415415        wrpr %g0, 1, %tl
    416         ba fast_instruction_access_mmu_miss_handler_tl0
     416        ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
    417417        nop
    418418
    … …  
    498498.global data_access_mmu_miss_tl1
    499499data_access_mmu_miss_tl1:
    500         ba fast_data_access_mmu_miss_handler_tl1
     500        ba %xcc, fast_data_access_mmu_miss_handler_tl1
    501501        nop
    502502
    … …  
    787787        be 1f
    788788        nop
    789 0:      ba 0b                                   ! this is for debugging, if we ever get here
     7890:      ba %xcc, 0b                             ! this is for debugging, if we ever get here
    790790        nop                                     ! it will be easy to find
    791791
    … …  
    982982        wrpr %g3, 0, %cwp                       ! switch to the preceeding window
    983983
    984         ba 5b
     984        ba %xcc, 5b
    985985        inc %g4
    986986
    … …  
    10661066
    10671067        PREEMPTIBLE_HANDLER_KERNEL
    1068         ba 101f
     1068        ba %xcc, 101f
    10691069        nop
    10701070
Note: See TracChangeset for help on using the changeset viewer.