X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcodeGen%2FCgMonad.lhs;h=0e4a8a4c733542bdb173a9fc296ea7b689b74159;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hp=1866df4cefbf0834abcacd5c5d7651927fe785f0;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc;p=ghc-hetmet.git

diff --git a/compiler/codeGen/CgMonad.lhs b/compiler/codeGen/CgMonad.lhs
index 1866df4..0e4a8a4 100644
--- a/compiler/codeGen/CgMonad.lhs
+++ b/compiler/codeGen/CgMonad.lhs
@@ -1,8 +1,7 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-% $Id: CgMonad.lhs,v 1.45 2005/06/21 10:44:41 simonmar Exp $
-%
 \section[CgMonad]{The code generation monad}
 
 See the beginning of the top-level @CodeGen@ module, to see how this
@@ -42,7 +41,7 @@ module CgMonad (
 	getHpUsage,  setHpUsage,
 	heapHWM,
 
-	moduleName,
+	getModuleName,
 
 	Sequel(..), -- ToDo: unabstract?
 
@@ -61,23 +60,23 @@ module CgMonad (
 
 import {-# SOURCE #-} CgBindery ( CgBindings, nukeVolatileBinds )
 
-import DynFlags		( DynFlags(..) )
-import PackageConfig	( PackageId )
+import DynFlags
+import PackageConfig
 import Cmm
-import CmmUtils		( CmmStmts, isNopStmt )
+import CmmUtils
 import CLabel
-import SMRep		( WordOff )
-import Module		( Module )
-import Id		( Id )
+import SMRep
+import Module
+import Id
 import VarEnv
 import OrdList
-import Unique		( Unique )
-import Util		( mapAccumL )
-import UniqSupply	( UniqSupply, mkSplitUniqSupply, splitUniqSupply, uniqFromSupply )
+import Unique
+import Util
+import UniqSupply
 import FastString
 import Outputable
 
-import Control.Monad	( liftM )
+import Control.Monad
 
 infixr 9 `thenC`	-- Right-associative!
 infixr 9 `thenFC`
@@ -171,7 +170,6 @@ data Sequel
 		     -- case this might be the label of a return vector
 	  SemiTaggingStuff
 	  Id	      -- The case binder, only used to see if it's dead
-	  Bool	      -- True <=> polymorphic, push a SEQ frame too
 
 type SemiTaggingStuff
   = Maybe			-- Maybe[1] we don't have any semi-tagging stuff...
@@ -243,6 +241,7 @@ flattenCgStmts id stmts =
 
 isJump (CmmJump _ _) = True
 isJump (CmmBranch _) = True
+isJump (CmmSwitch _ _) = True
 isJump _ = False
 
 isOrdinaryStmt (CgStmt _) = True
@@ -804,8 +803,8 @@ consCgStmt stmt stmts = CgStmt stmt `consOL` stmts
 -- ----------------------------------------------------------------------------
 -- Get the current module name
 
-moduleName :: FCode Module
-moduleName = do { info <- getInfoDown; return (cgd_mod info) }
+getModuleName :: FCode Module
+getModuleName = do { info <- getInfoDown; return (cgd_mod info) }
 
 -- ----------------------------------------------------------------------------
 -- Get/set the end-of-block info