git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/UDI - Implimenting UDI support, can load udi_dpt from udiref
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
heap.c
diff --git
a/KernelLand/Kernel/heap.c
b/KernelLand/Kernel/heap.c
index
4c7ffd9
..
be8eeaf
100644
(file)
--- a/
KernelLand/Kernel/heap.c
+++ b/
KernelLand/Kernel/heap.c
@@
-153,8
+153,8
@@
void *Heap_Allocate(const char *File, int Line, size_t __Bytes)
size_t Bytes;
if( __Bytes == 0 ) {
size_t Bytes;
if( __Bytes == 0 ) {
-
//return NULL;
// TODO: Return a known un-mapped range.
-
return INVLPTR;
+
return NULL;
// TODO: Return a known un-mapped range.
+
//
return INVLPTR;
}
// Get required size
}
// Get required size
@@
-512,7
+512,12
@@
void Heap_Dump(void)
{
tHeapHead *head, *badHead;
tHeapFoot *foot = NULL;
{
tHeapHead *head, *badHead;
tHeapFoot *foot = NULL;
+ static int in_heap_dump;
+ if( in_heap_dump ) return;
+
+ in_heap_dump = 1;
+
head = gHeapStart;
while( (Uint)head < (Uint)gHeapEnd )
{
head = gHeapStart;
while( (Uint)head < (Uint)gHeapEnd )
{
@@
-560,12
+565,16
@@
void Heap_Dump(void)
}
// If the heap is valid, ok!
}
// If the heap is valid, ok!
- if( (tVAddr)head == (tVAddr)gHeapEnd )
+ if( (tVAddr)head == (tVAddr)gHeapEnd ) {
+ in_heap_dump = 0;
return ;
return ;
+ }
// Check for a bad return
// Check for a bad return
- if( (tVAddr)head >= (tVAddr)gHeapEnd )
+ if( (tVAddr)head >= (tVAddr)gHeapEnd ) {
+ in_heap_dump = 0;
return ;
return ;
+ }
#if !VERBOSE_DUMP
Log_Log("Heap", "%p (%P): 0x%08lx %i %4C",
#if !VERBOSE_DUMP
Log_Log("Heap", "%p (%P): 0x%08lx %i %4C",
UCC
git Repository :: git.ucc.asn.au