X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FRtsStartup.c;h=59300c4811c9a1640e53cad06d6f57761fa9599a;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=6826f5ce574138f5d1600cb3546c86c1aa3f7578;hpb=b1c5d8c6dc8b08e6963897eadf70d8bcbfa8fa7b;p=ghc-hetmet.git diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c index 6826f5c..59300c4 100644 --- a/ghc/rts/RtsStartup.c +++ b/ghc/rts/RtsStartup.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: RtsStartup.c,v 1.69 2003/01/29 09:54:33 simonmar Exp $ + * $Id: RtsStartup.c,v 1.81 2004/08/13 13:10:32 simonmar Exp $ * * (c) The GHC Team, 1998-2002 * @@ -13,19 +13,18 @@ #include "RtsUtils.h" #include "RtsFlags.h" #include "Storage.h" /* initStorage, exitStorage */ -#include "StablePriv.h" /* initStablePtrTable */ #include "Schedule.h" /* initScheduler */ #include "Stats.h" /* initStats */ #include "Signals.h" -#include "Itimer.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,14 +49,50 @@ # include "LLC.h" #endif +#if defined(mingw32_TARGET_OS) +#include "win32/AsyncIO.h" +#endif + #include -// Flag Structure -struct RTS_FLAGS RtsFlags; +#ifdef HAVE_LOCALE_H +#include +#endif + +#ifdef HAVE_TERMIOS_H +#include +#endif +#ifdef HAVE_SIGNAL_H +#include +#endif // Count of how many outstanding hs_init()s there have been. static int hs_init_count = 0; +// Here we save the terminal settings on the standard file +// descriptors, if we need to change them (eg. to support NoBuffering +// input). +static void *saved_termios[3] = {NULL,NULL,NULL}; + +void* +__hscore_get_saved_termios(int fd) +{ + 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 < (int)(sizeof(saved_termios) / sizeof(*saved_termios))) { + saved_termios[fd] = ts; + } +} + +#if i386_TARGET_ARCH +static void x86_init_fpu ( void ); +#endif + /* ----------------------------------------------------------------------------- Starting up the RTS -------------------------------------------------------------------------- */ @@ -140,29 +175,37 @@ hs_init(int *argc, char **argv[]) initProfiling1(); #endif -#if defined(PROFILING) || defined(DEBUG) - initProfiling2(); -#endif - /* start the virtual timer 'subsystem'. */ - startVirtTimer(TICK_MILLISECS); + startTimer(TICK_MILLISECS); /* Initialise the stats department */ initStats(); -#if !defined(mingw32_TARGET_OS) && !defined(PAR) +#if defined(RTS_USER_SIGNALS) /* Initialise the user signal handler set */ initUserSignals(); /* Set up handler to run on SIGINT, etc. */ initDefaultHandlers(); #endif +#if defined(mingw32_TARGET_OS) + startupAsyncIO(); +#endif + #ifdef RTS_GTK_FRONTPANEL if (RtsFlags.GcFlags.frontpanel) { initFrontPanel(); } #endif +#ifdef HAVE_LOCALE_H + setlocale(LC_CTYPE,""); +#endif + +#if i386_TARGET_ARCH +// x86_init_fpu(); +#endif + /* Record initialization times */ stat_endInit(); } @@ -185,8 +228,8 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void)) void getProgArgv(int *argc, char **argv[]) { - *argc = prog_argc; - *argv = prog_argv; + if (argc) { *argc = prog_argc; } + if (argv) { *argv = prog_argv; } } void @@ -246,18 +289,26 @@ hs_add_root(void (*init_root)(void)) barf("hs_add_root() must be called after hs_init()"); } - init_sp = 0; + /* 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); 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); freeGroup(bd); + +#if defined(PROFILING) || defined(DEBUG) + // This must be done after module initialisation. + // ToDo: make this work in the presence of multiple hs_add_root()s. + initProfiling2(); +#endif } /* ----------------------------------------------------------------------------- @@ -279,14 +330,14 @@ hs_exit(void) /* start timing the shutdown */ stat_startExit(); - /* stop all running tasks */ - exitScheduler(); - #if !defined(GRAN) /* Finalize any remaining weak pointers */ finalizeWeakPointersNow(); #endif + /* stop all running tasks */ + exitScheduler(); + #if defined(GRAN) /* end_gr_simulation prints global stats if requested -- HWL */ if (!RtsFlags.GranFlags.GranSimStats.Suppressed) @@ -294,13 +345,34 @@ hs_exit(void) #endif /* stop the ticker */ - stopVirtTimer(); + stopTimer(); /* reset the standard file descriptors to blocking mode */ resetNonBlockingFd(0); resetNonBlockingFd(1); resetNonBlockingFd(2); +#if HAVE_TERMIOS_H + // Reset the terminal settings on the standard file descriptors, + // if we changed them. See System.Posix.Internals.tcSetAttr for + // more details, including the reason we termporarily disable + // SIGTTOU here. + { + int fd; + sigset_t sigset, old_sigset; + sigemptyset(&sigset); + sigaddset(&sigset, SIGTTOU); + sigprocmask(SIG_BLOCK, &sigset, &old_sigset); + for (fd = 0; fd <= 2; fd++) { + struct termios* ts = (struct termios*)__hscore_get_saved_termios(fd); + if (ts != NULL) { + tcsetattr(fd,TCSANOW,ts); + } + } + sigprocmask(SIG_SETMASK, &old_sigset, NULL); + } +#endif + #if defined(PAR) /* controlled exit; good thread! */ shutdownParallelSystem(0); @@ -341,6 +413,10 @@ hs_exit(void) #if defined(TICKY_TICKY) if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo(); #endif + +#if defined(mingw32_TARGET_OS) + shutdownAsyncIO(); +#endif } // Compatibility interfaces @@ -388,3 +464,28 @@ stg_exit(int n) 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 +