change log for rtems (2011-05-18)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed May 18 06:12:09 UTC 2011
*strauman*:
2011-05-18 Till Straumann <strauman at slac.stanford.edu>
PR1797/bsps: Applied cleaned-up version of Kate's patch.
CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK is now a 'bspopts.h'
setting and as such configurable.
M 1.69 c/src/lib/libbsp/ChangeLog
M 1.247 c/src/lib/libbsp/powerpc/ChangeLog
M 1.19 c/src/lib/libbsp/powerpc/beatnik/ChangeLog
M 1.5 c/src/lib/libbsp/powerpc/beatnik/configure.ac
M 1.6 c/src/lib/libbsp/powerpc/beatnik/include/bsp.h
M 1.93 c/src/lib/libbsp/powerpc/ep1a/ChangeLog
M 1.16 c/src/lib/libbsp/powerpc/ep1a/configure.ac
M 1.159 c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
M 1.37 c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
M 1.26 c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h
M 1.55 c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
M 1.12 c/src/lib/libbsp/powerpc/mvme3100/configure.ac
M 1.11 c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
M 1.128 c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
M 1.18 c/src/lib/libbsp/powerpc/mvme5500/configure.ac
M 1.22 c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h
M 1.184 c/src/lib/libbsp/powerpc/psim/ChangeLog
M 1.37 c/src/lib/libbsp/powerpc/psim/configure.ac
M 1.187 c/src/lib/libbsp/powerpc/score603e/ChangeLog
M 1.38 c/src/lib/libbsp/powerpc/score603e/configure.ac
M 1.9 c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c
M 1.9 c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c
M 1.11 c/src/lib/libbsp/powerpc/shared/startup/sbrk.c
M 1.48 c/src/lib/libbsp/shared/bootcard.c
M 1.10 c/src/lib/libbsp/shared/include/bootcard.h
diff -u rtems/c/src/lib/libbsp/ChangeLog:1.68 rtems/c/src/lib/libbsp/ChangeLog:1.69
--- rtems/c/src/lib/libbsp/ChangeLog:1.68 Wed Apr 14 04:00:45 2010
+++ rtems/c/src/lib/libbsp/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,23 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * shared/bootcard.c, shared/include/bootcard.h: cleaned-up and
+ applied fixes proposed by PR#1797.
+
+2011-05-12 Joel Sherrill <joel.sherrill at OARcorp.com>
+
+ PR1797/bsps
+ * bootcard.c:
+ Added #ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK to minimize code
+ for small targets.
+
+2011-05-12 Kate Feng <feng at bnl.gov>
+
+ PR1797/bsps
+ * bootcard.c:
+ Fixed the value of heap_start & heap_size for the single-heap case.
+ Added bsp_sbrk_init() to fix PPC memory allocation beyond 32 MB.
+
2010-04-14 Ralf Corsépius <ralf.corsepius at rtems.org>
* shared/umon/umoncons.c:
diff -u rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.246 rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.247
--- rtems/c/src/lib/libbsp/powerpc/ChangeLog:1.246 Fri Feb 11 06:19:29 2011
+++ rtems/c/src/lib/libbsp/powerpc/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,21 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * shared/startup/sbrk.c: Cleanup; changed default
+ BSP_sbrk_policy to yield all memory to the heap.
+ App must specify a different policy if desired.
+
+2011-05-13 Gedare Bloom <gedare at gwmail.gwu.edu>
+
+ PR1797/bsps
+ * shared/startup/sbrk.c : Renamed bsp_sbrk_init().
+
+2011-05-07 Kate Feng <feng at bnl.gov>
+
+ PR1797/bsps
+ * shared/startup/bspgetworkarea.c: Removed _bsp_sbrk_init().
+ * shared/startup/pretaskinghook.c: Removed rtems/malloc.h.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* shared/console/polled_io.c, shared/flash/spansionFlash.c,
diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.18 rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.19
--- rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog:1.18 Mon May 16 10:14:32 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
2011-05-16 Till Straumann <strauman at slac.stanford.edu>
* include/bsp.h: define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.4 rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.5
--- rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac:1.4 Wed Feb 2 08:59:54 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/configure.ac Wed May 18 00:26:52 2011
@@ -32,6 +32,16 @@
of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile])
diff -u rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h:1.5 rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h:1.6
--- rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h:1.5 Mon May 16 10:14:32 2011
+++ rtems/c/src/lib/libbsp/powerpc/beatnik/include/bsp.h Wed May 18 00:26:52 2011
@@ -63,8 +63,6 @@
*/
#define BSP_INTERRUPT_STACK_SIZE (16 * 1024)
-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
-
/*
* base address definitions for several devices
*/
diff -u rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.92 rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.93
--- rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog:1.92 Fri Mar 4 08:37:16 2011
+++ rtems/c/src/lib/libbsp/powerpc/ep1a/ChangeLog Wed May 18 00:26:53 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac: Made CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ a bspopts.h setting.
+
2011-03-04 Joel Sherrill <joel.sherrilL at OARcorp.com>
PR 1751/bsps
diff -u rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.15 rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.16
--- rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac:1.15 Wed Feb 2 08:59:55 2011
+++ rtems/c/src/lib/libbsp/powerpc/ep1a/configure.ac Wed May 18 00:26:53 2011
@@ -33,6 +33,16 @@
RTEMS_BSPOPTS_HELP([CONSOLE_USE_INTERRUPTS],
[whether using console interrupts])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
RTEMS_CHECK_NETWORKING
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.158 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.159
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog:1.158 Fri Feb 11 06:50:46 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/tm27.h:
diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.36 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.37
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac:1.36 Wed Feb 2 09:00:04 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac Wed May 18 00:26:52 2011
@@ -31,6 +31,16 @@
of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
RTEMS_BSPOPTS_SET([mvme2100],[mvme2100],[1])
RTEMS_BSPOPTS_SET([mvme2100],[*],[])
RTEMS_BSPOPTS_HELP([mvme2100],
diff -u rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h:1.25 rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h:1.26
--- rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h:1.25 Fri Jan 28 14:29:51 2011
+++ rtems/c/src/lib/libbsp/powerpc/motorola_powerpc/include/bsp.h Wed May 18 00:26:52 2011
@@ -23,7 +23,6 @@
/*
* confdefs.h overrides for this BSP:
*/
-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
/*
* diagram illustrating the role of the configuration
diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.54 rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.55
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog:1.54 Fri Feb 11 06:48:40 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* network/tsec.c:
diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.11 rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.12
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac:1.11 Wed Feb 2 09:00:10 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/configure.ac Wed May 18 00:26:52 2011
@@ -35,6 +35,16 @@
of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
RTEMS_BSP_CLEANUP_OPTIONS(0, 1)
# Explicitly list all Makefiles here
diff -u rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h:1.10 rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h:1.11
--- rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h:1.10 Fri Jan 28 14:29:51 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h Wed May 18 00:26:52 2011
@@ -25,7 +25,6 @@
/*
* confdefs.h overrides for this BSP:
*/
-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
#define BSP_INTERRUPT_STACK_SIZE (16 * 1024)
diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.127 rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.128
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog:1.127 Fri Feb 11 06:50:48 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac, include/bsp.h: Made
+ CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK a bspopts.h setting.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h, include/tm27.h:
diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.17 rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.18
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac:1.17 Wed Feb 2 09:00:11 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/configure.ac Wed May 18 00:26:52 2011
@@ -31,6 +31,16 @@
of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
# Explicitly list all Makefiles here
diff -u rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.21 rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.22
--- rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h:1.21 Fri Feb 11 06:50:48 2011
+++ rtems/c/src/lib/libbsp/powerpc/mvme5500/include/bsp.h Wed May 18 00:26:52 2011
@@ -116,8 +116,6 @@
*/
#define BSP_INTERRUPT_STACK_SIZE (16 * 1024) /* <skf> 2/09 wants it to be adjustable by BSP */
-#define CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK /* <skf> 4/09 see shared/startup/sbrk.c and rtems/confdefs.h */
-
/* uart.c uses out_8 instead of outb */
#define BSP_UART_IOBASE_COM1 GT64x60_DEV1_BASE + 0x20000
#define BSP_UART_IOBASE_COM2 GT64x60_DEV1_BASE + 0x21000
diff -u rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog:1.183 rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog:1.184
--- rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog:1.183 Fri Feb 11 06:49:35 2011
+++ rtems/c/src/lib/libbsp/powerpc/psim/ChangeLog Wed May 18 00:26:52 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac: Made CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ a bspopts.h setting.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* include/bsp.h, include/tm27.h, startup/bspstart.c:
diff -u rtems/c/src/lib/libbsp/powerpc/psim/configure.ac:1.36 rtems/c/src/lib/libbsp/powerpc/psim/configure.ac:1.37
--- rtems/c/src/lib/libbsp/powerpc/psim/configure.ac:1.36 Wed Feb 2 09:00:14 2011
+++ rtems/c/src/lib/libbsp/powerpc/psim/configure.ac Wed May 18 00:26:53 2011
@@ -39,6 +39,16 @@
a clock ISR occurs while the IDLE thread is executing. This can
significantly reduce simulation times.])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
# Explicitly list all Makefiles here
diff -u rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.186 rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.187
--- rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog:1.186 Fri Feb 11 06:47:19 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/ChangeLog Wed May 18 00:26:53 2011
@@ -1,3 +1,9 @@
+2011-05-17 Till Straumann <strauman at slac.stanford.edu>
+
+ PR1797/bsps
+ * configure.ac: Made CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ a bspopts.h setting.
+
2011-02-11 Ralf Corsépius <ralf.corsepius at rtems.org>
* PCI_bus/PCI.c, console/console.c, include/bsp.h, include/tm27.h,
diff -u rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.37 rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.38
--- rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac:1.37 Wed Feb 2 09:00:17 2011
+++ rtems/c/src/lib/libbsp/powerpc/score603e/configure.ac Wed May 18 00:26:53 2011
@@ -61,6 +61,16 @@
of PowerPC 603e revisions and emulator versions.
The BSP actually contains the call that enables this.])
+RTEMS_BSPOPTS_SET([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK], [*], [1])
+RTEMS_BSPOPTS_HELP([CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK],
+[If defined then the BSP may reduce the available memory size
+initially. This can be useful for debugging (reduce the core
+size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).
+Note that the policy can still be defined by the application
+(see sbrk.c, BSP_sbrk_policy). By undefining
+CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed
+and a little memory is saved.])
+
RTEMS_BSPOPTS_SET([PPC_VECTOR_FILE_BASE],[*],[0x0100])
RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE],
[This defines the base address of the exception table.
diff -u rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c:1.8 rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c:1.9
--- rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c:1.8 Sun Nov 29 22:29:47 2009
+++ rtems/c/src/lib/libbsp/powerpc/shared/startup/bspgetworkarea.c Wed May 18 00:26:52 2011
@@ -16,7 +16,6 @@
#endif
extern void *__rtems_end;
-extern uintptr_t _bsp_sbrk_init(uintptr_t, uintptr_t*);
/*
* This method returns the base address and size of the area which
@@ -31,15 +30,12 @@
)
{
uintptr_t work_size;
- uintptr_t spared;
uintptr_t work_area;
work_area = (uintptr_t)&__rtems_end +
rtems_configuration_get_interrupt_stack_size();
work_size = (uintptr_t)BSP_mem_size - work_area;
- spared = _bsp_sbrk_init( work_area, &work_size );
-
*work_area_start = (void *)work_area,
*work_area_size = work_size;
*heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
diff -u rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c:1.8 rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c:1.9
--- rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c:1.8 Mon Sep 15 17:05:19 2008
+++ rtems/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c Wed May 18 00:26:52 2011
@@ -26,8 +26,6 @@
#include <rtems/bspIo.h>
#endif
-#include <rtems/malloc.h>
-
/*
* bsp_pretasking_hook
*
diff -u rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c:1.10 rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c:1.11
--- rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c:1.10 Tue Aug 3 17:02:30 2010
+++ rtems/c/src/lib/libbsp/powerpc/shared/startup/sbrk.c Wed May 18 00:26:52 2011
@@ -70,8 +70,8 @@
#include <sys/types.h>
#include <unistd.h>
-static uint32_t remaining_start=0;
-static uint32_t remaining_size=0;
+static void * remaining_start=(void*)-1LL;
+static uintptr_t remaining_size=0;
/* App. may provide a value by defining the BSP_sbrk_policy
* variable.
@@ -81,16 +81,17 @@
* 0 -> limit memory effectively to 32M.
*
*/
-extern uint32_t BSP_sbrk_policy __attribute__((weak));
+extern uintptr_t BSP_sbrk_policy __attribute__((weak));
-#define LIMIT_32M 0x02000000
+#define LIMIT_32M ((void*)0x02000000)
-uintptr_t _bsp_sbrk_init(
- uintptr_t heap_start,
+uintptr_t bsp_sbrk_init(
+ void *heap_start,
uintptr_t *heap_size_p
)
{
uintptr_t rval=0;
+ uintptr_t policy;
remaining_start = heap_start;
remaining_size = *heap_size_p;
@@ -104,29 +105,22 @@
remaining_size = rval;
}
- if ( 0 != &BSP_sbrk_policy ) {
- switch ( BSP_sbrk_policy ) {
- case (uint32_t)(-1):
- *heap_size_p += rval;
- remaining_start = heap_start + *heap_size_p;
- remaining_size = 0;
- /* return a nonzero sbrk_amount because the libsupport code
- * at some point divides by this number prior to trying an
- * sbrk() which will fail.
- */
- rval = 1;
- break;
+ policy = (0 == &BSP_sbrk_policy ? (uintptr_t)(-1) : BSP_sbrk_policy);
+ switch ( policy ) {
+ case (uintptr_t)(-1):
+ *heap_size_p += rval;
+ remaining_start = heap_start + *heap_size_p;
+ remaining_size = 0;
+ break;
case 0:
- remaining_size = 0;
- /* see above for why we return 1 */
- rval = 1;
- break;
+ remaining_size = 0;
+ break;
default:
- if ( rval > BSP_sbrk_policy )
- rval = BSP_sbrk_policy;
- break;
+ if ( rval > policy )
+ rval = policy;
+ break;
}
}
@@ -143,9 +137,9 @@
void *rval=(void*)-1;
/* FIXME: BEWARE if size >2G */
- if (incr <= remaining_size) {
+ if ( remaining_start != (void*)-1LL && incr <= remaining_size) {
remaining_size-=incr;
- rval = (void*)remaining_start;
+ rval = remaining_start;
remaining_start += incr;
} else {
errno = ENOMEM;
diff -u rtems/c/src/lib/libbsp/shared/bootcard.c:1.47 rtems/c/src/lib/libbsp/shared/bootcard.c:1.48
--- rtems/c/src/lib/libbsp/shared/bootcard.c:1.47 Mon Oct 12 15:22:18 2009
+++ rtems/c/src/lib/libbsp/shared/bootcard.c Wed May 18 00:26:52 2011
@@ -53,6 +53,11 @@
#include <bsp/bootcard.h>
#include <rtems/bspIo.h>
+#include <rtems/malloc.h>
+
+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+#include <unistd.h> /* for sbrk() */
+#endif
/*
* At most a single pointer to the cmdline for those target
@@ -74,23 +79,30 @@
void *work_area_start,
uintptr_t work_area_size,
void *heap_start,
- uintptr_t heap_size
+ uintptr_t heap_size,
+ uintptr_t sbrk_amount
)
{
- if ( !rtems_unified_work_area &&
- heap_start == BSP_BOOTCARD_HEAP_USES_WORK_AREA) {
- uintptr_t work_space_size = rtems_configuration_get_work_space_size();
-
- heap_start = (char *) work_area_start + work_space_size;
-
- if (heap_size == BSP_BOOTCARD_HEAP_SIZE_DEFAULT) {
- uintptr_t heap_size_default = work_area_size - work_space_size;
-
- heap_size = heap_size_default;
+ if ( heap_start == BSP_BOOTCARD_HEAP_USES_WORK_AREA ) {
+ if ( rtems_unified_work_area ) {
+ uintptr_t work_space_size = rtems_configuration_get_work_space_size();
+
+ heap_start = (char *) work_area_start + work_space_size;
+
+ if (heap_size == BSP_BOOTCARD_HEAP_SIZE_DEFAULT) {
+ uintptr_t heap_size_default = work_area_size - work_space_size;
+
+ heap_size = heap_size_default;
+ }
+ } else {
+ heap_start = work_area_start;
+ if (heap_size == BSP_BOOTCARD_HEAP_SIZE_DEFAULT) {
+ heap_size = work_area_size;
+ }
}
}
- bsp_libc_init(heap_start, heap_size, 0);
+ bsp_libc_init(heap_start, heap_size, sbrk_amount);
}
/*
@@ -108,6 +120,7 @@
uintptr_t work_area_size = 0;
void *heap_start = NULL;
uintptr_t heap_size = 0;
+ uintptr_t sbrk_amount = 0;
/*
* Special case for PowerPC: The interrupt disable mask is stored in SPRG0.
@@ -136,6 +149,32 @@
bsp_get_work_area(&work_area_start, &work_area_size,
&heap_start, &heap_size);
+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+ /* This routine may reduce the work area size with the
+ * option to extend it later via sbrk(). If the application
+ * was configured w/o CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK then
+ * omit this step.
+ */
+ if ( rtems_malloc_sbrk_helpers ) {
+ sbrk_amount = bsp_sbrk_init(work_area_start, &work_area_size);
+ if ( work_area_size < Configuration.work_space_size && sbrk_amount > 0 ) {
+ /* Need to use sbrk right now */
+ uintptr_t sbrk_now;
+
+ sbrk_now = (Configuration.work_space_size - work_area_size) / sbrk_amount;
+ sbrk( sbrk_now * sbrk_amount );
+ }
+ }
+#else
+ if ( rtems_malloc_sbrk_helpers ) {
+ printk("Configuration error!\n"
+ "Application was configured with CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK\n"
+ "but BSP was configured w/o sbrk support\n");
+ bsp_cleanup();
+ return -1;
+ }
+#endif
+
if ( work_area_size <= Configuration.work_space_size ) {
printk(
"bootcard: work space too big for work area: %p > %p\n",
@@ -170,7 +209,8 @@
work_area_start,
work_area_size,
heap_start,
- heap_size
+ heap_size,
+ sbrk_amount
);
/*
diff -u rtems/c/src/lib/libbsp/shared/include/bootcard.h:1.9 rtems/c/src/lib/libbsp/shared/include/bootcard.h:1.10
--- rtems/c/src/lib/libbsp/shared/include/bootcard.h:1.9 Fri Apr 30 06:17:49 2010
+++ rtems/c/src/lib/libbsp/shared/include/bootcard.h Wed May 18 00:26:52 2011
@@ -89,6 +89,23 @@
);
/**
+ * @brief Gives the BSP a chance to reduce the work area size with sbrk() adding more later.
+ *
+ * bsp_sbrk_init() may reduce the work area size passed in. The routine
+ * returns the 'sbrk_amount' to be used when extending the heap.
+ * Note that the return value may be zero.
+ *
+ */
+
+#ifdef CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK
+uintptr_t bsp_sbrk_init(
+ void *work_area_begin,
+ uintptr_t *work_area_size_p
+);
+#endif
+
+
+/**
* @brief Standard system initialization procedure.
*
* You may pass a command line in @a cmdline. It is later available via the
*ralf*:
2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
Comment out psignal().
M 1.2834 cpukit/ChangeLog
M 1.5 cpukit/libnetworking/sys/signalvar.h
diff -u rtems/cpukit/ChangeLog:1.2833 rtems/cpukit/ChangeLog:1.2834
--- rtems/cpukit/ChangeLog:1.2833 Tue May 17 14:57:11 2011
+++ rtems/cpukit/ChangeLog Wed May 18 00:13:07 2011
@@ -1,3 +1,8 @@
+2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
+ Comment out psignal().
+
2011-05-17 Joel Sherrill <joel.sherrill at oarcorp.com>
* score/Makefile.am, score/preinstall.am: bspsmp.h is now supposed to
@@ -19,6 +24,7 @@
score/src/schedulersimplesmpschedule.c,
score/src/schedulersimplesmpunblock.c: New files.
+>>>>>>> 1.2833
2011-05-16 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/Makefile.am: Reformat.
diff -u rtems/cpukit/libnetworking/sys/signalvar.h:1.4 rtems/cpukit/libnetworking/sys/signalvar.h:1.5
--- rtems/cpukit/libnetworking/sys/signalvar.h:1.4 Wed Feb 23 08:36:05 2011
+++ rtems/cpukit/libnetworking/sys/signalvar.h Wed May 18 00:13:07 2011
@@ -10,10 +10,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -31,10 +27,14 @@
* SUCH DAMAGE.
*
* @(#)signalvar.h 8.6 (Berkeley) 2/19/95
+ * $FreeBSD: src/sys/sys/signalvar.h,v 1.91 2010/07/08 19:15:26 jhb Exp $
+ */
+
+/*
* $Id$
*/
-#ifndef _SYS_SIGNALVAR_H_ /* tmp for user.h */
+#ifndef _SYS_SIGNALVAR_H_
#define _SYS_SIGNALVAR_H_
/*
@@ -161,7 +161,10 @@
void killproc(struct proc *p, char *why);
void pgsignal(struct pgrp *pgrp, int sig, int checkctty);
void postsig(int sig);
+#ifndef __rtems__
+/* clashes with psignal(3) */
void psignal(struct proc *p, int sig);
+#endif
void setsigvec(struct proc *p, int signum, struct sigaction *sa);
void sigexit(struct proc *p, int signum);
void siginit(struct proc *p);
@@ -172,4 +175,5 @@
*/
void sendsig(sig_t action, int sig, int returnmask, u_long code);
#endif /* _KERNEL */
+
#endif /* !_SYS_SIGNALVAR_H_ */
*ralf*:
Remove conflict indicator.
M 1.2835 cpukit/ChangeLog
diff -u rtems/cpukit/ChangeLog:1.2834 rtems/cpukit/ChangeLog:1.2835
--- rtems/cpukit/ChangeLog:1.2834 Wed May 18 00:13:07 2011
+++ rtems/cpukit/ChangeLog Wed May 18 00:14:25 2011
@@ -24,7 +24,6 @@
score/src/schedulersimplesmpschedule.c,
score/src/schedulersimplesmpunblock.c: New files.
->>>>>>> 1.2833
2011-05-16 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/Makefile.am: Reformat.
*ralf*:
2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* sapi/Makefile.am: Reformat.
M 1.2836 cpukit/ChangeLog
M 1.42 cpukit/sapi/Makefile.am
diff -u rtems/cpukit/ChangeLog:1.2835 rtems/cpukit/ChangeLog:1.2836
--- rtems/cpukit/ChangeLog:1.2835 Wed May 18 00:14:25 2011
+++ rtems/cpukit/ChangeLog Wed May 18 00:16:23 2011
@@ -1,5 +1,9 @@
2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+ * sapi/Makefile.am: Reformat.
+
+2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* libnetworking/sys/signalvar.h: Cosmetics from FreeBSD.
Comment out psignal().
diff -u rtems/cpukit/sapi/Makefile.am:1.41 rtems/cpukit/sapi/Makefile.am:1.42
--- rtems/cpukit/sapi/Makefile.am:1.41 Mon Apr 4 13:44:16 2011
+++ rtems/cpukit/sapi/Makefile.am Wed May 18 00:16:23 2011
@@ -8,15 +8,21 @@
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = include/confdefs.h
-include_rtems_HEADERS += include/rtems/chain.h include/rtems/config.h \
- include/rtems/extension.h include/rtems/fatal.h include/rtems/init.h \
- include/rtems/io.h include/rtems/mptables.h include/rtems/rbtree.h \
- include/rtems/sptables.h
+include_rtems_HEADERS += include/rtems/chain.h
+include_rtems_HEADERS += include/rtems/config.h
+include_rtems_HEADERS += include/rtems/extension.h
+include_rtems_HEADERS += include/rtems/fatal.h
+include_rtems_HEADERS += include/rtems/init.h
+include_rtems_HEADERS += include/rtems/io.h
+include_rtems_HEADERS += include/rtems/mptables.h
+include_rtems_HEADERS += include/rtems/rbtree.h
+include_rtems_HEADERS += include/rtems/sptables.h
EXTRA_DIST = include/rtems/README
-include_rtems_HEADERS += inline/rtems/chain.inl \
- inline/rtems/extension.inl inline/rtems/rbtree.inl
+include_rtems_HEADERS += inline/rtems/chain.inl
+include_rtems_HEADERS += inline/rtems/extension.inl
+include_rtems_HEADERS += inline/rtems/rbtree.inl
## src
AM_CPPFLAGS += -D__RTEMS_INSIDE__
*ralf*:
2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
* Makefile.am: Reformat.
M 1.130 cpukit/score/cpu/arm/ChangeLog
M 1.42 cpukit/score/cpu/arm/Makefile.am
diff -u rtems/cpukit/score/cpu/arm/ChangeLog:1.129 rtems/cpukit/score/cpu/arm/ChangeLog:1.130
--- rtems/cpukit/score/cpu/arm/ChangeLog:1.129 Fri Apr 15 03:06:16 2011
+++ rtems/cpukit/score/cpu/arm/ChangeLog Wed May 18 00:18:22 2011
@@ -1,3 +1,7 @@
+2011-05-18 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * Makefile.am: Reformat.
+
2011-04-15 Sebastian Huber <sebastian.huber at embedded-brains.de>
PR 1780/cpukit
diff -u rtems/cpukit/score/cpu/arm/Makefile.am:1.41 rtems/cpukit/score/cpu/arm/Makefile.am:1.42
--- rtems/cpukit/score/cpu/arm/Makefile.am:1.41 Tue Jan 12 09:03:22 2010
+++ rtems/cpukit/score/cpu/arm/Makefile.am Wed May 18 00:18:22 2011
@@ -6,8 +6,10 @@
include_rtems_HEADERS = rtems/asm.h
include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/cpu_asm.h \
- rtems/score/arm.h rtems/score/types.h
+include_rtems_score_HEADERS = rtems/score/cpu.h
+include_rtems_score_HEADERS += rtems/score/cpu_asm.h
+include_rtems_score_HEADERS += rtems/score/arm.h
+include_rtems_score_HEADERS += rtems/score/types.h
noinst_LIBRARIES = libscorecpu.a
libscorecpu_a_CPPFLAGS = $(AM_CPPFLAGS)
*ralf*:
2011-05-16 Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
* psxclock/init.c (Init):
Use CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
* psxclock/psxclock.scn: Regenerate.
M 1.340 testsuites/psxtests/ChangeLog
M 1.12 testsuites/psxtests/psxclock/init.c
M 1.6 testsuites/psxtests/psxclock/psxclock.scn
diff -u rtems/testsuites/psxtests/ChangeLog:1.339 rtems/testsuites/psxtests/ChangeLog:1.340
--- rtems/testsuites/psxtests/ChangeLog:1.339 Fri May 6 12:29:28 2011
+++ rtems/testsuites/psxtests/ChangeLog Wed May 18 00:19:30 2011
@@ -1,3 +1,9 @@
+2011-05-16 Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
+
+ * psxclock/init.c (Init):
+ Use CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
+ * psxclock/psxclock.scn: Regenerate.
+
2011-05-06 Joel Sherrill <joel.sherrill at oarcorp.com>
* psxfile01/test.c, psxmsgq01/init.c, psxreaddir/test.c: Fix tests
diff -u rtems/testsuites/psxtests/psxclock/init.c:1.11 rtems/testsuites/psxtests/psxclock/init.c:1.12
--- rtems/testsuites/psxtests/psxclock/init.c:1.11 Tue Feb 22 03:47:32 2011
+++ rtems/testsuites/psxtests/psxclock/init.c Wed May 18 00:19:30 2011
@@ -112,7 +112,7 @@
rtems_test_assert( !remaining );
/* print new times to make sure it has changed and we can get the realtime */
- sc = clock_gettime( CLOCK_PROCESS_CPUTIME, &tv );
+ sc = clock_gettime( CLOCK_PROCESS_CPUTIME_ID, &tv );
rtems_test_assert( !sc );
printf("Time since boot: (%" PRItime_t ", %ld)\n", tv.tv_sec,tv.tv_nsec );
@@ -222,29 +222,29 @@
printf( ctime( &tv.tv_sec ) );
empty_line();
- puts( "clock_gettime - CLOCK_THREAD_CPUTIME -- ENOSYS" );
+ puts( "clock_gettime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS" );
#if defined(_POSIX_THREAD_CPUTIME)
{
struct timespec tp;
- sc = clock_gettime( CLOCK_THREAD_CPUTIME, &tp );
+ sc = clock_gettime( CLOCK_THREAD_CPUTIME_ID, &tp );
check_enosys( sc );
}
#endif
- puts( "clock_settime - CLOCK_PROCESS_CPUTIME -- ENOSYS" );
+ puts( "clock_settime - CLOCK_PROCESS_CPUTIME_ID -- ENOSYS" );
#if defined(_POSIX_CPUTIME)
{
struct timespec tp;
- sc = clock_settime( CLOCK_PROCESS_CPUTIME, &tp );
+ sc = clock_settime( CLOCK_PROCESS_CPUTIME_ID, &tp );
check_enosys( sc );
}
#endif
- puts( "clock_settime - CLOCK_THREAD_CPUTIME -- ENOSYS" );
+ puts( "clock_settime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS" );
#if defined(_POSIX_THREAD_CPUTIME)
{
struct timespec tp;
- sc = clock_settime( CLOCK_THREAD_CPUTIME, &tp );
+ sc = clock_settime( CLOCK_THREAD_CPUTIME_ID, &tp );
check_enosys( sc );
}
#endif
diff -u rtems/testsuites/psxtests/psxclock/psxclock.scn:1.5 rtems/testsuites/psxtests/psxclock/psxclock.scn:1.6
--- rtems/testsuites/psxtests/psxclock/psxclock.scn:1.5 Wed Nov 11 18:21:51 2009
+++ rtems/testsuites/psxtests/psxclock/psxclock.scn Wed May 18 00:19:30 2011
@@ -30,7 +30,7 @@
Init: sec (0), nsec (0) remaining
Init: nanosleep - 1.35 seconds
Fri May 24 11:05:07 1996
-clock_gettime - CLOCK_THREAD_CPUTIME -- ENOSYS
-clock_settime - CLOCK_PROCESS_CPUTIME -- ENOSYS
-clock_settime - CLOCK_THREAD_CPUTIME -- ENOSYS
+clock_gettime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS
+clock_settime - CLOCK_PROCESS_CPUTIME_ID -- ENOSYS
+clock_settime - CLOCK_THREAD_CPUTIME_ID -- ENOSYS
*** END OF POSIX CLOCK TEST ***
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20110518/21b7a10c/attachment.html>
More information about the vc
mailing list