#ifdef GHCI
import RdrHsSyn ( RdrNameHsExpr )
-import CoreToStg ( coreToStgExpr )
+import Rename ( renameExpr )
+import CoreToStg ( coreExprToStg )
import StringBuffer ( stringToStringBuffer, freeStringBuffer )
import Unique ( Uniquable(..) )
import Type ( splitTyConApp_maybe )
import PrelNames ( ioTyConKey )
+import ByteCodeGen ( byteCodeGen )
#endif
import HsSyn
import Parser
import Lex ( PState(..), ParseResult(..) )
import SrcLoc ( mkSrcLoc )
-import Rename
+import Rename ( checkOldIface, renameModule, closeIfaceDecls )
import Rules ( emptyRuleBase )
import PrelInfo ( wiredInThingEnv, wiredInThings )
import PrelNames ( knownKeyNames )
import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails,
writeIface, pprIface )
import TcModule
-import Type
import InstEnv ( emptyInstEnv )
import Desugar
import SimplCore
import CoreUtils ( coreBindsSize )
import CoreTidy ( tidyCorePgm )
-import CoreToStg ( topCoreBindsToStg )
-import StgSyn ( collectFinalStgBinders )
+import CoreSat
+import CoreToStg ( coreToStg )
import SimplStg ( stg2stg )
import CodeGen ( codeGen )
import CodeOutput ( codeOutput )
-- we definitely expect to have the old interface available
hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch
| ghci_mode == OneShot
- = let bomb = panic "hscNoRecomp:OneShot"
- in return (HscNoRecomp pcs_ch bomb bomb)
+ = do {
+ hPutStrLn stderr "compilation IS NOT required";
+ let { bomb = panic "hscNoRecomp:OneShot" };
+ return (HscNoRecomp pcs_ch bomb bomb)
+ }
| otherwise
= do {
hPutStr stderr "compilation IS NOT required";
; when (verbosity dflags >= 1) $
hPutStr stderr "compilation IS required";
-- mode -v1 tries to keep everything on one line
- when (verbosity dflags /= 1) $
+ when (verbosity dflags > 1) $
hPutStrLn stderr "";
-- what target are we shooting for?
; let env_tc = tc_env tc_result
-------------------
- -- DESUGAR, SIMPLIFY, TIDY-CORE
+ -- DESUGAR
-------------------
- -- We grab the the unfoldings at this point.
- ; simpl_result <- dsThenSimplThenTidy dflags pcs_tc hst this_mod
- print_unqualified is_exported tc_result
- ; let (pcs_simpl, tidy_binds, orphan_rules, foreign_stuff) = simpl_result
-
+ ; (ds_binds, ds_rules, foreign_stuff)
+ <- deSugar dflags pcs_tc hst this_mod print_unqualified tc_result
+
-------------------
- -- CONVERT TO STG
+ -- SIMPLIFY, TIDY-CORE
-------------------
- ; (stg_binds, cost_centre_info, top_level_ids)
- <- myCoreToStg dflags this_mod tidy_binds
-
-
+ -- We grab the the unfoldings at this point.
+ ; (pcs_simpl, tidy_binds, orphan_rules)
+ <- simplThenTidy dflags pcs_tc hst this_mod is_exported ds_binds ds_rules
+
-------------------
-- BUILD THE NEW ModDetails AND ModIface
-------------------
- ; let new_details = mkModDetails env_tc tidy_binds
- top_level_ids orphan_rules
+ ; let new_details = mkModDetails env_tc tidy_binds orphan_rules
; final_iface <- mkFinalIface ghci_mode dflags location
maybe_checked_iface new_iface new_details
-------------------
+ -- CONVERT TO STG
+ -------------------
+ ; (stg_binds, cost_centre_info)
+ <- myCoreToStg dflags this_mod tidy_binds
+
+ -------------------
-- COMPLETE CODE GENERATION
-------------------
; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_ibinds)
buf <- hGetStringBuffer True{-expand tabs-} src_filename
let glaexts | dopt Opt_GlasgowExts dflags = 1#
- | otherwise = 0#
+ | otherwise = 0#
case parse buf PState{ bol = 0#, atbol = 1#,
context = [], glasgow_exts = glaexts,
}}
+simplThenTidy dflags pcs hst this_mod is_exported binds rules
+ = do -- Do main Core-language transformations ---------
+ -- _scc_ "Core2Core"
+ (simplified, orphan_rules)
+ <- core2core dflags pcs hst is_exported binds rules
+
+ -- Do saturation and convert to A-normal form
+ -- NOTE: future passes cannot transform the syntax, only annotate it
+ saturated <- coreSatPgm dflags simplified
+
+ -- Do the final tidy-up
+ (pcs', tidy_binds, tidy_orphan_rules)
+ <- tidyCorePgm dflags this_mod pcs saturated orphan_rules
+
+ return (pcs', tidy_binds, tidy_orphan_rules)
+
+
restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_info
foreign_stuff env_tc stg_binds tidy_binds
hit pit -- these last two for mapping ModNames to Modules
local_tycons = typeEnvTyCons env_tc
local_classes = typeEnvClasses env_tc
imported_modules = map mod_name_to_Module imported_module_names
- (fe_binders,h_code,c_code) = foreign_stuff
+ (h_code,c_code,fe_binders) = foreign_stuff
mod_name_to_Module :: ModuleName -> Module
mod_name_to_Module nm
(ppr nm)
-dsThenSimplThenTidy dflags pcs hst this_mod print_unqual is_exported tc_result
- = do -------------------------- Desugaring ----------------
- -- _scc_ "DeSugar"
- (desugared, rules, h_code, c_code, fe_binders)
- <- deSugar dflags pcs hst this_mod print_unqual tc_result
-
- -------------------------- Main Core-language transformations ----------------
- -- _scc_ "Core2Core"
- (simplified, orphan_rules)
- <- core2core dflags pcs hst is_exported desugared rules
-
- -- Do the final tidy-up
- (pcs', tidy_binds, tidy_orphan_rules)
- <- tidyCorePgm dflags this_mod pcs simplified orphan_rules
-
- return (pcs', tidy_binds, tidy_orphan_rules, (fe_binders,h_code,c_code))
-
-
myCoreToStg dflags this_mod tidy_binds
= do
() <- coreBindsSize tidy_binds `seq` return ()
-- simplifier, which for reasons I don't understand, persists
-- thoroughout code generation
+ --let bcos = byteCodeGen tidy_binds
+ --putStrLn (showSDoc (vcat (map ppr bcos)))
+
-- _scc_ "Core2Stg"
- stg_binds <- topCoreBindsToStg dflags this_mod tidy_binds
+ stg_binds <- coreToStg dflags this_mod tidy_binds
-- _scc_ "Stg2Stg"
(stg_binds2, cost_centre_info) <- stg2stg dflags this_mod stg_binds
- let final_ids = collectFinalStgBinders (map fst stg_binds2)
- return (stg_binds2, cost_centre_info, final_ids)
+ return (stg_binds2, cost_centre_info)
\end{code}
%************************************************************************
\begin{code}
-#ifndef GHCI
-hscExpr dflags hst hit pcs this_module expr
- = panic "hscExpr: non-interactive build"
-hscTypeExpr dflags hst hit pcs0 this_module expr
- = panic "hscTypeExpr: non-interactive build"
-#else
-
+#ifdef GHCI
hscExpr
:: DynFlags
-> HomeSymbolTable
-- Simplify it
simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr;
+ -- Saturate it
+ sat_expr <- coreSatExpr dflags simpl_expr;
+
-- Convert to STG
- stg_expr <- coreToStgExpr dflags simpl_expr;
+ let stg_expr = coreExprToStg sat_expr;
- -- ToDo: need to do StgVarInfo? or SRTs?
+ -- ToDo: need to do SRTs?
-- Convert to InterpSyn
unlinked_iexpr <- stgExprToInterpSyn dflags stg_expr;
initPersistentRenamerState :: IO PersistentRenamerState
= do ns <- mkSplitUniqSupply 'r'
return (
- PRS { prsOrig = Orig { origNames = initOrigNames,
+ PRS { prsOrig = Orig { origNS = ns,
+ origNames = initOrigNames,
origIParam = emptyFM },
prsDecls = (emptyNameEnv, 0),
prsInsts = (emptyBag, 0),
- prsRules = (emptyBag, 0),
- prsNS = ns
+ prsRules = (emptyBag, 0)
}
)
projects / ghc-hetmet.git / blobdiff