Changeset 263ab4b in rtems


Ignore:
Timestamp:
Jun 29, 2010, 6:51:49 PM (9 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.11, master
Children:
cd90b9c9
Parents:
8980996
Message:

2010-06-29 Joel Sherrill <joel.sherrill@…>

  • configure.ac, score/include/rtems/score/percpu.h: Add RTEMS_SIZEOF_VOID_P to cpuopts.h so percpu.h has this information available during build and after installation.
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r8980996 r263ab4b  
     12010-06-29      Joel Sherrill <joel.sherrill@oarcorp.com>
     2
     3        * configure.ac, score/include/rtems/score/percpu.h: Add
     4        __RTEMS_SIZEOF_VOID_P__ to cpuopts.h so percpu.h has this information
     5        available during build and after installation.
     6
    172010-06-29      Sebastian Huber <sebastian.huber@embedded-brains.de>
    28
  • cpukit/configure.ac

    r8980996 r263ab4b  
    119119rtems_revision=`echo _RTEMS_VERSION | sed "s/[[0-9]][[0-9]]*\.//;s/[[0-9]][[0-9]]*\.//;s/\..*//"`
    120120
     121## This is needed to generate the field offsets of the per CPU
     122## data structure so they can be accessed from assembly code.
     123AC_CHECK_SIZEOF([void *])
     124
    121125_RTEMS_CPUOPT_INIT
    122126
     
    195199  [1],
    196200  [Define to 1 if ada/gnat bindings are built-in])
     201
     202## Then we propagate a private copy of the value into cpuopts.h
     203## so it is always available to the RTEMS header files.
     204
     205RTEMS_CPUOPT([__RTEMS_SIZEOF_VOID_P__],
     206  [true],
     207  [$ac_cv_sizeof_void_p],
     208  [Size of a void * pointer])
    197209
    198210RTEMS_CPUOPT([__RTEMS_MAJOR__],
     
    251263## Check if libc provides BSD's strlcpy/strlcat
    252264AC_CHECK_FUNCS(strlcpy strlcat)
    253 
    254 ## This is needed to generate the field offsets of the per CPU
    255 ## data structure so they can be accessed from assembly code.
    256 AC_CHECK_SIZEOF([void *])
    257265
    258266# ... far too many conditionals ...
  • cpukit/score/include/rtems/score/percpu.h

    r8980996 r263ab4b  
    9898   */
    9999  #define PER_CPU_INTERRUPT_STACK_LOW   0
    100   #define PER_CPU_INTERRUPT_STACK_HIGH  (1 * SIZEOF_VOID_P)
    101   #define PER_CPU_END_STACK             (2 * SIZEOF_VOID_P)
     100  #define PER_CPU_INTERRUPT_STACK_HIGH  (1 * __RTEMS_SIZEOF_VOID_P__)
     101  #define PER_CPU_END_STACK             (2 * __RTEMS_SIZEOF_VOID_P__)
    102102#else
    103103  /*
     
    110110 *  These are the offsets of the required elements in the per CPU table.
    111111 */
    112 #define PER_CPU_ISR_NEST_LEVEL   PER_CPU_END_STACK + 0
    113 #define PER_CPU_EXECUTING        PER_CPU_END_STACK + (1 * SIZEOF_VOID_P)
    114 #define PER_CPU_HEIR             PER_CPU_END_STACK + (2 * SIZEOF_VOID_P)
    115 #define PER_CPU_IDLE             PER_CPU_END_STACK + (3 * SIZEOF_VOID_P)
    116 #define PER_CPU_DISPATCH_NEEDED  PER_CPU_END_STACK + (4 * SIZEOF_VOID_P)
     112#define PER_CPU_ISR_NEST_LEVEL \
     113          PER_CPU_END_STACK + 0
     114#define PER_CPU_EXECUTING \
     115          PER_CPU_END_STACK + (1 * __RTEMS_SIZEOF_VOID_P__)
     116#define PER_CPU_HEIR \
     117          PER_CPU_END_STACK + (2 * __RTEMS_SIZEOF_VOID_P__)
     118#define PER_CPU_IDLE \
     119          PER_CPU_END_STACK + (3 * __RTEMS_SIZEOF_VOID_P__)
     120#define PER_CPU_DISPATCH_NEEDED \
     121          PER_CPU_END_STACK + (4 * __RTEMS_SIZEOF_VOID_P__)
     122
    117123#define ISR_NEST_LEVEL \
    118     (SYM(_Per_CPU_Information) + PER_CPU_ISR_NEST_LEVEL)
     124         (SYM(_Per_CPU_Information) + PER_CPU_ISR_NEST_LEVEL)
    119125#define DISPATCH_NEEDED \
    120     (SYM(_Per_CPU_Information) + PER_CPU_DISPATCH_NEEDED)
     126        (SYM(_Per_CPU_Information) + PER_CPU_DISPATCH_NEEDED)
    121127
    122128/*
Note: See TracChangeset for help on using the changeset viewer.