diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-08-22 13:56:17 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-08-25 11:12:30 +0100 |
| commit | 5b167f5edad7d3268de20452da7af05c38972f7c (patch) | |
| tree | 36a14e64b510ede91e4e334f3e44d865321adcde /compiler/codeGen/CodeGen.lhs | |
| parent | 3108accd634a521b25471df19f063c2061d6d3ee (diff) | |
| download | haskell-5b167f5edad7d3268de20452da7af05c38972f7c.tar.gz | |
Snapshot of codegen refactoring to share with simonpj
Diffstat (limited to 'compiler/codeGen/CodeGen.lhs')
| -rw-r--r-- | compiler/codeGen/CodeGen.lhs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/codeGen/CodeGen.lhs b/compiler/codeGen/CodeGen.lhs index 42c4bd24fc..b22e6ed64d 100644 --- a/compiler/codeGen/CodeGen.lhs +++ b/compiler/codeGen/CodeGen.lhs @@ -53,7 +53,7 @@ codeGen :: DynFlags -> CollectedCCs -- (Local/global) cost-centres needing declaring/registering. -> [(StgBinding,[(Id,[Id])])] -- Bindings to convert, with SRTs -> HpcInfo - -> IO [Cmm] -- Output + -> IO [CmmPgm] -- Output -- N.B. returning '[Cmm]' and not 'Cmm' here makes it -- possible for object splitting to split up the @@ -71,7 +71,7 @@ codeGen dflags this_mod data_tycons cost_centre_info stg_binds hpc_info ; cmm_tycons <- mapM cgTyCon data_tycons ; cmm_init <- getCmm (mkModuleInit dflags cost_centre_info this_mod hpc_info) - ; return (cmm_init : cmm_binds ++ concat cmm_tycons) + ; return (cmm_init : cmm_binds ++ cmm_tycons) } -- Put datatype_stuff after code_stuff, because the -- datatype closure table (for enumeration types) to @@ -105,7 +105,7 @@ mkModuleInit dflags cost_centre_info this_mod hpc_info -- For backwards compatibility: user code may refer to this -- label for calling hs_add_root(). - ; emitData Data $ Statics (mkPlainModuleInitLabel this_mod) [] + ; emitDecl (CmmData Data (Statics (mkPlainModuleInitLabel this_mod) [])) ; whenC (this_mod == mainModIs dflags) $ emitSimpleProc (mkPlainModuleInitLabel rOOT_MAIN) $ return () |