Changeset d5ec0480 in rtems


Ignore:
Timestamp:
Jun 16, 2010, 5:19:31 PM (9 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
6d537a3
Parents:
4b06da6f
Message:

2010-06-16 Joel Sherrill <joel.sherrilL@…>

  • cpu_asm.S: Use SYM macro to be consistent with other ports.
Location:
cpukit/score/cpu/bfin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/cpu/bfin/ChangeLog

    r4b06da6f rd5ec0480  
     12010-06-16      Joel Sherrill <joel.sherrilL@OARcorp.com>
     2
     3        * cpu_asm.S: Use SYM macro to be consistent with other ports.
     4
    152010-04-20      Allan Hessenflow <allanh@kallisti.com>
    26
  • cpukit/score/cpu/bfin/cpu_asm.S

    r4b06da6f rd5ec0480  
    3636#if 0
    3737/* some debug routines */
    38         .globl __CPU_write_char;
    39 __CPU_write_char:
     38        .globl SYM(_CPU_write_char);
     39SYM(_CPU_write_char):
    4040        p0.h = 0xffc0;
    4141        p0.l = 0x0400;
     
    4747        rts;
    4848
    49         .globl __CPU_write_crlf;
    50 __CPU_write_crlf:
     49        .globl SYM(_CPU_write_crlf);
     50SYM(_CPU_write_crlf):
    5151        r0 = '\r';
    5252        [--sp] = rets;
    53         call __CPU_write_char;
     53        call SYM(_CPU_write_char);
    5454        rets = [sp++];
    5555        r0 = '\n';
    56         jump __CPU_write_char;
    57 
    58 __CPU_write_space:
     56        jump SYM(_CPU_write_char);
     57
     58SYM(_CPU_write_space):
    5959        r0 = ' ';
    60         jump __CPU_write_char;
    61 
    62         .globl __CPU_write_nybble;
    63 __CPU_write_nybble:
     60        jump SYM(_CPU_write_char);
     61
     62        .globl SYM(_CPU_write_nybble);
     63SYM(_CPU_write_nybble:)
    6464        r1 = 0x0f;
    6565        r0 = r0 & r1;
     
    6767        r1 = '9';
    6868        cc = r0 <= r1;
    69         if cc jump __CPU_write_char;
     69        if cc jump SYM(_CPU_write_char);
    7070        r0 += 'a' - '0' - 10;
    71         jump __CPU_write_char;
    72 
    73         .globl __CPU_write_byte;
    74 __CPU_write_byte:
     71        jump SYM(_CPU_write_char);
     72
     73        .globl SYM(_CPU_write_byte);
     74SYM(_CPU_write_byte):
    7575        [--sp] = r0;
    7676        [--sp] = rets;
    7777        r0 >>= 4;
    78         call __CPU_write_nybble;
     78        call SYM(_CPU_write_nybble);
    7979        rets = [sp++];
    8080        r0 = [sp++];
    81         jump __CPU_write_nybble;
    82 
    83 __CPU_write_chawmp:
     81        jump SYM(_CPU_write_nybble);
     82
     83SYM(_CPU_write_chawmp):
    8484        [--sp] = r0;
    8585        [--sp] = rets;
    8686        r0 >>= 8;
    87         call __CPU_write_byte;
     87        call SYM(_CPU_write_byte);
    8888        rets = [sp++];
    8989        r0 = [sp++];
    90         jump __CPU_write_byte;
    91 
    92 __CPU_write_gawble:
     90        jump SYM(_CPU_write_byte);
     91
     92SYM(_CPU_write_gawble):
    9393        [--sp] = r0;
    9494        [--sp] = rets;
    9595        r0 >>= 16;
    96         call __CPU_write_chawmp;
     96        call SYM(_CPU_write_chawmp);
    9797        rets = [sp++];
    9898        r0 = [sp++];
    99         jump __CPU_write_chawmp;
    100 
    101 __CPU_dump_registers:
     99        jump SYM(_CPU_write_chawmp);
     100
     101SYM(_CPU_dump_registers):
    102102        [--sp] = rets;
    103103        [--sp] = r0;
     
    105105        [--sp] = p0;
    106106        r0 = [sp + 8];
    107         call __CPU_write_gawble;
    108         call __CPU_write_space;
     107        call SYM(_CPU_write_gawble);
     108        call SYM(_CPU_write_space);
    109109        r0 = [sp + 4];
    110         call __CPU_write_gawble;
    111         call __CPU_write_space;
     110        call SYM(_CPU_write_gawble);
     111        call SYM(_CPU_write_space);
    112112        r0 = r2;
    113         call __CPU_write_gawble;
    114         call __CPU_write_space;
     113        call SYM(_CPU_write_gawble);
     114        call SYM(_CPU_write_space);
    115115        r0 = r3;
    116         call __CPU_write_gawble;
    117         call __CPU_write_space;
     116        call SYM(_CPU_write_gawble);
     117        call SYM(_CPU_write_space);
    118118        r0 = r4;
    119         call __CPU_write_gawble;
    120         call __CPU_write_space;
     119        call SYM(_CPU_write_gawble);
     120        call SYM(_CPU_write_space);
    121121        r0 = r5;
    122         call __CPU_write_gawble;
    123         call __CPU_write_space;
     122        call SYM(_CPU_write_gawble);
     123        call SYM(_CPU_write_space);
    124124        r0 = r6;
    125         call __CPU_write_gawble;
    126         call __CPU_write_space;
     125        call SYM(_CPU_write_gawble);
     126        call SYM(_CPU_write_space);
    127127        r0 = r7;
    128         call __CPU_write_gawble;
    129         call __CPU_write_crlf;
     128        call SYM(_CPU_write_gawble);
     129        call SYM(_CPU_write_crlf);
    130130        r0 = [sp];
    131         call __CPU_write_gawble;
    132         call __CPU_write_space;
     131        call SYM(_CPU_write_gawble);
     132        call SYM(_CPU_write_space);
    133133        r0 = p1;
    134         call __CPU_write_gawble;
    135         call __CPU_write_space;
     134        call SYM(_CPU_write_gawble);
     135        call SYM(_CPU_write_space);
    136136        r0 = p2;
    137         call __CPU_write_gawble;
    138         call __CPU_write_space;
     137        call SYM(_CPU_write_gawble);
     138        call SYM(_CPU_write_space);
    139139        r0 = p3;
    140         call __CPU_write_gawble;
    141         call __CPU_write_space;
     140        call SYM(_CPU_write_gawble);
     141        call SYM(_CPU_write_space);
    142142        r0 = p4;
    143         call __CPU_write_gawble;
    144         call __CPU_write_space;
     143        call SYM(_CPU_write_gawble);
     144        call SYM(_CPU_write_space);
    145145        r0 = p5;
    146         call __CPU_write_gawble;
    147         call __CPU_write_space;
     146        call SYM(_CPU_write_gawble);
     147        call SYM(_CPU_write_space);
    148148        r0 = fp;
    149         call __CPU_write_gawble;
    150         call __CPU_write_space;
     149        call SYM(_CPU_write_gawble);
     150        call SYM(_CPU_write_space);
    151151        r0 = sp;
    152152        r0 += 16;
    153         call __CPU_write_gawble;
    154         call __CPU_write_crlf;
     153        call SYM(_CPU_write_gawble);
     154        call SYM(_CPU_write_crlf);
    155155
    156156        p0 = [sp++];
     
    160160        rts;
    161161
    162         .globl __CPU_Exception_handler;
    163 __CPU_Exception_handler:
     162        .globl SYM(_CPU_Exception_handler);
     163SYM(_CPU_Exception_handler):
    164164        usp = sp;
    165165        sp.h = 0xffb0;
     
    168168
    169169        r0 = 'x';
    170         call __CPU_write_char;
     170        call SYM(_CPU_write_char);
    171171        jump hcf;
    172172
    173173
    174         .globl __CPU_Emulation_handler;
    175 __CPU_Emulation_handler:
     174        .globl SYM(_CPU_Emulation_handler);
     175SYM(_CPU_Emulation_handler):
    176176        usp = sp;
    177177        sp.h = 0xffb0;
     
    180180
    181181        r0 = 'e';
    182         call __CPU_write_char;
     182        call SYM(_CPU_write_char);
    183183        jump hcf;
    184184
    185         .globl __CPU_Reset_handler;
    186 __CPU_Reset_handler:
     185        .globl SYM(_CPU_Reset_handler);
     186SYM(_CPU_Reset_handler):
    187187        usp = sp;
    188188        sp.h = 0xffb0;
     
    191191
    192192        r0 = 'r';
    193         call __CPU_write_char;
     193        call SYM(_CPU_write_char);
    194194        jump hcf;
    195195
    196         .globl __CPU_NMI_handler;
    197 __CPU_NMI_handler:
     196        .globl SYM(_CPU_NMI_handler);
     197SYM(_CPU_NMI_handler):
    198198        usp = sp;
    199199        sp.h = 0xffb0;
     
    202202
    203203        r0 = 'n';
    204         call __CPU_write_char;
     204        call SYM(_CPU_write_char);
    205205        jump hcf;
    206206
    207         .globl __CPU_Unhandled_Interrupt_handler;
    208 __CPU_Unhandled_Interrupt_handler:
     207        .globl SYM(_CPU_Unhandled_Interrupt_handler);
     208SYM(_CPU_Unhandled_Interrupt_handler):
    209209        usp = sp;
    210210        sp.h = 0xffb0;
     
    212212        [--sp] = (r7:0,p5:0);
    213213
    214         call __CPU_write_crlf;
     214        call SYM(_CPU_write_crlf);
    215215        r0 = 'i';
    216         call __CPU_write_char;
     216        call SYM(_CPU_write_char);
    217217        p0.h = HI(IPEND);
    218218        p0.l = LO(IPEND);
    219219        r0 = [p0];
    220         call __CPU_write_chawmp;
     220        call SYM(_CPU_write_chawmp);
    221221        jump hcf;
    222222
     
    240240/* make sure this sequence stays in sync with the definition for
    241241   Context_Control in rtems/score/cpu.h */
    242         .globl __CPU_Context_switch
    243 __CPU_Context_switch:
     242        .globl SYM(_CPU_Context_switch)
     243SYM(_CPU_Context_switch):
    244244        /* Start saving context R0 = current, R1=heir */
    245245        p0 = r0;
     
    307307 *
    308308 */
    309         .globl __CPU_Context_restore
    310 __CPU_Context_restore:
     309        .globl SYM(_CPU_Context_restore)
     310SYM(_CPU_Context_restore):
    311311        p0 = r0;
    312312        jump restore;
    313313
    314314
    315         .globl __ISR_Handler
    316         .extern __CPU_Interrupt_stack_high;
    317         .extern __ISR_Nest_level
    318         .extern __Thread_Dispatch_disable_level
    319         .extern __Context_Switch_necessary
    320         .extern __ISR_Signals_to_thread_executing
    321 __ISR_Handler:
     315        .globl SYM(_ISR_Handler)
     316        .extern SYM(_CPU_Interrupt_stack_high)
     317        .extern SYM(_ISR_Nest_level)
     318        .extern SYM(_Thread_Dispatch_disable_level)
     319        .extern SYM(_Context_Switch_necessary)
     320        .extern SYM(_ISR_Signals_to_thread_executing)
     321SYM(_ISR_Handler):
    322322        /* all interrupts are disabled at this point */
    323323        /* the following few items are pushed onto the task stack for at
     
    329329        [--sp] = r1;
    330330        [--sp] = r0;
    331         p0.h = __ISR_Nest_level;
    332         p0.l = __ISR_Nest_level;
     331        p0.h = SYM(_ISR_Nest_level);
     332        p0.l = SYM(_ISR_Nest_level);
    333333        r0 = [p0];
    334334        r0 += 1;
     
    338338        /* setup interrupt stack */
    339339        r0 = sp;
    340         p0.h = __CPU_Interrupt_stack_high;
    341         p0.l = __CPU_Interrupt_stack_high;
     340        p0.h = SYM(_CPU_Interrupt_stack_high);
     341        p0.l = SYM(_CPU_Interrupt_stack_high);
    342342        sp = [p0];
    343343        [--sp] = r0;
    344344noStackSwitch:
    345345        /* disable thread dispatch */
    346         p0.h = __Thread_Dispatch_disable_level;
    347         p0.l = __Thread_Dispatch_disable_level;
     346        p0.h = SYM(_Thread_Dispatch_disable_level);
     347        p0.l = SYM(_Thread_Dispatch_disable_level);
    348348        r0 = [p0];
    349349        r0 += 1;
     
    366366
    367367        [--sp] = r2;
    368         p0.h = __ISR_Vector_table;
    369         p0.l = __ISR_Vector_table;
     368        p0.h = SYM(_ISR_Vector_table);
     369        p0.l = SYM(_ISR_Vector_table);
    370370        r2 = [p0];
    371371        r1 = r0 << 2;
     
    453453        reti = [sp++];
    454454
    455         p0.h = __ISR_Nest_level;
    456         p0.l = __ISR_Nest_level;
     455        p0.h = SYM(_ISR_Nest_level);
     456        p0.l = SYM(_ISR_Nest_level);
    457457        r0 = [p0];
    458458        r0 += -1;
     
    465465        /* check this stuff to ensure context_switch_necessary and
    466466           isr_signals_to_thread_executing are being handled appropriately. */
    467         p0.h = __Thread_Dispatch_disable_level;
    468         p0.l = __Thread_Dispatch_disable_level;
     467        p0.h = SYM(_Thread_Dispatch_disable_level);
     468        p0.l = SYM(_Thread_Dispatch_disable_level);
    469469        r0 = [p0];
    470470        r0 += -1;
     
    474474
    475475        /* do thread dispatch if necessary */
    476         p0.h = __Context_Switch_necessary;
    477         p0.l = __Context_Switch_necessary;
     476        p0.h = SYM(_Context_Switch_necessary);
     477        p0.l = SYM(_Context_Switch_necessary);
    478478        r0 = B[p0] (Z);
    479479        cc = r0 == 0;
    480         p0.h = __ISR_Signals_to_thread_executing;
    481         p0.l = __ISR_Signals_to_thread_executing;
     480        p0.h = SYM(_ISR_Signals_to_thread_executing);
     481        p0.l = SYM(_ISR_Signals_to_thread_executing);
    482482        if !cc jump doDispatch
    483483        r0 = B[p0] (Z);
     
    503503   original interrupted function.  this does require self-nesting to be
    504504   enabled; the maximum nest depth is the number of tasks. */
    505         .global __ISR15_Handler
    506         .extern __Thread_Dispatch
    507 __ISR15_Handler:
     505        .global SYM(_ISR15_Handler)
     506SYM(_ISR15_Handler):
    508507        [--sp] = reti;
    509508        [--sp] = rets;
     
    549548        l3 = r2;
    550549        sp += -12; /* bizarre abi... */
    551         call __Thread_Dispatch;
     550        call SYM(_Thread_Dispatch);
    552551        sp += 12;
    553552        b0 = [sp++];
Note: See TracChangeset for help on using the changeset viewer.