Changeset 698c3362 in rtems


Ignore:
Timestamp:
Dec 5, 2007, 8:45:36 AM (12 years ago)
Author:
Till Straumann <strauman@…>
Branches:
4.10, 4.11, 4.9, master
Children:
464ba4d
Parents:
b9ce916
Message:

2007-12-05 Till Straumann <strauman@…>

  • shared/irq/irq_asm.S, shared/vectors/vectors.S, shared/vectors/vectors.h, shared/vectors/vectors_init.c: Converted exception vector names to new ones (qualified by <cpu_type> if non-std ppc exceptions).
Location:
c/src/lib/libbsp/powerpc
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/ChangeLog

    rb9ce916 r698c3362  
     12007-12-05      Till Straumann <strauman@slac.stanford.edu>
     2
     3        * shared/irq/irq_asm.S, shared/vectors/vectors.S,
     4        shared/vectors/vectors.h, shared/vectors/vectors_init.c:
     5        Converted exception vector names to new ones
     6        (qualified by <cpu_type> if non-std ppc exceptions).
     7
     8
    192007-12-04      Till Straumann <strauman@slac.stanford.edu>
    210
  • c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S

    rb9ce916 r698c3362  
    4848#endif
    4949
    50 #if defined(ASM_SYSMGMT_VECTOR)
     50#if defined(ASM_60X_SYSMGMT_VECTOR)
    5151        PUBLIC_VAR(sysmgmt_exception_vector_prolog_code)
    5252
     
    5757        stwu    r1, - (EXCEPTION_FRAME_END)(r1)
    5858        stw     r4, GPR4_OFFSET(r1)
    59         li      r4, ASM_SYSMGMT_VECTOR
     59        li      r4, ASM_60X_SYSMGMT_VECTOR
    6060        ba      shared_raw_irq_code_entry
    6161
     
    6666
    6767
    68 #if defined(ASM_PIT_VECTOR)
     68#if defined(ASM_BOOKE_PIT_VECTOR)
    6969        PUBLIC_VAR(pit_exception_vector_prolog_code)
    7070
     
    7575        stwu    r1, - (EXCEPTION_FRAME_END)(r1)
    7676        stw     r4, GPR4_OFFSET(r1)
    77         li      r4, ASM_PIT_VECTOR
     77        li      r4, ASM_BOOKE_PIT_VECTOR
    7878        ba      shared_raw_irq_code_entry
    7979
     
    8383#endif
    8484
    85 #if defined(ASM_FIT_VECTOR)
     85#if defined(ASM_BOOKE_FIT_VECTOR)
    8686        PUBLIC_VAR(fit_exception_vector_prolog_code)
    8787
     
    9292        stwu    r1, - (EXCEPTION_FRAME_END)(r1)
    9393        stw     r4, GPR4_OFFSET(r1)
    94         li      r4, ASM_FIT_VECTOR
     94        li      r4, ASM_BOOKE_FIT_VECTOR
    9595        ba      shared_raw_irq_code_entry
    9696
  • c/src/lib/libbsp/powerpc/shared/vectors/vectors.S

    rb9ce916 r698c3362  
    7171        /* mask upper bits in case vectors are in the high area (psim) */
    7272        rlwinm  r3, r3, 32-5, 20, 31
    73 #if defined(ASM_VEC_VECTOR)
     73#if defined(ASM_60X_VEC_VECTOR)
    7474        /*
    7575         * Remap altivec unavaliable (0xf20) to its vector number...
    7676         */
    77         cmplwi  r3,(ASM_VEC_VECTOR_OFFSET>>5)
     77        cmplwi  r3,(ASM_60X_VEC_VECTOR_OFFSET>>5)
    7878        bne     1f
    79         li              r3,ASM_VEC_VECTOR<<3
     79        li              r3,ASM_60X_VEC_VECTOR<<3
    80801:
    8181#endif
  • c/src/lib/libbsp/powerpc/shared/vectors/vectors.h

    rb9ce916 r698c3362  
    9292extern  unsigned int  decrementer_exception_vector_prolog_code_size[];
    9393#endif
    94 #if defined(ASM_SYSMGMT_VECTOR)
     94#if defined(ASM_60X_SYSMGMT_VECTOR)
    9595extern  void sysmgmt_exception_vector_prolog_code();
    9696extern  unsigned int  sysmgmt_exception_vector_prolog_code_size[];
    9797#endif
    98 #if defined(ASM_PIT_VECTOR)
     98#if defined(ASM_BOOKE_PIT_VECTOR)
    9999extern  void pit_exception_vector_prolog_code();
    100100extern  unsigned int  pit_exception_vector_prolog_code_size[];
    101101#endif
    102 #if defined(ASM_FIT_VECTOR)
     102#if defined(ASM_BOOKE_FIT_VECTOR)
    103103extern  void fit_exception_vector_prolog_code();
    104104extern  unsigned int  fit_exception_vector_prolog_code_size[];
  • c/src/lib/libbsp/powerpc/shared/vectors/vectors_init.c

    rb9ce916 r698c3362  
    190190#if defined(PPC_HAS_60X_VECTORS)
    191191    if ( has_shadowed_gprs
    192          && (   ASM_IMISS_VECTOR  == i
    193              || ASM_DLMISS_VECTOR == i
    194              || ASM_DSMISS_VECTOR == i ) ) {
     192         && (   ASM_60X_IMISS_VECTOR  == i
     193             || ASM_60X_DLMISS_VECTOR == i
     194             || ASM_60X_DSMISS_VECTOR == i ) ) {
    195195      exception_table[i].hdl.raw_hdl      = tgpr_clr_exception_vector_code_prolog;
    196196      exception_table[i].hdl.raw_hdl_size = (unsigned)tgpr_clr_exception_vector_code_prolog_size;
Note: See TracChangeset for help on using the changeset viewer.