summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
06253cd)
The previous commit was incomplete and missed setting the entire
alloc area.
There are also additional problems with gcc optimizations of the
pointer math. The "auto" casting by gcc wouldn't return warnings,
but it was causing the optimization to be incorrect. We are now
very explicit in the casting in the pointer math.
Change-Id: I020808c8d1dda544fe862b9efb0e5345eeab5aab
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/804
Tested-by: build bot (Jenkins)
Reviewed-by: Peter Stuge <peter@stuge.se>
/* Make sure the region is setup correctly. */
if (!HAS_MAGIC(*ptr))
/* Make sure the region is setup correctly. */
if (!HAS_MAGIC(*ptr))
+ setup(ptr, (int)((&_eheap - &_heap) - HDRSIZE));
/* Find some free space. */
do {
/* Find some free space. */
do {
if (header & FLAG_FREE) {
if (len <= size) {
if (header & FLAG_FREE) {
if (len <= size) {
- hdrtype_t volatile *nptr = ptr + (HDRSIZE + len);
+ hdrtype_t volatile *nptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + len);
int nsize = size - (HDRSIZE + len);
/* If there is still room in this block,
int nsize = size - (HDRSIZE + len);
/* If there is still room in this block,
*ptr = USED_BLOCK(size);
}
*ptr = USED_BLOCK(size);
}
- return (void *)(ptr + HDRSIZE);
+ return (void *)((int)ptr + HDRSIZE);
+ ptr = (hdrtype_t volatile *)((int)ptr + HDRSIZE + size);
} while (ptr < (hdrtype_t *) hend);
} while (ptr < (hdrtype_t *) hend);
if (free_memory && (minimal_free > free_memory))
minimal_free = free_memory;
if (free_memory && (minimal_free > free_memory))
minimal_free = free_memory;
- printf("Maximum memory consumption: %d bytes",
+ printf("Maximum memory consumption: %d bytes\n",
(unsigned int)(&_eheap - &_heap) - HDRSIZE - minimal_free);
}
#endif
(unsigned int)(&_eheap - &_heap) - HDRSIZE - minimal_free);
}
#endif