Changeset ab936440 in mainline for uspace/lib/c/arch/ia64/src/fibril.S


Ignore:
Timestamp:
2019-02-12T20:42:42Z (6 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f31ca47
Parents:
7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)
git-committer:
Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)
Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/ia64/src/fibril.S

    r7f7817a9 rab936440  
    3232.text
    3333
    34 FUNCTION_BEGIN(__setjmp)
     34FUNCTION_BEGIN(__context_save)
    3535        alloc loc0 = ar.pfs, 1, 49, 0, 0
    3636        mov loc1 = ar.unat ;;
     
    5858        mov loc6 = ar.lc
    5959
    60         add loc8 = CONTEXT_OFFSET_AR_PFS, in0
    61         add loc9 = CONTEXT_OFFSET_AR_UNAT_CALLER, in0
    62         add loc10 = CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
    63         add loc11 = CONTEXT_OFFSET_AR_RSC, in0
    64         add loc12 = CONTEXT_OFFSET_BSP, in0
    65         add loc13 = CONTEXT_OFFSET_AR_RNAT, in0
    66         add loc14 = CONTEXT_OFFSET_AR_LC, in0
    67 
    68         add loc15 = CONTEXT_OFFSET_R1, in0
    69         add loc16 = CONTEXT_OFFSET_R4, in0
    70         add loc17 = CONTEXT_OFFSET_R5, in0
    71         add loc18 = CONTEXT_OFFSET_R6, in0
    72         add loc19 = CONTEXT_OFFSET_R7, in0
    73         add loc20 = CONTEXT_OFFSET_SP, in0
    74         add loc21 = CONTEXT_OFFSET_TP, in0
    75 
    76         add loc22 = CONTEXT_OFFSET_PC, in0
    77         add loc23 = CONTEXT_OFFSET_B1, in0
    78         add loc24 = CONTEXT_OFFSET_B2, in0
    79         add loc25 = CONTEXT_OFFSET_B3, in0
    80         add loc26 = CONTEXT_OFFSET_B4, in0
    81         add loc27 = CONTEXT_OFFSET_B5, in0
    82 
    83         add loc28 = CONTEXT_OFFSET_PR, in0
    84 
    85         add loc29 = CONTEXT_OFFSET_F2, in0
    86         add loc30 = CONTEXT_OFFSET_F3, in0
    87         add loc31 = CONTEXT_OFFSET_F4, in0
    88         add loc32 = CONTEXT_OFFSET_F5, in0
    89 
    90         add loc33 = CONTEXT_OFFSET_F16, in0
    91         add loc34 = CONTEXT_OFFSET_F17, in0
    92         add loc35 = CONTEXT_OFFSET_F18, in0
    93         add loc36 = CONTEXT_OFFSET_F19, in0
    94         add loc37 = CONTEXT_OFFSET_F20, in0
    95         add loc38 = CONTEXT_OFFSET_F21, in0
    96         add loc39 = CONTEXT_OFFSET_F22, in0
    97         add loc40 = CONTEXT_OFFSET_F23, in0
    98         add loc41 = CONTEXT_OFFSET_F24, in0
    99         add loc42 = CONTEXT_OFFSET_F25, in0
    100         add loc43 = CONTEXT_OFFSET_F26, in0
    101         add loc44 = CONTEXT_OFFSET_F27, in0
    102         add loc45 = CONTEXT_OFFSET_F28, in0
    103         add loc46 = CONTEXT_OFFSET_F29, in0
    104         add loc47 = CONTEXT_OFFSET_F30, in0
    105         add loc48 = CONTEXT_OFFSET_F31, in0 ;;
     60        add loc8 = __CONTEXT_OFFSET_AR_PFS, in0
     61        add loc9 = __CONTEXT_OFFSET_AR_UNAT_CALLER, in0
     62        add loc10 = __CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
     63        add loc11 = __CONTEXT_OFFSET_AR_RSC, in0
     64        add loc12 = __CONTEXT_OFFSET_BSP, in0
     65        add loc13 = __CONTEXT_OFFSET_AR_RNAT, in0
     66        add loc14 = __CONTEXT_OFFSET_AR_LC, in0
     67
     68        add loc15 = __CONTEXT_OFFSET_R1, in0
     69        add loc16 = __CONTEXT_OFFSET_R4, in0
     70        add loc17 = __CONTEXT_OFFSET_R5, in0
     71        add loc18 = __CONTEXT_OFFSET_R6, in0
     72        add loc19 = __CONTEXT_OFFSET_R7, in0
     73        add loc20 = __CONTEXT_OFFSET_SP, in0
     74        add loc21 = __CONTEXT_OFFSET_TP, in0
     75
     76        add loc22 = __CONTEXT_OFFSET_PC, in0
     77        add loc23 = __CONTEXT_OFFSET_B1, in0
     78        add loc24 = __CONTEXT_OFFSET_B2, in0
     79        add loc25 = __CONTEXT_OFFSET_B3, in0
     80        add loc26 = __CONTEXT_OFFSET_B4, in0
     81        add loc27 = __CONTEXT_OFFSET_B5, in0
     82
     83        add loc28 = __CONTEXT_OFFSET_PR, in0
     84
     85        add loc29 = __CONTEXT_OFFSET_F2, in0
     86        add loc30 = __CONTEXT_OFFSET_F3, in0
     87        add loc31 = __CONTEXT_OFFSET_F4, in0
     88        add loc32 = __CONTEXT_OFFSET_F5, in0
     89
     90        add loc33 = __CONTEXT_OFFSET_F16, in0
     91        add loc34 = __CONTEXT_OFFSET_F17, in0
     92        add loc35 = __CONTEXT_OFFSET_F18, in0
     93        add loc36 = __CONTEXT_OFFSET_F19, in0
     94        add loc37 = __CONTEXT_OFFSET_F20, in0
     95        add loc38 = __CONTEXT_OFFSET_F21, in0
     96        add loc39 = __CONTEXT_OFFSET_F22, in0
     97        add loc40 = __CONTEXT_OFFSET_F23, in0
     98        add loc41 = __CONTEXT_OFFSET_F24, in0
     99        add loc42 = __CONTEXT_OFFSET_F25, in0
     100        add loc43 = __CONTEXT_OFFSET_F26, in0
     101        add loc44 = __CONTEXT_OFFSET_F27, in0
     102        add loc45 = __CONTEXT_OFFSET_F28, in0
     103        add loc46 = __CONTEXT_OFFSET_F29, in0
     104        add loc47 = __CONTEXT_OFFSET_F30, in0
     105        add loc48 = __CONTEXT_OFFSET_F31, in0 ;;
    106106
    107107        /*
     
    178178        mov ar.unat = loc1
    179179
    180         mov r8 = 0      /* __setjmp returns 0 */
     180        mov r8 = 0      /* __context_save returns 0 */
    181181        br.ret.sptk.many b0
    182 FUNCTION_END(__setjmp)
    183 
    184 FUNCTION_BEGIN(__longjmp)
     182FUNCTION_END(__context_save)
     183
     184FUNCTION_BEGIN(__context_restore)
    185185        alloc loc0 = ar.pfs, 2, 50, 0, 0 ;;
    186186
    187         add loc9 = CONTEXT_OFFSET_AR_PFS, in0
    188         add loc10 = CONTEXT_OFFSET_AR_UNAT_CALLER, in0
    189         add loc11 = CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
    190         add loc12 = CONTEXT_OFFSET_AR_RSC, in0
    191         add loc13 = CONTEXT_OFFSET_BSP, in0
    192         add loc14 = CONTEXT_OFFSET_AR_RNAT, in0
    193         add loc15 = CONTEXT_OFFSET_AR_LC, in0
    194 
    195         add loc16 = CONTEXT_OFFSET_R1, in0
    196         add loc17 = CONTEXT_OFFSET_R4, in0
    197         add loc18 = CONTEXT_OFFSET_R5, in0
    198         add loc19 = CONTEXT_OFFSET_R6, in0
    199         add loc20 = CONTEXT_OFFSET_R7, in0
    200         add loc21 = CONTEXT_OFFSET_SP, in0
    201         add loc22 = CONTEXT_OFFSET_TP, in0
    202 
    203         add loc23 = CONTEXT_OFFSET_PC, in0
    204         add loc24 = CONTEXT_OFFSET_B1, in0
    205         add loc25 = CONTEXT_OFFSET_B2, in0
    206         add loc26 = CONTEXT_OFFSET_B3, in0
    207         add loc27 = CONTEXT_OFFSET_B4, in0
    208         add loc28 = CONTEXT_OFFSET_B5, in0
    209 
    210         add loc29 = CONTEXT_OFFSET_PR, in0
    211 
    212         add loc30 = CONTEXT_OFFSET_F2, in0
    213         add loc31 = CONTEXT_OFFSET_F3, in0
    214         add loc32 = CONTEXT_OFFSET_F4, in0
    215         add loc33 = CONTEXT_OFFSET_F5, in0
    216 
    217         add loc34 = CONTEXT_OFFSET_F16, in0
    218         add loc35 = CONTEXT_OFFSET_F17, in0
    219         add loc36 = CONTEXT_OFFSET_F18, in0
    220         add loc37 = CONTEXT_OFFSET_F19, in0
    221         add loc38 = CONTEXT_OFFSET_F20, in0
    222         add loc39 = CONTEXT_OFFSET_F21, in0
    223         add loc40 = CONTEXT_OFFSET_F22, in0
    224         add loc41 = CONTEXT_OFFSET_F23, in0
    225         add loc42 = CONTEXT_OFFSET_F24, in0
    226         add loc43 = CONTEXT_OFFSET_F25, in0
    227         add loc44 = CONTEXT_OFFSET_F26, in0
    228         add loc45 = CONTEXT_OFFSET_F27, in0
    229         add loc46 = CONTEXT_OFFSET_F28, in0
    230         add loc47 = CONTEXT_OFFSET_F29, in0
    231         add loc48 = CONTEXT_OFFSET_F30, in0
    232         add loc49 = CONTEXT_OFFSET_F31, in0 ;;
     187        add loc9 = __CONTEXT_OFFSET_AR_PFS, in0
     188        add loc10 = __CONTEXT_OFFSET_AR_UNAT_CALLER, in0
     189        add loc11 = __CONTEXT_OFFSET_AR_UNAT_CALLEE, in0
     190        add loc12 = __CONTEXT_OFFSET_AR_RSC, in0
     191        add loc13 = __CONTEXT_OFFSET_BSP, in0
     192        add loc14 = __CONTEXT_OFFSET_AR_RNAT, in0
     193        add loc15 = __CONTEXT_OFFSET_AR_LC, in0
     194
     195        add loc16 = __CONTEXT_OFFSET_R1, in0
     196        add loc17 = __CONTEXT_OFFSET_R4, in0
     197        add loc18 = __CONTEXT_OFFSET_R5, in0
     198        add loc19 = __CONTEXT_OFFSET_R6, in0
     199        add loc20 = __CONTEXT_OFFSET_R7, in0
     200        add loc21 = __CONTEXT_OFFSET_SP, in0
     201        add loc22 = __CONTEXT_OFFSET_TP, in0
     202
     203        add loc23 = __CONTEXT_OFFSET_PC, in0
     204        add loc24 = __CONTEXT_OFFSET_B1, in0
     205        add loc25 = __CONTEXT_OFFSET_B2, in0
     206        add loc26 = __CONTEXT_OFFSET_B3, in0
     207        add loc27 = __CONTEXT_OFFSET_B4, in0
     208        add loc28 = __CONTEXT_OFFSET_B5, in0
     209
     210        add loc29 = __CONTEXT_OFFSET_PR, in0
     211
     212        add loc30 = __CONTEXT_OFFSET_F2, in0
     213        add loc31 = __CONTEXT_OFFSET_F3, in0
     214        add loc32 = __CONTEXT_OFFSET_F4, in0
     215        add loc33 = __CONTEXT_OFFSET_F5, in0
     216
     217        add loc34 = __CONTEXT_OFFSET_F16, in0
     218        add loc35 = __CONTEXT_OFFSET_F17, in0
     219        add loc36 = __CONTEXT_OFFSET_F18, in0
     220        add loc37 = __CONTEXT_OFFSET_F19, in0
     221        add loc38 = __CONTEXT_OFFSET_F20, in0
     222        add loc39 = __CONTEXT_OFFSET_F21, in0
     223        add loc40 = __CONTEXT_OFFSET_F22, in0
     224        add loc41 = __CONTEXT_OFFSET_F23, in0
     225        add loc42 = __CONTEXT_OFFSET_F24, in0
     226        add loc43 = __CONTEXT_OFFSET_F25, in0
     227        add loc44 = __CONTEXT_OFFSET_F26, in0
     228        add loc45 = __CONTEXT_OFFSET_F27, in0
     229        add loc46 = __CONTEXT_OFFSET_F28, in0
     230        add loc47 = __CONTEXT_OFFSET_F29, in0
     231        add loc48 = __CONTEXT_OFFSET_F30, in0
     232        add loc49 = __CONTEXT_OFFSET_F31, in0 ;;
    233233
    234234        ld8 loc0 = [loc9]       /* load ar.pfs */
     
    335335        mov ar.unat = loc1
    336336
    337         mov r8 = in1                    /* __longjmp returns second argument */
     337        mov r8 = in1                    /* __context_restore returns second argument */
    338338        br.ret.sptk.many b0
    339 FUNCTION_END(__longjmp)
     339FUNCTION_END(__context_restore)
Note: See TracChangeset for help on using the changeset viewer.