X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsStartup.c;h=faf45967b062a8c28d02a86094f86a290a6e0d66;hb=7f24ae51ed36c5c0308a2d0de23e243f32a0043c;hp=4e6a68cf22c80b3c22e5a4aad2032c1e3418f4d5;hpb=95ca6bff6fc9918203173b442192d9298ef9757a;p=ghc-hetmet.git diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c index 4e6a68c..faf4596 100644 --- a/ghc/rts/RtsStartup.c +++ b/ghc/rts/RtsStartup.c @@ -1,5 +1,4 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsStartup.c,v 1.83 2004/09/03 15:28:42 simonmar Exp $ * * (c) The GHC Team, 1998-2002 * @@ -12,10 +11,13 @@ #include "RtsAPI.h" #include "RtsUtils.h" #include "RtsFlags.h" +#include "OSThreads.h" #include "Storage.h" /* initStorage, exitStorage */ #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" @@ -49,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 @@ -89,8 +87,32 @@ __hscore_set_saved_termios(int fd, void* ts) } } -#if i386_TARGET_ARCH -static void x86_init_fpu ( void ); +/* ----------------------------------------------------------------------------- + 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 /* ----------------------------------------------------------------------------- @@ -136,8 +158,7 @@ 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) @@ -171,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(); @@ -191,7 +214,7 @@ hs_init(int *argc, char **argv[]) initDefaultHandlers(); #endif -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) startupAsyncIO(); #endif @@ -201,12 +224,8 @@ hs_init(int *argc, char **argv[]) } #endif -#ifdef HAVE_LOCALE_H - setlocale(LC_CTYPE,""); -#endif - -#if i386_TARGET_ARCH -// x86_init_fpu(); +#if X86_INIT_FPU + x86_init_fpu(); #endif /* Record initialization times */ @@ -218,36 +237,12 @@ void startupHaskell(int argc, char *argv[], void (*init_root)(void)) { hs_init(&argc, &argv); - hs_add_root(init_root); + if(init_root) + 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; } -} - -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 This process traverses all the compiled modules in the program @@ -281,12 +276,8 @@ 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()"); @@ -295,17 +286,17 @@ hs_add_root(void (*init_root)(void)) /* The initialisation stack grows downward, with sp pointing to the last occupied word */ init_sp = INIT_STACK_BLOCKS*BLOCK_SIZE_W; - bd = allocGroup(INIT_STACK_BLOCKS); + bd = allocGroup_lock(INIT_STACK_BLOCKS); init_stack = (F_ *)bd->start; init_stack[--init_sp] = (F_)stg_init_finish; if (init_root != NULL) { 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. @@ -333,11 +324,6 @@ hs_exit(void) /* start timing the shutdown */ stat_startExit(); -#if !defined(GRAN) - /* Finalize any remaining weak pointers */ - finalizeWeakPointersNow(); -#endif - /* stop all running tasks */ exitScheduler(); @@ -417,7 +403,7 @@ hs_exit(void) if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo(); #endif -#if defined(mingw32_TARGET_OS) +#if defined(mingw32_HOST_OS) shutdownAsyncIO(); #endif } @@ -466,29 +452,3 @@ stg_exit(int n) #endif exit(n); } - -/* ----------------------------------------------------------------------------- - Initialise floating point unit on x86 - -------------------------------------------------------------------------- */ - -#if i386_TARGET_ARCH -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 -