diff options
| author | dias@eecs.harvard.edu <unknown> | 2009-03-03 15:02:28 +0000 |
|---|---|---|
| committer | dias@eecs.harvard.edu <unknown> | 2009-03-03 15:02:28 +0000 |
| commit | 31a9d04804d9cacda35695c5397590516b964964 (patch) | |
| tree | 1253be42d69db8ab7a6d104e2eda8d03a44a9be2 /compiler/codeGen/StgCmm.hs | |
| parent | 6d38e24ea3da7ca9b435e9b1e59b2de8fcd91da4 (diff) | |
| download | haskell-31a9d04804d9cacda35695c5397590516b964964.tar.gz | |
A few bug fixes; some improvements spurred by paper writing
Among others:
- Fixed Stg->C-- translation of let-no-escapes -- it's important to use the
right continuation...
- Fixed infinite recursion in X86 backend (shortcutJump mishandled infinite loops)
- Fixed yet another wrong calling convention -- primops take args only in vanilla regs,
but they may return results on the stack!
- Removed StackInfo from LGraph and Block -- now in LastCall and CmmZ
- Updated avail-variable and liveness code
Diffstat (limited to 'compiler/codeGen/StgCmm.hs')
| -rw-r--r-- | compiler/codeGen/StgCmm.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/codeGen/StgCmm.hs b/compiler/codeGen/StgCmm.hs index 0fc6c4c5a8..ae4fa1b623 100644 --- a/compiler/codeGen/StgCmm.hs +++ b/compiler/codeGen/StgCmm.hs @@ -239,8 +239,7 @@ mkModuleInit way cost_centre_info this_mod main_mod imported_mods hpc_info mod_reg_val = CmmLoad (mkLblExpr moduleRegdLabel) bWord check_already_done retId updfr_sz = mkCmmIfThenElse (cmmNeWord (CmmLit zeroCLit) mod_reg_val) - (mkLabel retId emptyStackInfo - <*> mkReturn (ret_e updfr_sz) [] (pop_ret_loc updfr_sz)) mkNop + (mkLabel retId <*> mkReturn (ret_e updfr_sz) [] (pop_ret_loc updfr_sz)) mkNop <*> -- Set mod_reg to 1 to record that we've been here mkStore (mkLblExpr moduleRegdLabel) (CmmLit (mkIntCLit 1)) |