Changeset aed4eca in mainline

Timestamp:

2005-09-21T19:19:16Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

74b2f5bf

Parents:

84dd253

Message:

The more physical frames, the more memory allocated for heap.

File:

• src/main/main.c (modified) (3 diffs)

src/main/main.c

@@ -81 +81 @@
 
 /*
+ * Size of heap.
+ */
+static size_t heap_size;
+
+/*
  * Extra space on heap to make the stack start on page boundary.
  */
@@ -108 +113 @@
         config.cpu_count = 1;
         config.cpu_active = 1;
-        
-        kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE;    
+        config.base = hardcoded_load_address;
+        config.memory_size = get_memory_size();
+
+        heap_size = CONFIG_HEAP_SIZE + (config.memory_size/FRAME_SIZE)*sizeof(frame_t);
+        
+        kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + heap_size;
         heap_delta = PAGE_SIZE - ((hardcoded_load_address + kernel_size) % PAGE_SIZE);
         heap_delta = (heap_delta == PAGE_SIZE) ? 0 : heap_delta;
         kernel_size += heap_delta;
         
-        config.base = hardcoded_load_address;
-        config.memory_size = get_memory_size();
         config.kernel_size = kernel_size + CONFIG_STACK_SIZE;
         
         context_save(&ctx);
-        early_mapping(config.base + hardcoded_ktext_size + hardcoded_kdata_size + heap_delta, CONFIG_STACK_SIZE + CONFIG_HEAP_SIZE);
+        early_mapping(config.base + hardcoded_ktext_size + hardcoded_kdata_size + heap_delta, CONFIG_STACK_SIZE + heap_size);
         context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + kernel_size, CONFIG_STACK_SIZE);
         context_restore(&ctx);
@@ -140 +147 @@
         
         arch_pre_mm_init();
-        heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_HEAP_SIZE + heap_delta);
+        heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, heap_size + heap_delta);
         frame_init();
         page_init();