Changeset 263ab4b in rtems

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:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• score/include/rtems/score/percpu.h (modified) (2 diffs)

cpukit/ChangeLog

@@ +1 @@
+2010-06-29      Joel Sherrill <joel.sherrill@oarcorp.com>
+
+        * 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.
+
 2010-06-29      Sebastian Huber <sebastian.huber@embedded-brains.de>
 

cpukit/configure.ac

@@ -119 +119 @@
 rtems_revision=`echo _RTEMS_VERSION | sed "s/[[0-9]][[0-9]]*\.//;s/[[0-9]][[0-9]]*\.//;s/\..*//"`
 
+## This is needed to generate the field offsets of the per CPU 
+## data structure so they can be accessed from assembly code.
+AC_CHECK_SIZEOF([void *])
+
 _RTEMS_CPUOPT_INIT
 
@@ -195 +199 @@
   [1],
   [Define to 1 if ada/gnat bindings are built-in])
+
+## Then we propagate a private copy of the value into cpuopts.h
+## so it is always available to the RTEMS header files.
+
+RTEMS_CPUOPT([__RTEMS_SIZEOF_VOID_P__],
+  [true],
+  [$ac_cv_sizeof_void_p],
+  [Size of a void * pointer])
 
 RTEMS_CPUOPT([__RTEMS_MAJOR__],
@@ -251 +263 @@
 ## Check if libc provides BSD's strlcpy/strlcat
 AC_CHECK_FUNCS(strlcpy strlcat)
-
-## This is needed to generate the field offsets of the per CPU 
-## data structure so they can be accessed from assembly code.
-AC_CHECK_SIZEOF([void *])
 
 # ... far too many conditionals ...

cpukit/score/include/rtems/score/percpu.h

@@ -98 +98 @@
    */
   #define PER_CPU_INTERRUPT_STACK_LOW   0
-  #define PER_CPU_INTERRUPT_STACK_HIGH  (1 * SIZEOF_VOID_P)
-  #define PER_CPU_END_STACK             (2 * SIZEOF_VOID_P)
+  #define PER_CPU_INTERRUPT_STACK_HIGH  (1 * __RTEMS_SIZEOF_VOID_P__)
+  #define PER_CPU_END_STACK             (2 * __RTEMS_SIZEOF_VOID_P__)
 #else
   /*
@@ -110 +110 @@
  *  These are the offsets of the required elements in the per CPU table.
  */
-#define PER_CPU_ISR_NEST_LEVEL   PER_CPU_END_STACK + 0
-#define PER_CPU_EXECUTING        PER_CPU_END_STACK + (1 * SIZEOF_VOID_P)
-#define PER_CPU_HEIR             PER_CPU_END_STACK + (2 * SIZEOF_VOID_P)
-#define PER_CPU_IDLE             PER_CPU_END_STACK + (3 * SIZEOF_VOID_P)
-#define PER_CPU_DISPATCH_NEEDED  PER_CPU_END_STACK + (4 * SIZEOF_VOID_P)
+#define PER_CPU_ISR_NEST_LEVEL \
+          PER_CPU_END_STACK + 0
+#define PER_CPU_EXECUTING \
+          PER_CPU_END_STACK + (1 * __RTEMS_SIZEOF_VOID_P__)
+#define PER_CPU_HEIR \
+          PER_CPU_END_STACK + (2 * __RTEMS_SIZEOF_VOID_P__)
+#define PER_CPU_IDLE \
+          PER_CPU_END_STACK + (3 * __RTEMS_SIZEOF_VOID_P__)
+#define PER_CPU_DISPATCH_NEEDED \
+          PER_CPU_END_STACK + (4 * __RTEMS_SIZEOF_VOID_P__)
+
 #define ISR_NEST_LEVEL \
-    (SYM(_Per_CPU_Information) + PER_CPU_ISR_NEST_LEVEL)
+         (SYM(_Per_CPU_Information) + PER_CPU_ISR_NEST_LEVEL)
 #define DISPATCH_NEEDED \
-    (SYM(_Per_CPU_Information) + PER_CPU_DISPATCH_NEEDED)
+         (SYM(_Per_CPU_Information) + PER_CPU_DISPATCH_NEEDED)
 
 /*