#include <string.h>\r
#include "lib.h"\r
\r
+#if 0\r
+# define DEBUGS(s...) _SysDebug(s)\r
+#else\r
+# define DEBUGS(s...) do{}while(0)\r
+#endif\r
+\r
// === Constants ===\r
#define MAGIC 0xACE55051 //AcessOS1\r
#define MAGIC_FREE (~MAGIC)\r
\r
// === TYPES ===\r
typedef struct {\r
- Uint magic;\r
- Uint size;\r
+ uint32_t magic;\r
+ size_t size;\r
+ char data[];\r
} heap_head;\r
typedef struct {\r
heap_head *header;\r
- Uint magic;\r
+ uint32_t magic;\r
} heap_foot;\r
\r
// === LOCAL VARIABLES ===\r
EXPORT void *malloc(size_t bytes);\r
EXPORT void *calloc(size_t bytes, size_t count);\r
EXPORT void free(void *mem);\r
-EXPORT void *realloc(void *mem, Uint bytes);\r
+EXPORT void *realloc(void *mem, size_t bytes);\r
EXPORT void *sbrk(int increment);\r
LOCAL void *extendHeap(int bytes);\r
-static void *FindHeapBase();\r
-LOCAL uint brk(Uint newpos);\r
+static void *FindHeapBase();\r
+LOCAL uint brk(uintptr_t newpos);\r
+LOCAL void Heap_Dump(void);\r
\r
//Code\r
\r
*/\r
EXPORT void *malloc(size_t bytes)\r
{\r
- Uint bestSize;\r
- Uint closestMatch = 0;\r
- Uint bestMatchAddr = 0;\r
+ size_t bestSize;\r
+ size_t closestMatch = 0;\r
+ void *bestMatchAddr = 0;\r
heap_head *curBlock;\r
- \r
+\r
+// _SysDebug("&_heap_start = %p, _heap_start = %p", &_heap_start, _heap_start);\r
// Initialise Heap\r
if(_heap_start == NULL)\r
{\r
}\r
\r
curBlock = _heap_start;\r
+// _SysDebug("_heap_start = %p", _heap_start);\r
\r
bestSize = bytes + sizeof(heap_head) + sizeof(heap_foot) + BLOCK_SIZE - 1;\r
bestSize = (bestSize/BLOCK_SIZE)*BLOCK_SIZE; //Round up to block size\r
\r
- while((Uint)curBlock < (Uint)_heap_end)\r
+ while( (uintptr_t)curBlock < (uintptr_t)_heap_end)\r
{\r
//_SysDebug(" malloc: curBlock = 0x%x, curBlock->magic = 0x%x\n", curBlock, curBlock->magic);\r
if(curBlock->magic == MAGIC_FREE)\r
break;\r
if(bestSize < curBlock->size && (curBlock->size < closestMatch || closestMatch == 0)) {\r
closestMatch = curBlock->size;\r
- bestMatchAddr = (Uint)curBlock;\r
+ bestMatchAddr = curBlock;\r
}\r
}\r
else if(curBlock->magic != MAGIC)\r
{\r
//Corrupt Heap\r
+ Heap_Dump();\r
_SysDebug("malloc: Corrupt Heap\n");\r
return NULL;\r
}\r
- curBlock = (heap_head*)((Uint)curBlock + curBlock->size);\r
+ curBlock = (heap_head*)((uintptr_t)curBlock + curBlock->size);\r
}\r
\r
- if((Uint)curBlock < (Uint)_heap_start) {\r
+ if((uintptr_t)curBlock < (uintptr_t)_heap_start) {\r
_SysDebug("malloc: Heap underrun for some reason\n");\r
return NULL;\r
}\r
\r
//Found a perfect match\r
- if((Uint)curBlock < (Uint)_heap_end) {\r
+ if((uintptr_t)curBlock < (uintptr_t)_heap_end) {\r
curBlock->magic = MAGIC;\r
- return (void*)((Uint)curBlock + sizeof(heap_head));\r
+ return (void*)((uintptr_t)curBlock + sizeof(heap_head));\r
}\r
\r
//Out of Heap Space\r
return NULL;\r
}\r
curBlock->magic = MAGIC;\r
- return (void*)((Uint)curBlock + sizeof(heap_head));\r
+ DEBUGS("malloc(0x%x) = %p (extend) 0x%x", bytes, curBlock->data, bestSize);\r
+ return curBlock->data;\r
}\r
\r
+ heap_head *besthead = (void*)bestMatchAddr;\r
+ \r
//Split Block?\r
if(closestMatch - bestSize > BLOCK_SIZE) {\r
heap_foot *foot;\r
foot = (heap_foot*)(bestMatchAddr + closestMatch - sizeof(heap_foot));\r
foot->header = curBlock;\r
\r
- ((heap_head*)bestMatchAddr)->magic = MAGIC; //mark as used\r
- return (void*)(bestMatchAddr + sizeof(heap_head));\r
+ besthead->magic = MAGIC; //mark as used\r
+ DEBUGS("malloc(0x%x) = %p (split) 0x%x", bytes, besthead->data, bestSize);\r
+ return besthead->data;\r
}\r
\r
//Don't Split the block\r
- ((heap_head*)bestMatchAddr)->magic = MAGIC;\r
- return (void*)(bestMatchAddr+sizeof(heap_head));\r
+ besthead->magic = MAGIC;\r
+ DEBUGS("malloc(0x%x) = %p (reuse) 0x%x", bytes, besthead->data, besthead->size);\r
+ return besthead->data;\r
}\r
\r
/**\r
return;\r
\r
head->magic = MAGIC_FREE;\r
+ DEBUGS("free(%p) : 0x%x bytes", mem, head->size);\r
\r
//Unify Right\r
- if((intptr_t)head + head->size < (intptr_t)_heap_end)\r
+ if((uintptr_t)head + head->size < (uintptr_t)_heap_end)\r
{\r
heap_head *nextHead = (heap_head*)((intptr_t)head + head->size);\r
if(nextHead->magic == MAGIC_FREE) { //Is the next block free\r
}\r
}\r
//Unify Left\r
- if((intptr_t)head - sizeof(heap_foot) > (intptr_t)_heap_start)\r
+ if((uintptr_t)head - sizeof(heap_foot) > (uintptr_t)_heap_start)\r
{\r
heap_head *prevHead;\r
heap_foot *prevFoot = (heap_foot *)((intptr_t)head - sizeof(heap_foot));\r
}\r
\r
//Check for free space after block\r
- head = (heap_head*)((Uint)oldPos-sizeof(heap_head));\r
+ head = (heap_head*)((uintptr_t)oldPos-sizeof(heap_head));\r
\r
//Hack to used free's amagamating algorithym and malloc's splitting\r
free(oldPos);\r
return NULL;\r
\r
//Copy Old Data\r
- if((Uint)ret != (Uint)oldPos) {\r
+ if(ret != oldPos) {\r
memcpy(ret, oldPos, head->size-sizeof(heap_head)-sizeof(heap_foot));\r
}\r
\r
foot->magic = MAGIC;\r
\r
//Combine with previous block if nessasary\r
- if(_heap_end != _heap_start && ((heap_foot*)((Uint)_heap_end-sizeof(heap_foot)))->magic == MAGIC) {\r
- heap_head *tmpHead = ((heap_foot*)((Uint)_heap_end-sizeof(heap_foot)))->header;\r
+ if(_heap_end != _heap_start && ((heap_foot*)((uintptr_t)_heap_end-sizeof(heap_foot)))->magic == MAGIC) {\r
+ heap_head *tmpHead = ((heap_foot*)((uintptr_t)_heap_end-sizeof(heap_foot)))->header;\r
if(tmpHead->magic == MAGIC_FREE) {\r
tmpHead->size += bytes;\r
foot->header = tmpHead;\r
}\r
}\r
\r
- _heap_end = (void*) ((Uint)foot+sizeof(heap_foot));\r
+ _heap_end = (void*) ((uintptr_t)foot+sizeof(heap_foot));\r
return head;\r
}\r
\r
*/\r
EXPORT void *sbrk(int increment)\r
{\r
- static size_t oldEnd = 0;\r
- static size_t curEnd = 0;\r
+ static uintptr_t oldEnd = 0;\r
+ static uintptr_t curEnd = 0;\r
\r
//_SysDebug("sbrk: (increment=%i)", increment);\r
\r
if (curEnd == 0) {\r
- oldEnd = curEnd = (size_t)FindHeapBase();\r
+ oldEnd = curEnd = (uintptr_t)FindHeapBase();\r
//_SysAllocate(curEnd); // Allocate the first page\r
}\r
\r
heap_head *head;\r
heap_foot *foot;\r
#endif\r
- if( (Uint)ptr < (Uint)_heap_start ) return 0;\r
- if( (Uint)ptr > (Uint)_heap_end ) return 0;\r
+ if( (uintptr_t)ptr < (uintptr_t)_heap_start ) return 0;\r
+ if( (uintptr_t)ptr > (uintptr_t)_heap_end ) return 0;\r
\r
#if 0\r
head = (void*)((Uint)ptr - 4);\r
#endif\r
}\r
\r
-LOCAL uint brk(Uint newpos)\r
+LOCAL uint brk(uintptr_t newpos)\r
{\r
- static uint curpos;\r
+ static uintptr_t curpos;\r
uint pages;\r
uint ret = curpos;\r
int delta;\r
_SysDebug("brk: (newpos=0x%x)", newpos);\r
\r
// Find initial position\r
- if(curpos == 0) curpos = (uint)FindHeapBase();\r
+ if(curpos == 0) curpos = (uintptr_t)FindHeapBase();\r
\r
// Get Current Position\r
if(newpos == 0) return curpos;\r
\r
return ret; // Return old curpos\r
}\r
+\r
+void Heap_Dump(void)\r
+{\r
+ heap_head *cur = _heap_start;\r
+ while( cur < (heap_head*)_heap_end )\r
+ {\r
+ switch( cur->magic )\r
+ {\r
+ case MAGIC:\r
+ _SysDebug("Used block %p[0x%x] - ptr=%p", cur, cur->size, cur->data);\r
+ break;\r
+ case MAGIC_FREE:\r
+ _SysDebug("Free block %p[0x%x] - ptr=%p", cur, cur->size, cur->data);\r
+ break;\r
+ default:\r
+ _SysDebug("Block %p bad magic (0x%x)", cur, cur->magic);\r
+ return ;\r
+ }\r
+ cur = (void*)( (char*)cur + cur->size );\r
+ }\r
+}\r
+\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au