X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=05ec274d8301497bf2481548da319e6aa9fa2ded;hb=49c98d143c382a1341e1046f5ca00819a25691ba;hp=5908314c870a2f5cf60e63004216a835b9f5ca1d;hpb=b7cadd88aa32661c623f862a3aabc513a0e9f5c3;p=ghc-hetmet.git diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 5908314..05ec274 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- --- (c) The University of Glasgow, 2004 +-- (c) The University of Glasgow, 2004-2006 -- -- Parser for concrete Cmm. -- @@ -16,38 +16,37 @@ import CgProf import CgTicky import CgInfoTbls import CgForeignCall -import CgTailCall ( pushUnboxedTuple ) -import CgStackery ( emitPushUpdateFrame ) -import ClosureInfo ( C_SRT(..) ) -import CgCallConv ( smallLiveness ) -import CgClosure ( emitBlackHoleCode ) -import CostCentre ( dontCareCCS ) +import CgTailCall +import CgStackery +import ClosureInfo +import CgCallConv +import CgClosure +import CostCentre import Cmm import PprCmm -import CmmUtils ( mkIntCLit ) +import CmmUtils import CmmLex import CLabel import MachOp -import SMRep ( fixedHdrSize, CgRep(..) ) +import SMRep import Lexer -import ForeignCall ( CCallConv(..), Safety(..) ) -import Literal ( mkMachInt ) +import ForeignCall +import Literal import Unique import UniqFM import SrcLoc -import DynFlags ( DynFlags, DynFlag(..) ) -import Packages ( HomeModules ) -import StaticFlags ( opt_SccProfilingOn ) -import ErrUtils ( printError, dumpIfSet_dyn, showPass ) -import StringBuffer ( hGetStringBuffer ) +import DynFlags +import StaticFlags +import ErrUtils +import StringBuffer import FastString -import Panic ( panic ) -import Constants ( wORD_SIZE ) +import Panic +import Constants import Outputable -import Monad ( when ) +import Control.Monad ( when ) import Data.Char ( ord ) #include "HsVersions.h" @@ -907,8 +906,8 @@ initEnv = listToUFM [ Var (CmmLit (CmmInt (fromIntegral stdInfoTableSizeB) wordRep) )) ] -parseCmmFile :: DynFlags -> HomeModules -> FilePath -> IO (Maybe Cmm) -parseCmmFile dflags hmods filename = do +parseCmmFile :: DynFlags -> FilePath -> IO (Maybe Cmm) +parseCmmFile dflags filename = do showPass dflags "ParseCmm" buf <- hGetStringBuffer filename let @@ -919,7 +918,7 @@ parseCmmFile dflags hmods filename = do case unP cmmParse init_state of PFailed span err -> do printError span err; return Nothing POk _ code -> do - cmm <- initC dflags hmods no_module (getCmm (unEC code initEnv [] >> return ())) + cmm <- initC dflags no_module (getCmm (unEC code initEnv [] >> return ())) dumpIfSet_dyn dflags Opt_D_dump_cmm "Cmm" (pprCmms [cmm]) return (Just cmm) where