Changeset 1d367a49 in rtems


Ignore:
Timestamp:
Aug 24, 2011, 9:45:20 AM (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
7e85bfbe
Parents:
cf3d1948
Message:

2011-08-24 Sebastian Huber <sebastian.huber@…>

  • mpc6xx/clock/c_clock.c, mpc6xx/mmu/mmuAsm.S, new-exceptions/bspsupport/ppc_exc_global_handler.c, shared/include/cpuIdent.c, shared/src/stack.c: Update due to API changes.
Location:
c/src/lib/libcpu/powerpc
Files:
6 edited

Legend:

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

    rcf3d1948 r1d367a49  
     12011-08-24      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * mpc6xx/clock/c_clock.c, mpc6xx/mmu/mmuAsm.S,
     4        new-exceptions/bspsupport/ppc_exc_global_handler.c,
     5        shared/include/cpuIdent.c, shared/src/stack.c: Update due to API
     6        changes.
     7
    182011-07-21      Sebastian Huber <sebastian.huber@embedded-brains.de>
    29
  • c/src/lib/libcpu/powerpc/mpc6xx/clock/c_clock.c

    rcf3d1948 r1d367a49  
    3636SPR_RW(BOOKE_TSR)
    3737SPR_RW(BOOKE_DECAR)
    38 SPR_RW(DEC)
    3938
    4039extern int BSP_connect_clock_handler (void);
  • c/src/lib/libcpu/powerpc/mpc6xx/mmu/mmuAsm.S

    rcf3d1948 r1d367a49  
    6565         * Enable caches and 604-specific features if necessary.
    6666         */
    67         mfspr   r9,PVR
     67        mfspr   r9,PPC_PVR
    6868        rlwinm  r9,r9,16,16,31
    6969        cmpi    0,r9,PPC_601
     
    129129get_L2CR:
    130130        /* Make sure this is a > 750 chip */
    131         mfspr   r3,PVR
     131        mfspr   r3,PPC_PVR
    132132        rlwinm  r3,r3,16,16,31
    133133        cmplwi  r3,PPC_750      /* it's a 750 */
     
    180180
    181181        /* Make sure this is a > 750 chip */
    182         mfspr   r0,PVR
     182        mfspr   r0,PPC_PVR
    183183        rlwinm  r0,r0,16,16,31
    184184        cmplwi  r0,PPC_750
     
    350350get_L3CR:
    351351        /* Make sure this is a 7455 chip */
    352         mfspr   r3,PVR
     352        mfspr   r3,PPC_PVR
    353353        rlwinm  r3,r3,16,16,31
    354354        cmplwi  r3,PPC_7455     /* it's a 7455 */
     
    380380
    381381        /* Make sure this is a 7455 chip */
    382         mfspr   r0,PVR
     382        mfspr   r0,PPC_PVR
    383383        rlwinm  r0,r0,16,16,31
    384384        cmplwi  r0,PPC_7455
     
    483483CPU_clear_bats_early:
    484484        li              r3,0
    485         mfspr   r4,PVR
     485        mfspr   r4,PPC_PVR
    486486        rlwinm  r4,r4,16,16,31          /* r4 = 1 for 601, 4 for 604 */
    487487        cmpwi   r4, 1
  • c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_global_handler.c

    rcf3d1948 r1d367a49  
    4343{
    4444  if (ppc_cpu_is_60x())
    45     return PPC_SPECIAL_PURPOSE_REGISTER(DAR);
     45    return PPC_SPECIAL_PURPOSE_REGISTER(PPC_DAR);
    4646  else
    4747    switch (ppc_cpu_is_bookE()) {
  • c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c

    rcf3d1948 r1d367a49  
    2222 * Generate inline code to read Processor Version Register
    2323 */
    24 SPR_RO(PVR)
     24SPR_RO(PPC_PVR)
    2525
    2626ppc_cpu_id_t       current_ppc_cpu      = PPC_UNKNOWN;
     
    8080        return current_ppc_cpu;
    8181
    82   pvr = (_read_PVR() >> 16);
     82  pvr = (_read_PPC_PVR() >> 16);
    8383  /*
    8484   * apply tweaks to ignore version
     
    211211ppc_cpu_revision_t get_ppc_cpu_revision(void)
    212212{
    213   ppc_cpu_revision_t rev = (ppc_cpu_revision_t) (_read_PVR() & 0xffff);
     213  ppc_cpu_revision_t rev = (ppc_cpu_revision_t) (_read_PPC_PVR() & 0xffff);
    214214  current_ppc_revision = rev;
    215215  return rev;
  • c/src/lib/libcpu/powerpc/shared/src/stack.c

    rcf3d1948 r1d367a49  
    33#include <libcpu/spr.h>
    44
    5 SPR_RO(LR)
     5SPR_RO(PPC_LR)
    66
    77typedef struct FrameRec_ {
     
    1818        if (pc) stack[i++]=pc;
    1919        if (!p)
    20                 p = (Frame)_read_LR();
     20                p = (Frame)_read_PPC_LR();
    2121        stack[i++]=p;
    2222        p = r1;
Note: See TracChangeset for help on using the changeset viewer.