2010-08-10 Joel Sherrill <joel.sherrill@oarcorp.com>

PR 1661/testing
	* libcsupport/Makefile.am, libcsupport/include/rtems/libcsupport.h: Add
	public methods to get/set malloc heap pointer so the tests do not
	have to peer behind the API.
	* libcsupport/src/mallocgetheapptr.c,
	libcsupport/src/mallocsetheapptr.c: New files.

cpukit/ChangeLog

@@ -1,3 +1,12 @@
+2010-08-10	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1661/testing
+	* libcsupport/Makefile.am, libcsupport/include/rtems/libcsupport.h: Add
+	public methods to get/set malloc heap pointer so the tests do not
+	have to peer behind the API.
+	* libcsupport/src/mallocgetheapptr.c,
+	libcsupport/src/mallocsetheapptr.c: New files.
+
 2010-08-09	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* score/inline/rtems/score/object.inl: Use attribute unused in

cpukit/libcsupport/Makefile.am

@@ -92,6 +92,7 @@ MALLOC_C_FILES = src/malloc_initialize.c src/calloc.c src/malloc.c \
     src/realloc.c src/_calloc_r.c src/_malloc_r.c \
     src/free.c src/freenode.c src/_free_r.c \
     src/_realloc_r.c src/mallocfreespace.c \
+   src/mallocgetheapptr.c src/mallocsetheapptr.c \
     src/mallocinfo.c src/malloc_walk.c src/malloc_get_statistics.c \
     src/malloc_report_statistics.c src/malloc_report_statistics_plugin.c \
     src/malloc_statistics_helpers.c src/posix_memalign.c \

cpukit/libcsupport/include/rtems/libcsupport.h

@@ -35,6 +35,8 @@ void RTEMS_Malloc_Initialize(
 
 extern void malloc_dump(void);
 extern void malloc_walk(size_t source, size_t printf_enabled);
+void malloc_set_heap_pointer(Heap_Control *new_heap);
+Heap_Control *malloc_get_heap_pointer( void );
 extern void libc_init(void);
 extern int  host_errno(void);
 extern void fix_syscall_errno(void);

cpukit/libcsupport/src/mallocgetheapptr.c

@@ -0,0 +1,26 @@
+/*
+ *  RTEMS Malloc Get Heap Pointer -- Primarily for Debug
+ *
+ *  COPYRIGHT (c) 1989-2010.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems.h>
+#include <rtems/libcsupport.h>
+#include "malloc_p.h"
+
+Heap_Control *malloc_get_heap_pointer( void )
+{
+  return RTEMS_Malloc_Heap;
+}

cpukit/libcsupport/src/mallocsetheapptr.c

@@ -0,0 +1,28 @@
+/*
+ *  RTEMS Malloc Set Heap Pointer -- Primarily for Debug
+ *
+ *  COPYRIGHT (c) 1989-2010.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems.h>
+#include <rtems/libcsupport.h>
+#include "malloc_p.h"
+
+void malloc_set_heap_pointer(
+  Heap_Control *new_heap
+)
+{
+  RTEMS_Malloc_Heap = new_heap;
+}