X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsStartup.c;h=147de7b857f85127aaa9933ba0a3eefceec384f9;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=e7da54f1539cee48a9b6baa437d5b39e912cbb29;hpb=22f5f69672b91d3538366660948c9e40a9c67f02;p=ghc-hetmet.git diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c index e7da54f..147de7b 100644 --- a/ghc/rts/RtsStartup.c +++ b/ghc/rts/RtsStartup.c @@ -1,5 +1,4 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsStartup.c,v 1.77 2003/09/25 15:14:41 panne Exp $ * * (c) The GHC Team, 1998-2002 * @@ -12,20 +11,22 @@ #include "RtsAPI.h" #include "RtsUtils.h" #include "RtsFlags.h" +#include "OSThreads.h" #include "Storage.h" /* initStorage, exitStorage */ -#include "StablePriv.h" /* initStablePtrTable */ #include "Schedule.h" /* initScheduler */ #include "Stats.h" /* initStats */ +#include "STM.h" /* initSTM */ #include "Signals.h" +#include "RtsSignals.h" #include "Timer.h" /* startTimer, stopTimer */ #include "Weak.h" #include "Ticky.h" #include "StgRun.h" -#include "StgStartup.h" #include "Prelude.h" /* fixupRTStoPreludeRefs */ #include "HsFFI.h" #include "Linker.h" #include "ThreadLabels.h" +#include "BlockAlloc.h" #if defined(RTS_GTK_FRONTPANEL) #include "FrontPanel.h" @@ -50,16 +51,12 @@ # include "LLC.h" #endif -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) #include "win32/AsyncIO.h" #endif #include -#ifdef HAVE_LOCALE_H -#include -#endif - #ifdef HAVE_TERMIOS_H #include #endif @@ -67,9 +64,6 @@ #include #endif -// Flag Structure -struct RTS_FLAGS RtsFlags; - // Count of how many outstanding hs_init()s there have been. static int hs_init_count = 0; @@ -81,19 +75,47 @@ static void *saved_termios[3] = {NULL,NULL,NULL}; void* __hscore_get_saved_termios(int fd) { - return (0 <= fd && fd < sizeof(saved_termios) / sizeof(*saved_termios)) ? + return (0 <= fd && fd < (int)(sizeof(saved_termios) / sizeof(*saved_termios))) ? saved_termios[fd] : NULL; } void __hscore_set_saved_termios(int fd, void* ts) { - if (0 <= fd && fd < sizeof(saved_termios) / sizeof(*saved_termios)) { + if (0 <= fd && fd < (int)(sizeof(saved_termios) / sizeof(*saved_termios))) { saved_termios[fd] = ts; } } /* ----------------------------------------------------------------------------- + Initialise floating point unit on x86 (currently disabled. why?) + (see comment in ghc/compiler/nativeGen/MachInstrs.lhs). + -------------------------------------------------------------------------- */ + +#define X86_INIT_FPU 0 + +#if X86_INIT_FPU +static void +x86_init_fpu ( void ) +{ + __volatile unsigned short int fpu_cw; + + // Grab the control word + __asm __volatile ("fnstcw %0" : "=m" (fpu_cw)); + +#if 0 + printf("fpu_cw: %x\n", fpu_cw); +#endif + + // Set bits 8-9 to 10 (64-bit precision). + fpu_cw = (fpu_cw & 0xfcff) | 0x0200; + + // Store the new control word back + __asm __volatile ("fldcw %0" : : "m" (fpu_cw)); +} +#endif + +/* ----------------------------------------------------------------------------- Starting up the RTS -------------------------------------------------------------------------- */ @@ -136,17 +158,19 @@ hs_init(int *argc, char **argv[]) /* Parse the flags, separating the RTS flags from the programs args */ if (argc != NULL && argv != NULL) { setupRtsFlags(argc, *argv, &rts_argc, rts_argv); - prog_argc = *argc; - prog_argv = *argv; + setProgArgv(*argc,*argv); } #if defined(PAR) /* NB: this really must be done after processing the RTS flags */ IF_PAR_DEBUG(verbose, - fprintf(stderr, "==== Synchronising system (%d PEs)\n", nPEs)); + debugBelch("==== Synchronising system (%d PEs)\n", nPEs)); synchroniseSystem(); // calls initParallelSystem etc #endif /* PAR */ + /* Perform initialisation of adjustor thunk layer. */ + initAdjustor(); + /* initialise scheduler data structures (needs to be done before * initStorage()). */ @@ -168,8 +192,10 @@ hs_init(int *argc, char **argv[]) /* initialise the stable pointer table */ initStablePtrTable(); +#if defined(DEBUG) /* initialise thread label table (tso->char*) */ initThreadLabelTable(); +#endif #if defined(PROFILING) || defined(DEBUG) initProfiling1(); @@ -188,7 +214,7 @@ hs_init(int *argc, char **argv[]) initDefaultHandlers(); #endif -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) startupAsyncIO(); #endif @@ -198,8 +224,8 @@ hs_init(int *argc, char **argv[]) } #endif -#ifdef HAVE_LOCALE_H - setlocale(LC_ALL,""); +#if X86_INIT_FPU + x86_init_fpu(); #endif /* Record initialization times */ @@ -211,34 +237,10 @@ void startupHaskell(int argc, char *argv[], void (*init_root)(void)) { hs_init(&argc, &argv); - hs_add_root(init_root); -} - - -/* ----------------------------------------------------------------------------- - Getting/Setting the program's arguments. - - These are used by System.Environment. - -------------------------------------------------------------------------- */ - -void -getProgArgv(int *argc, char **argv[]) -{ - if (argc) { *argc = prog_argc; } - if (argv) { *argv = prog_argv; } + if(init_root) + hs_add_root(init_root); } -void -setProgArgv(int argc, char *argv[]) -{ - /* Usually this is done by startupHaskell, so we don't need to call this. - However, sometimes Hugs wants to change the arguments which Haskell - getArgs >>= ... will be fed. So you can do that by calling here - _after_ calling startupHaskell. - */ - prog_argc = argc; - prog_argv = argv; -} /* ----------------------------------------------------------------------------- Per-module initialisation @@ -274,29 +276,27 @@ void hs_add_root(void (*init_root)(void)) { bdescr *bd; -#ifdef SMP - Capability cap; -#else -#define cap MainCapability -#endif nat init_sp; + Capability *cap = &MainCapability; if (hs_init_count <= 0) { barf("hs_add_root() must be called after hs_init()"); } - init_sp = 0; - bd = allocGroup(INIT_STACK_BLOCKS); + /* The initialisation stack grows downward, with sp pointing + to the last occupied word */ + init_sp = INIT_STACK_BLOCKS*BLOCK_SIZE_W; + bd = allocGroup_lock(INIT_STACK_BLOCKS); init_stack = (F_ *)bd->start; - init_stack[init_sp++] = (F_)stg_init_ret; + init_stack[--init_sp] = (F_)stg_init_finish; if (init_root != NULL) { - init_stack[init_sp++] = (F_)init_root; + init_stack[--init_sp] = (F_)init_root; } - cap.r.rSp = (P_)(init_stack + init_sp); - StgRun((StgFunPtr)stg_init, &cap.r); + cap->r.rSp = (P_)(init_stack + init_sp); + StgRun((StgFunPtr)stg_init, &cap->r); - freeGroup(bd); + freeGroup_lock(bd); #if defined(PROFILING) || defined(DEBUG) // This must be done after module initialisation. @@ -313,7 +313,8 @@ void hs_exit(void) { if (hs_init_count <= 0) { - barf("too many hs_exit()s"); + errorBelch("warning: too many hs_exit()s"); + return; } hs_init_count--; if (hs_init_count > 0) { @@ -327,11 +328,6 @@ hs_exit(void) /* stop all running tasks */ exitScheduler(); -#if !defined(GRAN) - /* Finalize any remaining weak pointers */ - finalizeWeakPointersNow(); -#endif - #if defined(GRAN) /* end_gr_simulation prints global stats if requested -- HWL */ if (!RtsFlags.GranFlags.GranSimStats.Suppressed) @@ -378,9 +374,8 @@ hs_exit(void) /* stop timing the shutdown, we're about to print stats */ stat_endExit(); - /* clean up things from the storage manager's point of view. - * also outputs the stats (+RTS -s) info. - */ + // clean up things from the storage manager's point of view. + // also outputs the stats (+RTS -s) info. exitStorage(); #ifdef RTS_GTK_FRONTPANEL @@ -403,14 +398,17 @@ hs_exit(void) // during endProfiling(). fclose(prof_file); #endif - + #if defined(TICKY_TICKY) if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo(); #endif -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) shutdownAsyncIO(); #endif + + // Finally, free all our storage. + freeStorage(); } // Compatibility interfaces @@ -452,9 +450,8 @@ stg_exit(int n) return; exit_started=rtsTrue; - IF_PAR_DEBUG(verbose, fprintf(stderr,"==-- stg_exit %d on [%x]...", n, mytid)); + IF_PAR_DEBUG(verbose, debugBelch("==-- stg_exit %d on [%x]...", n, mytid)); shutdownParallelSystem(n); #endif exit(n); } -