Changeset d6e8529 in mainline

Timestamp:

2005-12-20T00:34:12Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fa7450c

Parents:

75e1db0

Message:

remove arch/$ARCH/boot where not needed, change global Makefile accordingly
remove early_mapping() (breaks ppc32 for now)
change early heap initialization (required for init to work)

Files:

• Makefile (modified) (3 diffs)
• arch/ia32/boot/Makefile (deleted)
• arch/ppc32/include/arch.h (modified) (1 diff)
• arch/sparc64/boot/Makefile (deleted)
• generic/include/arch.h (modified) (1 diff)
• generic/include/config.h (modified) (1 diff)
• generic/src/main/main.c (modified) (4 diffs)

Makefile

@@ -178 +178 @@
 
 depend: archlinks
-        -makedepend $(DEFS) $(CFLAGS) -f - $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) >Makefile.depend 2>/dev/null
-        #$(CC) $(DEFS) $(CFLAGS) -M $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend
+        -makedepend $(DEFS) $(CFLAGS) -f - $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > Makefile.depend 2> /dev/null
 
 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
@@ -195 +194 @@
         $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > kernel.objdump
         tools/genmap.py kernel.map.pre kernel.objdump generic/src/debug/real_map.bin 
-        
 
 generic/src/debug/real_map.o: generic/src/debug/real_map.bin
@@ -207 +205 @@
 
 boot: kernel.bin
-        $(MAKE) -C arch/$(ARCH)/boot build KERNEL_SIZE="`cat kernel.bin | wc -c`" CC=$(CC) AS=$(AS) LD=$(LD)
+        if [ -d arch/$(ARCH)/boot ] ; then $(MAKE) -C arch/$(ARCH)/boot build KERNEL_SIZE="`cat kernel.bin | wc -c`" CC=$(CC) AS=$(AS) LD=$(LD) ; fi
 
 disasm: kernel.raw

arch/ppc32/include/arch.h

@@ -32 +32 @@
 #include <genarch/ofw/ofw.h>
 
-#ifdef early_mapping
-#undef early_mapping
 #endif
-
-#define early_mapping(stack, size) \
-        ofw_claim((void *) stack, size, 0);
-
-#endif

generic/include/arch.h

@@ -43 +43 @@
 #define PREEMPTION_DISABLED     THE->preemption_disabled
 
-#ifndef early_mapping
-#define early_mapping(stack, size)
-#endif /* early_mapping */
-
 /**
  * For each possible kernel stack, structure

generic/include/config.h

@@ -41 +41 @@
 
 struct config {
+        count_t cpu_count;
+        volatile count_t cpu_active;
+
         __address base;
         size_t memory_size;
-        size_t kernel_size;
         
         __address init_addr;
         size_t init_size;
-
-        count_t cpu_count;
-        volatile count_t cpu_active;
+        
+        __address heap_addr;
+        size_t heap_size;
+        size_t heap_delta;            /**< Extra space between heap and stack (enforced by alignment requirements) */
+        
+        size_t kernel_size;           /**< Size of memory in bytes taken by kernel, heap and stack */
 };
 

generic/src/main/main.c

@@ -83 +83 @@
 #endif
 
-
 config_t config;
 context_t ctx;
@@ -98 +97 @@
 __address init_addr = 0;
 size_t init_size = 0;
-
-/**
- * Size of memory in bytes taken by kernel and heap.
- */
-static size_t kernel_size;
-
-/**
- * Size of heap.
- */
-static size_t heap_size;
-
-
-/**
- * Extra space between heap and stack
- * enforced by alignment requirements.
- */
-static size_t heap_delta;
 
 void main_bsp(void);
@@ -141 +123 @@
         config.cpu_count = 1;
         config.cpu_active = 1;
+        
         config.base = hardcoded_load_address;
         config.memory_size = get_memory_size();
         config.init_addr = init_addr;
         config.init_size = init_size;
-
-        heap_size = CONFIG_HEAP_SIZE + (config.memory_size/FRAME_SIZE)*sizeof(frame_t);
-        kernel_size = ALIGN_UP(hardcoded_ktext_size + hardcoded_kdata_size + heap_size, PAGE_SIZE);
-        heap_delta = kernel_size - (hardcoded_ktext_size + hardcoded_kdata_size + heap_size);
-        
-        config.kernel_size = kernel_size + CONFIG_STACK_SIZE;
+        
+        if (init_size > 0)
+                config.heap_addr = init_addr + init_size;
+        else
+                config.heap_addr = hardcoded_load_address + hardcoded_ktext_size + hardcoded_kdata_size;
+        
+        config.heap_size = CONFIG_HEAP_SIZE + (config.memory_size / FRAME_SIZE) * sizeof(frame_t);
+        
+        config.kernel_size = ALIGN_UP(config.heap_addr - hardcoded_load_address + config.heap_size, PAGE_SIZE);
+        config.heap_delta = config.kernel_size - (config.heap_addr - hardcoded_load_address + config.heap_size);
+        config.kernel_size = config.kernel_size + CONFIG_STACK_SIZE;
         
         context_save(&ctx);
-        early_mapping(config.base + hardcoded_ktext_size + hardcoded_kdata_size, CONFIG_STACK_SIZE + heap_size + heap_delta);
-        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + kernel_size, CONFIG_STACK_SIZE);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + config.kernel_size, CONFIG_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -186 +173 @@
         
         arch_pre_mm_init();
-        early_heap_init(config.base + hardcoded_ktext_size + hardcoded_kdata_size, heap_size + heap_delta);
+        early_heap_init(config.heap_addr, config.heap_size + config.heap_delta);
         frame_init();
         page_init();
         tlb_init();
         arch_post_mm_init();
-
+        
         printf("%s, release %s (%s)%s\nBuilt%s for %s\n%s\n", project, release, name, revision, timestamp, arch, copyright);
         printf("%P: hardcoded_ktext_size=%dK, hardcoded_kdata_size=%dK\n",