Some corrections. #48

embox · May 8, 2010 · 65d039b · 65d039b
1 parent 492b2a9
commit 65d039b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/src/include/lib/page_alloc.h b/src/include/lib/page_alloc.h
@@ -51,6 +51,7 @@ pmark_t *page_alloc(void);
 void page_free(pmark_t *paddr);
 
 #ifdef EXTENDED_TEST
+
 #define PAGE_QUANTITY 0x10
 #define PAGE_SIZE 0x100
 

diff --git a/src/lib/page_alloc/page_alloc.c b/src/lib/page_alloc/page_alloc.c
@@ -11,22 +11,26 @@
 #include <errno.h>
 #include <lib/page_alloc.h>
 
-#ifndef PAGE_QUANTITY
-# define PAGE_QUANTITY 0x10
+#ifndef EXTENDED_TEST
+extern char _heap_start;
+extern char _heap_end;
 #endif
-#ifndef PAGE_SIZE
-# define PAGE_SIZE 0x100
+
+// CONFIG_PAGE_SIZE
+
+#ifndef PAGE_QUANTITY
+# define PAGE_QUANTITY ( ((size_t) (&_heap_end - &_heap_start) ) / CONFIG_PAGE_SIZE )
 #endif
 
 int page_alloc_hasinit = 0;
 
 #ifdef EXTENDED_TEST
 
-static uint8_t page_pool[PAGE_QUANTITY][PAGE_SIZE];
+static uint8_t page_pool[PAGE_QUANTITY][CONFIG_PAGE_SIZE];
 static pmark_t *cmark_p = (pmark_t *) page_pool;
 #else
-#define START_MEMORY_ADDR 0x40000000
-static pmark_t *cmark_p = (pmark_t *)START_MEMORY_ADDR;
+//#define START_MEMORY_ADDR 0x40000000
+static pmark_t *cmark_p = (pmark_t *) &_heap_start;
 #endif
 
 #ifdef EXTENDED_TEST
@@ -86,7 +90,7 @@ pmark_t *page_alloc(void) {
 
 	/* change list and return value */
 	if (pcur->psize > 1 ) { /* 1 := psize */
-		tt = (unsigned long) pcur + (unsigned long) PAGE_SIZE *
+		tt = (unsigned long) pcur + (unsigned long) CONFIG_PAGE_SIZE *
 			(unsigned long) 1;  /* 1:= psize */
 		pcur->psize -= 1; /* 1 := psize */
 		tmp = cmark_p->pnext;

diff --git a/templates/microblaze/compiler_tests/options-kernel.conf b/templates/microblaze/compiler_tests/options-kernel.conf
@@ -6,3 +6,5 @@ option(TIMER)
 option(PRINTK)
 
 option(MOD_DIAG, embox.driver.serial.xuartlite)
+option(PAGE_SIZE, 0x1000)
+
diff --git a/templates/microblaze/release/options-kernel.conf b/templates/microblaze/release/options-kernel.conf
@@ -6,3 +6,5 @@ option(TIMER)
 option(PRINTK)
 
 option(MOD_DIAG, embox.driver.serial.xuartlite)
+option(PAGE_SIZE, 0x1000)
+
diff --git a/templates/sparc/release/options-kernel.conf b/templates/sparc/release/options-kernel.conf
@@ -6,3 +6,5 @@ option(TIMER)
 option(PRINTK)
 
 option(MOD_DIAG, embox.driver.diag_apbuart)
+option(PAGE_SIZE, 0x1000)
+
diff --git a/templates/sparc/simulation/options-kernel.conf b/templates/sparc/simulation/options-kernel.conf
@@ -3,3 +3,5 @@ option(IRQ)
 option(PRINTK)
 
 option(MOD_DIAG, embox.driver.diag_apbuart)
+option(PAGE_SIZE, 0x1000)
+