diff options
| author | Michael Brown | 2005-05-13 12:18:21 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-05-13 12:18:21 +0200 |
| commit | f0d048bf9170f7b81f726f7a44079741f74b924a (patch) | |
| tree | 30a43ce2193d835474f41c77ef96d64c2dd11197 /src/core | |
| parent | Added old allot/forget calls for backwards compatibility. (diff) | |
| download | ipxe-f0d048bf9170f7b81f726f7a44079741f74b924a.tar.gz ipxe-f0d048bf9170f7b81f726f7a44079741f74b924a.tar.xz ipxe-f0d048bf9170f7b81f726f7a44079741f74b924a.zip | |
Added ASSERT() macro
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/heap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/heap.c b/src/core/heap.c index 3476f4d25..05fbb6bac 100644 --- a/src/core/heap.c +++ b/src/core/heap.c @@ -3,8 +3,6 @@ #include "memsizes.h" #include "heap.h" -#define ASSERT(...) - struct heap_block { size_t size; char data[0]; @@ -102,7 +100,7 @@ void * emalloc ( size_t size, unsigned int align ) { physaddr_t addr; struct heap_block *block; - ASSERT ( ! ( align & ( align - 1 ) ) ); + ASSERT ( ( align & ( align - 1 ) ) == 0 ); addr = ( ( ( heap_ptr - size ) & ~( align - 1 ) ) - sizeof ( struct heap_block ) ); @@ -132,7 +130,7 @@ void * emalloc_all ( size_t *size ) { void efree ( void *ptr ) { struct heap_block *block; - ASSERT ( ptr == ( heap_ptr + sizeof ( size_t ) ) ); + ASSERT ( ptr == phys_to_virt ( heap_ptr + sizeof ( size_t ) ) ); block = ( struct heap_block * ) ( ptr - offsetof ( struct heap_block, data ) ); |