Minor malloc-debug fixes

diff --git a/lib/libc/ansi/malloc-debug.c b/lib/libc/ansi/malloc-debug.c
index ae0420d9b95f1813b742c8f543354e164d8ebb3a..7b5ffe61e098894a2a133848d9e7e32bee26e6e0 100644 (file)
--- a/lib/libc/ansi/malloc-debug.c
+++ b/lib/libc/ansi/malloc-debug.c
@@ -126,7 +126,7 @@ static struct block *block_alloc(size_t size)
        read_tsc_64(&tsc);
        totalsize = block_get_totalsize(size);
        page_index_max = (ptr_max - ptr_min - totalsize) / PAGE_SIZE;
-       page_index = rem64u(tsc, page_index_max);
+       page_index = (page_index_max > 0) ? (tsc.lo % page_index_max) : 0;
        ptr = ptr_min + page_index * PAGE_SIZE;
        
        /* allocate block */
@@ -143,7 +143,7 @@ static struct block *block_alloc(size_t size)
        }
 
        /* block may not be at the requested location if that is in use */
-       if (ptr_min < (u8_t *) block)
+       if (ptr_min > (u8_t *) block)
                ptr_min = (u8_t *) block;
 
        if (ptr_max < (u8_t *) block)