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
Fixed bug in libc.so/brk(), fixed support for VT100 escape codes
[tpg/acess2.git]
/
Usermode
/
Libraries
/
libc.so_src
/
heap.c
diff --git
a/Usermode/Libraries/libc.so_src/heap.c
b/Usermode/Libraries/libc.so_src/heap.c
index
23df92a
..
6832738
100644
(file)
--- a/
Usermode/Libraries/libc.so_src/heap.c
+++ b/
Usermode/Libraries/libc.so_src/heap.c
@@
-34,7
+34,7
@@
EXPORT void free(void *mem);
EXPORT void *realloc(void *mem, Uint bytes);
\r
EXPORT void *sbrk(int increment);
\r
LOCAL void *extendHeap(int bytes);
\r
EXPORT void *realloc(void *mem, Uint bytes);
\r
EXPORT void *sbrk(int increment);
\r
LOCAL void *extendHeap(int bytes);
\r
-LOCAL uint brk(
int delta
);
\r
+LOCAL uint brk(
Uint newpos
);
\r
\r
//Code
\r
\r
\r
//Code
\r
\r
@@
-260,7
+260,7
@@
EXPORT void *sbrk(int increment)
static size_t oldEnd = 0;
\r
static size_t curEnd = 0;
\r
\r
static size_t oldEnd = 0;
\r
static size_t curEnd = 0;
\r
\r
- //SysDebug("sbrk: (increment=%i)\n", increment);
\r
+ //
_
SysDebug("sbrk: (increment=%i)\n", increment);
\r
\r
if (oldEnd == 0) curEnd = oldEnd = brk(0);
\r
\r
\r
if (oldEnd == 0) curEnd = oldEnd = brk(0);
\r
\r
@@
-328,20
+328,25
@@
static void *FindHeapBase()
return NULL;
\r
}
\r
\r
return NULL;
\r
}
\r
\r
-LOCAL uint brk(
int delta
)
\r
+LOCAL uint brk(
Uint newpos
)
\r
{
\r
static uint curpos;
\r
uint pages;
\r
uint ret = curpos;
\r
{
\r
static uint curpos;
\r
uint pages;
\r
uint ret = curpos;
\r
+ int delta;
\r
+
\r
+ //_SysDebug("brk: (newpos=0x%x)", newpos);
\r
\r
// Find initial position
\r
if(curpos == 0) curpos = (uint)FindHeapBase();
\r
\r
// Get Current Position
\r
\r
// Find initial position
\r
if(curpos == 0) curpos = (uint)FindHeapBase();
\r
\r
// Get Current Position
\r
- if(delta == 0)
\r
- {
\r
- return curpos;
\r
- }
\r
+ if(newpos == 0) return curpos;
\r
+
\r
+ if(newpos < curpos) return newpos;
\r
+
\r
+ delta = newpos - curpos;
\r
+ //_SysDebug(" brk: delta = 0x%x", delta);
\r
\r
// Do we need to add pages
\r
if(curpos & 0xFFF && (curpos & 0xFFF) + delta < 0x1000)
\r
\r
// Do we need to add pages
\r
if(curpos & 0xFFF && (curpos & 0xFFF) + delta < 0x1000)
\r
UCC
git Repository :: git.ucc.asn.au