projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
[oweals/u-boot.git]
/
common
/
dlmalloc.c
diff --git
a/common/dlmalloc.c
b/common/dlmalloc.c
index adc680e95938b7bb6b213f7c691e7de3cad69d1e..edaad299bbb552ad8b8710584268e8657f8cd0e7 100644
(file)
--- a/
common/dlmalloc.c
+++ b/
common/dlmalloc.c
@@
-1,6
+1,6
@@
#include <common.h>
#include <common.h>
-#if
def CONFIG_SANDBOX
+#if
defined(CONFIG_UNIT_TEST)
#define DEBUG
#endif
#define DEBUG
#endif
@@
-149,7
+149,7
@@
gAllocatedSize))
{
new_address = findRegion (new_address, new_size);
{
new_address = findRegion (new_address, new_size);
- if (
new_address == 0
)
+ if (
!new_address
)
return (void*)-1;
gAddressBase = gNextAddress =
return (void*)-1;
gAddressBase = gNextAddress =
@@
-175,7
+175,7
@@
gAllocatedSize))
(size + gNextAddress -
AlignPage (gNextAddress)),
MEM_COMMIT, PAGE_READWRITE);
(size + gNextAddress -
AlignPage (gNextAddress)),
MEM_COMMIT, PAGE_READWRITE);
- if (
res == 0
)
+ if (
!res
)
return (void*)-1;
}
tmp = (void*)gNextAddress;
return (void*)-1;
}
tmp = (void*)gNextAddress;
@@
-1254,7
+1254,7
@@
Void_t* mALLOc(bytes) size_t bytes;
INTERNAL_SIZE_T nb;
INTERNAL_SIZE_T nb;
-#if
def CONFIG_SYS_MALLOC_F_LEN
+#if
CONFIG_VAL(SYS_MALLOC_F_LEN)
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
return malloc_simple(bytes);
#endif
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
return malloc_simple(bytes);
#endif
@@
-1461,7
+1461,7
@@
Void_t* mALLOc(bytes) size_t bytes;
#if HAVE_MMAP
/* If big and would otherwise need to extend, try to use mmap instead */
if ((unsigned long)nb >= (unsigned long)mmap_threshold &&
#if HAVE_MMAP
/* If big and would otherwise need to extend, try to use mmap instead */
if ((unsigned long)nb >= (unsigned long)mmap_threshold &&
- (victim = mmap_chunk(nb))
!= 0
)
+ (victim = mmap_chunk(nb)))
return chunk2mem(victim);
#endif
return chunk2mem(victim);
#endif
@@
-1522,7
+1522,7
@@
void fREe(mem) Void_t* mem;
mchunkptr fwd; /* misc temp for linking */
int islr; /* track whether merging with last_remainder */
mchunkptr fwd; /* misc temp for linking */
int islr; /* track whether merging with last_remainder */
-#if
def CONFIG_SYS_MALLOC_F_LEN
+#if
CONFIG_VAL(SYS_MALLOC_F_LEN)
/* free() is a no-op - all the memory will be freed on relocation */
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
return;
/* free() is a no-op - all the memory will be freed on relocation */
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
return;
@@
-1671,7
+1671,10
@@
Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
mchunkptr fwd; /* misc temp for linking */
#ifdef REALLOC_ZERO_BYTES_FREES
mchunkptr fwd; /* misc temp for linking */
#ifdef REALLOC_ZERO_BYTES_FREES
- if (bytes == 0) { fREe(oldmem); return 0; }
+ if (!bytes) {
+ fREe(oldmem);
+ return NULL;
+ }
#endif
if ((long)bytes < 0) return NULL;
#endif
if ((long)bytes < 0) return NULL;
@@
-1679,7
+1682,7
@@
Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
/* realloc of null is supposed to be same as malloc */
if (oldmem == NULL) return mALLOc(bytes);
/* realloc of null is supposed to be same as malloc */
if (oldmem == NULL) return mALLOc(bytes);
-#if
def CONFIG_SYS_MALLOC_F_LEN
+#if
CONFIG_VAL(SYS_MALLOC_F_LEN)
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
/* This is harder to support and should not be needed */
panic("pre-reloc realloc() is not supported");
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
/* This is harder to support and should not be needed */
panic("pre-reloc realloc() is not supported");
@@
-1703,7
+1706,8
@@
Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
if(oldsize - SIZE_SZ >= nb) return oldmem; /* do nothing */
/* Must alloc, copy, free. */
newmem = mALLOc(bytes);
if(oldsize - SIZE_SZ >= nb) return oldmem; /* do nothing */
/* Must alloc, copy, free. */
newmem = mALLOc(bytes);
- if (newmem == 0) return 0; /* propagate failure */
+ if (!newmem)
+ return NULL; /* propagate failure */
MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ);
munmap_chunk(oldp);
return newmem;
MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ);
munmap_chunk(oldp);
return newmem;
@@
-1887,6
+1891,13
@@
Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
if ((long)bytes < 0) return NULL;
if ((long)bytes < 0) return NULL;
+#if CONFIG_VAL(SYS_MALLOC_F_LEN)
+ if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
+ nb = roundup(bytes, alignment);
+ return malloc_simple(nb);
+ }
+#endif
+
/* If need less alignment than we give anyway, just relay to malloc */
if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
/* If need less alignment than we give anyway, just relay to malloc */
if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
@@
-2074,7
+2085,7
@@
Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size;
return NULL;
else
{
return NULL;
else
{
-#if
def CONFIG_SYS_MALLOC_F_LEN
+#if
CONFIG_VAL(SYS_MALLOC_F_LEN)
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
MALLOC_ZERO(mem, sz);
return mem;
if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
MALLOC_ZERO(mem, sz);
return mem;
@@
-2375,9
+2386,9
@@
int mALLOPt(param_number, value) int param_number; int value;
int initf_malloc(void)
{
int initf_malloc(void)
{
-#if
def CONFIG_SYS_MALLOC_F_LEN
+#if
CONFIG_VAL(SYS_MALLOC_F_LEN)
assert(gd->malloc_base); /* Set up by crt0.S */
assert(gd->malloc_base); /* Set up by crt0.S */
- gd->malloc_limit = CONFIG_
SYS_MALLOC_F_LEN
;
+ gd->malloc_limit = CONFIG_
VAL(SYS_MALLOC_F_LEN)
;
gd->malloc_ptr = 0;
#endif
gd->malloc_ptr = 0;
#endif