# HG changeset patch # User Jonathan Pevarnek # Date 1300250841 14400 # Node ID f68b59af5ea674f764acae137192e6c7b7710e22 # Parent 3fb0ec050ff3de3782d9266c0ae04fc51472fee8 Made a macro for the address of the start of my heap diff -r 3fb0ec050ff3 -r f68b59af5ea6 include/system.h --- a/include/system.h Wed Mar 16 00:09:35 2011 -0400 +++ b/include/system.h Wed Mar 16 00:47:21 2011 -0400 @@ -3,6 +3,7 @@ #define NULL ((void*) 0) #define CON_LEN 132 +#define HEAP_START 0x200000 typedef unsigned long long u64; typedef signed long long s64; diff -r 3fb0ec050ff3 -r f68b59af5ea6 src/init.c --- a/src/init.c Wed Mar 16 00:09:35 2011 -0400 +++ b/src/init.c Wed Mar 16 00:47:21 2011 -0400 @@ -24,7 +24,7 @@ int i, n; char *buffer; char input[30]; - malloc_init(0x1400000); //20MB memory + malloc_init(__memsize - HEAP_START); //20MB memory while(1) { sPrint("How long do you want the string? "); diff -r 3fb0ec050ff3 -r f68b59af5ea6 src/std.c --- a/src/std.c Wed Mar 16 00:09:35 2011 -0400 +++ b/src/std.c Wed Mar 16 00:47:21 2011 -0400 @@ -130,7 +130,7 @@ void malloc_init(size_t memSize) { - allocp = (void*)0x200000; + allocp = (void*)HEAP_START; allocp->next = allocp; allocp->size = memSize/sizeof(u64); }