Changeset 3ec7bfc in rtems


Ignore:
Timestamp:
03/24/98 16:24:39 (25 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
d662fef8
Parents:
222788b
Message:

Rename hppa1_1 to hppa1.1 and switched to using XXX macros for
the CPU family name constants.

Files:
17 edited

Legend:

Unmodified
Added
Removed

  • README.configure

    r222788b r3ec7bfc  
    7575        i386-go32-rtems         see notes
    7676        i960-rtems
    77         hppa1_1-rtems
     77        hppa1.1-rtems
    7878        m68k-rtems
    7979        mips64orion-rtems
    … …  
    171171i386-go32       : go32 go32_p5
    172172i960            : cvme961
    173 hppa1_1         : simhppa
     173hppa1.1         : simhppa
    174174m68k            : dmv152 efi332 efi68k gen68302 gen68360 gen68360_040 idp
    175175                  mvme136 mvme147 mvme147s mvme162 ods68302

  • c/src/exec/score/cpu/unix/cpu.c

    r222788b r3ec7bfc  
    175175{
    176176
    177 #if defined(hppa1_1) && defined(RTEMS_UNIXLIB_SETJMP)
     177#if defined(__hppa__) && defined(RTEMS_UNIXLIB_SETJMP)
    178178    /*
    179179     * HACK - set the _SYSTEM_ID to 0x20c so that setjmp/longjmp
    … …  
    475475  addr = (unsigned32 *)_the_context;
    476476
    477 #if defined(hppa1_1)
     477#if defined(__hppa__)
    478478  *(addr + RP_OFF) = jmp_addr;
    479479  *(addr + SP_OFF) = (unsigned32)(_stack_low + CPU_FRAME_SIZE);
    … …  
    490490     *(addr + RP_OFF) = *(unsigned32 *)jmp_addr;
    491491  }
    492 #elif defined(sparc)
     492#elif defined(__sparc__)
    493493
    494494  /*
    … …  
    503503  *(addr + FP_OFF) = (unsigned32)(_stack_high);
    504504
    505 #elif defined(i386) || defined(__i386__)
     505#elif defined(__i386__)
    506506
    507507    /*

  • c/src/exec/score/cpu/unix/cpu.h

    r222788b r3ec7bfc  
    243243 */
    244244
    245 #if defined(hppa1_1)
     245#if defined(__hppa__)
    246246#define CPU_STACK_GROWS_UP               TRUE
    247 #elif defined(sparc) || defined(i386) || defined(__i386__)
     247#elif defined(__sparc__) || defined(__i386__)
    248248#define CPU_STACK_GROWS_UP               FALSE
    249249#else
    … …  
    283283 */
    284284
    285 #if defined(hppa1_1) || defined(sparc)
     285#if defined(__hppa__) || defined(__sparc__)
    286286#define CPU_CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE
    287287#define CPU_BIG_ENDIAN                           TRUE
    288288#define CPU_LITTLE_ENDIAN                        FALSE
    289 #elif defined(i386) || defined(__i386__)
     289#elif defined(__i386__)
    290290#define CPU_CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES FALSE
    291291#define CPU_BIG_ENDIAN                           FALSE
    … …  
    314314/* may need to put some structures here.  */
    315315
    316 #if defined(hppa1_1)
     316#if defined(__hppa__)
    317317/*
    318318 * Word indices within a jmp_buf structure
    … …  
    364364#endif
    365365
    366 #if defined(i386) || defined(__i386__)
     366#if defined(__i386__)
    367367 
    368368#ifdef RTEMS_NEWLIB
    … …  
    385385#endif
    386386 
    387 #if defined(sparc)
     387#if defined(__sparc__)
    388388
    389389/*
    … …  
    551551 */
    552552
    553 #if defined(hppa1_1)
     553#if defined(__hppa__)
    554554#define CPU_FRAME_SIZE  (32 * 4)
    555 #elif defined(sparc)
     555#elif defined(__sparc__)
    556556#define CPU_FRAME_SIZE  (112)   /* based on disassembled test code */
    557 #elif defined(i386) || defined(__i386__)
     557#elif defined(__i386__)
    558558#define CPU_FRAME_SIZE  (24)  /* return address, sp, and bp pushed plus fudge */
    559559#else

  • c/src/lib/libbsp/hppa1.1/simhppa/Makefile.in

    r222788b r3ec7bfc  
    1515#  from the individual .rel files built in other directories
    1616# NOTE: we pick up HPPA clock and timer from libcpu/hppa
    17 SUB_DIRS=tools include startup tty shmsupp wrapup
     17SUB_DIRS=tools include start startup tty shmsupp wrapup

  • c/src/lib/libbsp/m68k/ods68302/startup/m68k-stub.c

    r222788b r3ec7bfc  
    333333              movew   %sp@+,%d0
    334334");
    335 #if defined (__m68000__) && !defined(__mc68020__)
     335#if defined (__mc68000__) && !defined(__mc68020__)
    336336asm("
    337337        lea     %sp@(4),%sp");       /* pull off 68000 return address */
    … …  
    553553  }
    554554
    555 #if defined(__m68000__) && !defined(__mc68020__)
     555#if defined(__mc68000__) && !defined(__mc68020__)
    556556  /* a 68000 cannot use the internal info pushed onto a bus error
    557557   * or address error frame when doing an RTE so don't put this info

  • c/src/lib/libbsp/shmdr/shm.h

    r222788b r3ec7bfc  
    120120 */
    121121
    122 #if defined(i960)
     122#if defined(__i960__)
    123123#define SHM_LOCK_VALUE    0x00000080
    124124#define SHM_UNLOCK_VALUE  0
    125 #elif defined(m68k)
     125#elif defined(__mc68000__)
    126126#define SHM_LOCK_VALUE    0x80000000
    127127#define SHM_UNLOCK_VALUE  0
    128128#define SHM_LOCK_VALUE    0x80000000
    129129#define SHM_UNLOCK_VALUE  0
    130 #elif defined(i386)
     130#elif defined(__i386__)
    131131#define SHM_LOCK_VALUE    0x80000000
    132132#define SHM_UNLOCK_VALUE  0
    133 #elif defined(mips64orion)
     133#elif defined(__mips__)
    134134#define SHM_LOCK_VALUE    0x80000000
    135135#define SHM_UNLOCK_VALUE  0
    136 #elif defined(hppa1_1)
     136#elif defined(__hppa__)
    137137#define SHM_LOCK_VALUE    0
    138138#define SHM_UNLOCK_VALUE  1
    139 #elif defined(ppc)
     139#elif defined(__PPC__)
    140140#define SHM_LOCK_VALUE    1
    141141#define SHM_UNLOCK_VALUE  0
    142 #elif defined(unix)
     142#elif defined(__unix__)
    143143#define SHM_LOCK_VALUE    0
    144144#define SHM_UNLOCK_VALUE  1

  • c/src/lib/libbsp/shmdr/shm_driver.h

    r222788b r3ec7bfc  
    120120 */
    121121
    122 #if defined(i960)
     122#if defined(__i960__)
    123123#define SHM_LOCK_VALUE    0x00000080
    124124#define SHM_UNLOCK_VALUE  0
    125 #elif defined(m68k)
     125#elif defined(__mc68000__)
    126126#define SHM_LOCK_VALUE    0x80000000
    127127#define SHM_UNLOCK_VALUE  0
    128128#define SHM_LOCK_VALUE    0x80000000
    129129#define SHM_UNLOCK_VALUE  0
    130 #elif defined(i386)
     130#elif defined(__i386__)
    131131#define SHM_LOCK_VALUE    0x80000000
    132132#define SHM_UNLOCK_VALUE  0
    133 #elif defined(mips64orion)
     133#elif defined(__mips__)
    134134#define SHM_LOCK_VALUE    0x80000000
    135135#define SHM_UNLOCK_VALUE  0
    136 #elif defined(hppa1_1)
     136#elif defined(__hppa__)
    137137#define SHM_LOCK_VALUE    0
    138138#define SHM_UNLOCK_VALUE  1
    139 #elif defined(ppc)
     139#elif defined(__PPC__)
    140140#define SHM_LOCK_VALUE    1
    141141#define SHM_UNLOCK_VALUE  0
    142 #elif defined(unix)
     142#elif defined(__unix__)
    143143#define SHM_LOCK_VALUE    0
    144144#define SHM_UNLOCK_VALUE  1

  • c/src/lib/libcpu/powerpc/ppc403/clock/clock.c

    r222788b r3ec7bfc  
    1919 *      of this software for any purpose.
    2020 *
    21  *  Derived from c/src/lib/libcpu/hppa1_1/clock/clock.c:
     21 *  Derived from c/src/lib/libcpu/hppa1.1/clock/clock.c:
    2222 *
    2323 *  COPYRIGHT (c) 1989-1998.

  • c/src/lib/libcpu/powerpc/ppc403/timer/timer.c

    r222788b r3ec7bfc  
    2222 *      of this software for any purpose.
    2323 *
    24  *  Derived from c/src/lib/libcpu/hppa1_1/timer/timer.c:
     24 *  Derived from c/src/lib/libcpu/hppa1.1/timer/timer.c:
    2525 *
    2626 *  COPYRIGHT (c) 1989-1998.

  • c/src/lib/start/README

    r222788b r3ec7bfc  
    77
    88For some processors this code exists in some external (to RTEMS)
    9 library such as libgloss or the host system (for example the hppa1_1
     9library such as libgloss or the host system (for example the hppa1.1
    1010and UNIX cpu's)

  • c/src/libchip/shmdr/shm_driver.h

    r222788b r3ec7bfc  
    120120 */
    121121
    122 #if defined(i960)
     122#if defined(__i960__)
    123123#define SHM_LOCK_VALUE    0x00000080
    124124#define SHM_UNLOCK_VALUE  0
    125 #elif defined(m68k)
     125#elif defined(__mc68000__)
    126126#define SHM_LOCK_VALUE    0x80000000
    127127#define SHM_UNLOCK_VALUE  0
    128128#define SHM_LOCK_VALUE    0x80000000
    129129#define SHM_UNLOCK_VALUE  0
    130 #elif defined(i386)
     130#elif defined(__i386__)
    131131#define SHM_LOCK_VALUE    0x80000000
    132132#define SHM_UNLOCK_VALUE  0
    133 #elif defined(mips64orion)
     133#elif defined(__mips__)
    134134#define SHM_LOCK_VALUE    0x80000000
    135135#define SHM_UNLOCK_VALUE  0
    136 #elif defined(hppa1_1)
     136#elif defined(__hppa__)
    137137#define SHM_LOCK_VALUE    0
    138138#define SHM_UNLOCK_VALUE  1
    139 #elif defined(ppc)
     139#elif defined(__PPC__)
    140140#define SHM_LOCK_VALUE    1
    141141#define SHM_UNLOCK_VALUE  0
    142 #elif defined(unix)
     142#elif defined(__unix__)
    143143#define SHM_LOCK_VALUE    0
    144144#define SHM_UNLOCK_VALUE  1

  • c/src/tests/samples/cdtest/main.cc

    r222788b r3ec7bfc  
    127127//      run.
    128128//
    129 //      Ref: c/src/lib/libbsp/hppa1_1/pxfl/startup/bspstart.c
    130 //
    131129
    132130

  • c/src/tests/sptests/spsize/size.c

    r222788b r3ec7bfc  
    353353#ifndef unix  /* make sure this is not a native compile */
    354354
    355 #ifdef i386
     355#ifdef __i386__
    356356
    357357/* cpu.h */
    … …  
    362362#endif
    363363
    364 #ifdef i960
     364#ifdef __i960__
    365365
    366366/* cpu.h */
    … …  
    370370#endif
    371371
    372 #ifdef hppa1_1
     372#ifdef __hppa__
    373373
    374374/* cpu.h */
    … …  
    381381#endif
    382382
    383 #ifdef m68k
     383#ifdef __mc68000__
    384384
    385385/* cpu.h */
    … …  
    389389#endif
    390390
    391 #ifdef sparc
     391#ifdef __sparc__
    392392 
    393393/* cpu.h */
    … …  
    418418#endif
    419419
    420 #ifdef ppc
     420#ifdef __PPC__
    421421
    422422/* cpu.h */
    … …  
    441441
    442442#ifndef unix /* make sure this is not native */
    443 #ifdef sparc
     443#ifdef __sparc__
    444444
    445445initialized +=  (sizeof _CPU_Trap_slot_template);

  • cpukit/score/cpu/unix/cpu.c

    r222788b r3ec7bfc  
    175175{
    176176
    177 #if defined(hppa1_1) && defined(RTEMS_UNIXLIB_SETJMP)
     177#if defined(__hppa__) && defined(RTEMS_UNIXLIB_SETJMP)
    178178    /*
    179179     * HACK - set the _SYSTEM_ID to 0x20c so that setjmp/longjmp
    … …  
    475475  addr = (unsigned32 *)_the_context;
    476476
    477 #if defined(hppa1_1)
     477#if defined(__hppa__)
    478478  *(addr + RP_OFF) = jmp_addr;
    479479  *(addr + SP_OFF) = (unsigned32)(_stack_low + CPU_FRAME_SIZE);
    … …  
    490490     *(addr + RP_OFF) = *(unsigned32 *)jmp_addr;
    491491  }
    492 #elif defined(sparc)
     492#elif defined(__sparc__)
    493493
    494494  /*
    … …  
    503503  *(addr + FP_OFF) = (unsigned32)(_stack_high);
    504504
    505 #elif defined(i386) || defined(__i386__)
     505#elif defined(__i386__)
    506506
    507507    /*

  • make/custom/simhppa.cfg

    r222788b r3ec7bfc  
    77include $(RTEMS_ROOT)/make/custom/default.cfg
    88
     9# this really should be hppa1.1 but you define that with cpp :(
    910RTEMS_CPU=hppa1_1
    1011RTEMS_CPU_MODEL=hppa7200

  • testsuites/samples/cdtest/main.cc

    r222788b r3ec7bfc  
    127127//      run.
    128128//
    129 //      Ref: c/src/lib/libbsp/hppa1_1/pxfl/startup/bspstart.c
    130 //
    131129
    132130

  • testsuites/sptests/spsize/size.c

    r222788b r3ec7bfc  
    353353#ifndef unix  /* make sure this is not a native compile */
    354354
    355 #ifdef i386
     355#ifdef __i386__
    356356
    357357/* cpu.h */
    … …  
    362362#endif
    363363
    364 #ifdef i960
     364#ifdef __i960__
    365365
    366366/* cpu.h */
    … …  
    370370#endif
    371371
    372 #ifdef hppa1_1
     372#ifdef __hppa__
    373373
    374374/* cpu.h */
    … …  
    381381#endif
    382382
    383 #ifdef m68k
     383#ifdef __mc68000__
    384384
    385385/* cpu.h */
    … …  
    389389#endif
    390390
    391 #ifdef sparc
     391#ifdef __sparc__
    392392 
    393393/* cpu.h */
    … …  
    418418#endif
    419419
    420 #ifdef ppc
     420#ifdef __PPC__
    421421
    422422/* cpu.h */
    … …  
    441441
    442442#ifndef unix /* make sure this is not native */
    443 #ifdef sparc
     443#ifdef __sparc__
    444444
    445445initialized +=  (sizeof _CPU_Trap_slot_template);
Note: See TracChangeset for help on using the changeset viewer.