Mercurial > sos > sos

changeset 23:f68b59af5ea6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made a macro for the address of the start of my heap
author Jonathan Pevarnek <pevarnj@gmail.com>
date Wed, 16 Mar 2011 00:47:21 -0400
parents 3fb0ec050ff3
children 45a80ea314ae
files include/system.h src/init.c src/std.c
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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? ");
--- 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);
 }