diff options
author | Simon Marlow <marlowsd@gmail.com> | 2011-12-19 15:59:56 +0000 |
---|---|---|
committer | Simon Marlow <marlowsd@gmail.com> | 2011-12-19 15:59:56 +0000 |
commit | ab67c2a4c0ae4b6aeb40fe7569a95c6a3a611c59 (patch) | |
tree | 416ac322edb7b0551c09d8e2cc9985312abd4652 /compiler/cmm/CmmUtils.hs | |
parent | b4018aaaebe4250e78cdcb245466fdcce8918abf (diff) | |
download | haskell-ab67c2a4c0ae4b6aeb40fe7569a95c6a3a611c59.tar.gz |
More codegen refactoring with simonpj
Diffstat (limited to 'compiler/cmm/CmmUtils.hs')
-rw-r--r-- | compiler/cmm/CmmUtils.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/cmm/CmmUtils.hs b/compiler/cmm/CmmUtils.hs index 6d02e693fb..c78fc242f4 100644 --- a/compiler/cmm/CmmUtils.hs +++ b/compiler/cmm/CmmUtils.hs @@ -401,13 +401,13 @@ mkLiveness (reg:regs) modifyGraph :: (Graph n C C -> Graph n' C C) -> GenCmmGraph n -> GenCmmGraph n' modifyGraph f g = CmmGraph {g_entry=g_entry g, g_graph=f (g_graph g)} -toBlockMap :: CmmGraph -> LabelMap CmmBlock +toBlockMap :: CmmGraph -> BlockEnv CmmBlock toBlockMap (CmmGraph {g_graph=GMany NothingO body NothingO}) = body -ofBlockMap :: BlockId -> LabelMap CmmBlock -> CmmGraph +ofBlockMap :: BlockId -> BlockEnv CmmBlock -> CmmGraph ofBlockMap entry bodyMap = CmmGraph {g_entry=entry, g_graph=GMany NothingO bodyMap NothingO} -insertBlock :: CmmBlock -> LabelMap CmmBlock -> LabelMap CmmBlock +insertBlock :: CmmBlock -> BlockEnv CmmBlock -> BlockEnv CmmBlock insertBlock block map = ASSERT (isNothing $ mapLookup id map) mapInsert id block map |