2007-07-27 Neal H. Walfield <neal@gnu.org>

	* laden.h (add_memory_map): Improve comment.
	* loader.h (loader_add_region): Likewise.
	(loader_remove_region): Likewise.

	* laden.c (memory_map): Move from here...
	* loader.c (memory_map): ... to here.
	* laden.c (memory_map_size): Move from here...
	* loader.c (memory_map_size): ... to here.
	* laden.c (loader_get_num_memory_desc): Move from here...
	* loader.c (loader_get_num_memory_desc): ... to here.
	* laden.c (loader_get_memory_desc): Move from here...
	* loader.c (loader_get_memory_desc): ... to here.

	* kip-fixup.c (kip_fixup): Don't call loader_regions_reserve
	here...
	* laden.c (main): ... but here.

	* loader.c (mem_check): Don't decrement end.

1 files changed, 4 insertions, 21 deletions

diff --git a/laden/laden.c b/laden/laden.c
index 7caf888..934873c 100644
--- a/laden/laden.c
+++ b/laden/laden.c
@@ -37,27 +37,6 @@ l4_rootserver_t rootserver;
 l4_word_t boot_info;
 
 
-l4_memory_desc_t memory_map[MEMORY_MAP_MAX];
-
-l4_word_t memory_map_size;
-
-
-/* Return the number of memory descriptors.  */
-l4_word_t
-loader_get_num_memory_desc (void)
-{
-  return memory_map_size;
-}
-
-
-/* Return the NRth memory descriptor.  The first memory descriptor is
-   indexed by 0.  */
-l4_memory_desc_t *
-loader_get_memory_desc (l4_word_t nr)
-{
-  return &memory_map[nr];
-}
-
 static void
 rootserver_relocate (const char *name,
 		     l4_word_t start, l4_word_t end, l4_word_t new_start,
@@ -109,6 +88,7 @@ load_components (void)
   loader_remove_region ("sigma0-mod");
 #ifdef _L4_V2
   /* Use the page following the extracted image as the stack.  */
+  /* XXX: Should reserve this?  */
   sigma0.sp = ((sigma0.high + 0xfff) & ~0xfff) + 0x1000;
 #endif
 
@@ -126,6 +106,7 @@ load_components (void)
   loader_remove_region ("rootserver-mod");
 #ifdef _L4_V2
   /* Use the page following the extracted image as the stack.  */
+  /* XXX: Should reserve this?  */
   rootserver.sp = ((rootserver.high + 0xfff) & ~0xfff) + 0x1000;
 #endif
 }
@@ -229,6 +210,8 @@ main (int argc, char *argv[])
 
   load_components ();
 
+  loader_regions_reserve ();
+
   kip_fixup ();
 
   debug ("Entering kernel at address 0x%x...\n", kernel.ip);