| 110,7 → 110,7 |
|---|
| return rv; |
| } |
| |
| #define RET(rv) CHECK(rv); ENDSZ(rv) |= 1; rv->size |= 1; malloc_unlock(); return DATA(rv) |
| #define RET(rv) CHECK(rv); ENDSZ(rv) |= 1; rv->size |= 1; return DATA(rv) |
| |
| void * malloc(size_t size) |
| { |
| 124,8 → 124,6 |
|---|
| printf("malloc(%u)\n", size); |
| #endif |
| |
| malloc_lock(); |
| |
| #if NUMSMALL |
| if (size < SMALL) |
| { |
| 133,7 → 131,6 |
|---|
| if (rv) |
| { |
| smallblocks[size/ALIGN] = rv->next; |
| malloc_unlock(); |
| return DATA(rv); |
| } |
| } |
| 208,10 → 205,8 |
|---|
| |
| chunk_size = size+16; /* two ends plus two placeholders */ |
| rv = (BLOCK *)sbrk(chunk_size); |
| if (rv == (BLOCK *)(-1)) { |
| malloc_unlock(); |
| if (rv == (BLOCK *)(-1)) |
| return 0; |
| } |
| #if DEBUG |
| printf("sbrk(%d) -> %08x, expected %08x\n", chunk_size, rv, expected_sbrk); |
| #endif |
| 302,14 → 297,11 |
|---|
| return; |
| block = (BLOCK *)((char *)ptr-4); |
| |
| malloc_lock(); |
| |
| #if NUMSMALL |
| if (block->size < SMALL) |
| { |
| block->next = smallblocks[block->size/ALIGN]; |
| smallblocks[block->size/ALIGN] = block; |
| malloc_unlock(); |
| return; |
| } |
| #endif |
| 343,7 → 335,6 |
|---|
| block->next = freelist[b]; |
| freelist[b] = block; |
| CHECK(block); |
| malloc_unlock(); |
| } |
| |
| void * realloc(void *ptr, size_t size) |