[U-Boot] [PATCH v5] [RFC] early_malloc for DM added.

[Marek Vasut]

Dear Tomas Hlavacek,

> early_malloc for DM with support for more heaps and lightweight
> first heap in the same memory as an early stack.
> 
> Adaptation layer for seamless calling of early_malloc or dlmalloc from
> DM based on init stage added (dmmalloc() and related functions).
> 
> Signed-off-by: Tomas Hlavacek <tmshlvck at gmail.com>
[...]
>  31 files changed, 363 insertions(+)
>  create mode 100644 common/dmmalloc.c
>  create mode 100644 include/dmmalloc.h

What exactly changed in this version? Changelog is missing.

[...]

> +static int early_malloc_active(void)
> +{
> +	if ((gd->flags & GD_FLG_RELOC) == GD_FLG_RELOC)
> +		return 0;

Did you completely ignore the comments?

> +	return 1;
> +}
> +#endif /* CONFIG_SYS_EARLY_MALLOC */
> +
> +#ifdef CONFIG_SYS_EARLY_MALLOC
> +void *dmmalloc(size_t size)
> +{
> +	if (early_malloc_active())
> +		return early_malloc(size);
> +	return malloc(size);
> +}
> +#else /* CONFIG_SYS_EARLY_MALLOC */
> +#define dmmalloc malloc

How is this actually supposed to work?

> +#endif /* CONFIG_SYS_EARLY_MALLOC */
> +
> +#ifdef CONFIG_SYS_EARLY_MALLOC
> +void dmfree(void *ptr)
> +{
> +	if (early_malloc_active())
> +		return;
> +	free(ptr);
> +}
> +#else /* CONFIG_SYS_EARLY_MALLOC */
> +#define dmfree free
> +#endif /* CONFIG_SYS_EARLY_MALLOC */
> +
> +#ifdef CONFIG_SYS_EARLY_MALLOC
> +void *dmcalloc(size_t n, size_t elem_size)
> +{
> +	if (early_malloc_active())
> +		return NULL;
> +	return calloc(n, elem_size);
> +}
> +#else /* CONFIG_SYS_EARLY_MALLOC */
> +#define dmcalloc calloc
> +#endif /* CONFIG_SYS_EARLY_MALLOC */
> +
> +#ifdef CONFIG_SYS_EARLY_MALLOC
> +void *dmrealloc(void *oldmem, size_t bytes)
> +{
> +	if (early_malloc_active())
> +		return NULL;
> +	return dmrealloc(oldmem, bytes);
> +}
> +#else /* CONFIG_SYS_EARLY_MALLOC */
> +#define dmrealloc realloc
> +#endif /* CONFIG_SYS_EARLY_MALLOC */
> +
> diff --git a/include/dmmalloc.h b/include/dmmalloc.h
> new file mode 100644
> index 0000000..726c6c9
> --- /dev/null
> +++ b/include/dmmalloc.h
> @@ -0,0 +1,56 @@
> +/*
> + * (C) Copyright 2012
> + * Tomas Hlavacek (tmshlvck at gmail.com)
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#ifndef __INCLUDE_DMMALLOC_H
> +#define __INCLUDE_DMMALLOC_H
> +
> +#include <config.h>
> +#include <linux/stddef.h> /* for size_t */
> +
> +#if (!defined(CONFIG_SYS_EARLY_HEAP_ADDR)) || \
> +	(!defined(CONFIG_SYS_EARLY_HEAP_SIZE))
> +#undef CONFIG_SYS_EARLY_MALLOC
> +#endif /* CONFIG_SYS_EARLY_HEAP_ADDR */
> +
> +#ifdef CONFIG_SYS_EARLY_MALLOC
> +struct early_heap_header {
> +	void *free_space_pointer;
> +	size_t free_bytes;
> +	void *next_early_heap;
> +};
> +
> +struct early_heap_header *early_brk(size_t size);
> +void *early_malloc(size_t size);
> +
> +#endif /* CONFIG_SYS_EARLY_MALLOC */
> +
> +#ifdef CONFIG_SYS_DM

Isn't it CONFIG_DM ?

> +void *dmmalloc(size_t size);
> +void dmfree(void *ptr);
> +void *dmcalloc(size_t n, size_t elem_size);
> +void *dmrealloc(void *oldmem, size_t bytes);
> +#endif /* CONFIG_SYS_DM */
> +
> +
> +#endif /* __INCLUDE_DMMALLOC_H */
> +