BSS is now zeroed by libprefix (along with the otherwise non-zeroable

portions such as the stack) during the installation process.

init_fns() are called from main().  We need to think about initial
control flow some more.

diff --git a/src/arch/i386/prefix/dskprefix.S b/src/arch/i386/prefix/dskprefix.S
index a2f621981489d1f086e883f0549788ab02635e20..fff0be411707ad2aa5916e4cff82d99fd6071193 100644 (file)
--- a/src/arch/i386/prefix/dskprefix.S
+++ b/src/arch/i386/prefix/dskprefix.S
@@ -356,9 +356,6 @@ start_runtime:
        lret
        .section ".text16", "awx", @progbits
 1:
-       pushl   $initialise
-       data32 call     prot_call
-       popl    %eax /* discard */
        pushl   $main
        data32 call     prot_call
        popl    %eax /* discard */

diff --git a/src/core/main.c b/src/core/main.c
index f6448e805e49f272d6e78ed6f1433217b962f5a8..13aae4cf8a6d2a55580c14be40116bebcb2c2985 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -141,21 +141,6 @@ static int exit_status;
 static int initialized;
 
 
-/**************************************************************************
- * initialise() - perform any C-level initialisation
- *
- * This does not include initialising the NIC, but it does include
- * e.g. getting the memory map, relocating to high memory,
- * initialising the console, etc.
- **************************************************************************
- */
-void initialise ( void ) {
-       /* Zero the BSS */
-       memset ( _bss, 0, _ebss - _bss );
-
-       /* Call all registered initialisation functions */
-       call_init_fns ();
-}
 
 /**************************************************************************
 MAIN - Kick off routine
@@ -165,6 +150,9 @@ int main ( void ) {
        void *image_context;
        int skip = 0;
 
+       /* Call all registered initialisation functions */
+       call_init_fns ();
+
        /* Print out configuration */
        print_config();