lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[assert] fix up a few places broken at DEBUG=0 after recent assert changes

Browse Source 
Forgot to test at DEBUG=0. Both of these are basically cases where
the new DEBUG_ASSERT_COND should be used, since the default DEBUG_ASSERT
will now always emit code that gets cleaned up in the optimizer.
This commit is contained in:
Travis Geiselbrecht
2021-04-02 20:15:28 -07:00
parent 897240eb43
commit 5a3d51e3e7
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
external/platform/stellaris/ti-driverlib/driverlib/debug.h vendored
View File

@@ -71,9 +71,9 @@ extern void __error__(char *pcFilename, unsigned long ulLine);
/* use lk's debug assert */
#undef ASSERT
#define ASSERT(e) DEBUG_ASSERT(e)
#define ASSERT(e) DEBUG_ASSERT_COND(e)
#if LK_DEBUGLEVEL > 0
#if LK_DEBUGLEVEL > 1
#define DEBUG
#endif

4
lib/heap/miniheap/miniheap.c
View File

@@ -89,9 +89,7 @@ void miniheap_dump(void) {
// try to insert this free chunk into the free list, consuming the chunk by merging it with
// nearby ones if possible. Returns base of whatever chunk it became in the list.
static struct free_heap_chunk *heap_insert_free_chunk(struct free_heap_chunk *chunk) {
#if LK_DEBUGLEVEL > INFO
vaddr_t chunk_end = (vaddr_t)chunk + chunk->len;
#endif
LTRACEF("chunk ptr %p, size 0x%zx\n", chunk, chunk->len);
@@ -317,7 +315,7 @@ void miniheap_free(void *ptr) {
struct alloc_struct_begin *as = (struct alloc_struct_begin *)ptr;
as--;
DEBUG_ASSERT(as->magic == HEAP_MAGIC);
DEBUG_ASSERT_COND(as->magic == HEAP_MAGIC);
#if DEBUG_HEAP
{