X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=72a57137c2ea529410f55c1711a87377ee36aeb0;hb=dc8ffcb9797ade3e3a68e6ec0a89fe2e7444e0ef;hp=5908314c870a2f5cf60e63004216a835b9f5ca1d;hpb=b7cadd88aa32661c623f862a3aabc513a0e9f5c3;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 5908314..72a5713 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,39 +16,39 @@ 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
 import Data.Char	( ord )
+import System.Exit
 
 #include "HsVersions.h"
 }
@@ -230,12 +230,8 @@ info	:: { ExtFCode (CLabel, [CmmLit],[CmmLit]) }
 		-- selector, closure type, description, type
 		{ basicInfo $3 (mkIntCLit (fromIntegral $5)) 0 $7 $9 $11 }
 
-	| 'INFO_TABLE_RET' '(' NAME ',' INT ',' INT ',' INT maybe_vec ')'
-		{ retInfo $3 $5 $7 $9 $10 }
-
-maybe_vec :: { [CmmLit] }
-	: {- empty -}			{ [] }
-	| ',' NAME maybe_vec		{ CmmLabel (mkRtsCodeLabelFS $2) : $3 }
+	| 'INFO_TABLE_RET' '(' NAME ',' INT ',' INT ',' INT ')'
+		{ retInfo $3 $5 $7 $9 }
 
 body	:: { ExtCode }
 	: {- empty -}			{ return () }
@@ -425,6 +421,7 @@ section :: String -> Section
 section "text"	 = Text
 section "data" 	 = Data
 section "rodata" = ReadOnlyData
+section "relrodata" = RelocatableReadOnlyData
 section "bss"	 = UninitialisedData
 section s	 = OtherSection s
 
@@ -472,8 +469,7 @@ exprMacros = listToUFM [
   ( FSLIT("GET_FUN_INFO"), \ [x] -> funInfoTable (closureInfoPtr x) ),
   ( FSLIT("INFO_TYPE"),    \ [x] -> infoTableClosureType x ),
   ( FSLIT("INFO_PTRS"),    \ [x] -> infoTablePtrs x ),
-  ( FSLIT("INFO_NPTRS"),   \ [x] -> infoTableNonPtrs x ),
-  ( FSLIT("RET_VEC"),      \ [info, conZ] -> retVec info conZ )
+  ( FSLIT("INFO_NPTRS"),   \ [x] -> infoTableNonPtrs x )
   ]
 
 -- we understand a subset of C-- primitives:
@@ -708,11 +704,11 @@ forkLabelledCodeEC ec = do
   stmts <- getCgStmtsEC ec
   code (forkCgStmts stmts)
 
-retInfo name size live_bits cl_type vector = do
+retInfo name size live_bits cl_type = do
   let liveness = smallLiveness (fromIntegral size) (fromIntegral live_bits)
       info_lbl = mkRtsRetInfoLabelFS name
       (info1,info2) = mkRetInfoTable info_lbl liveness NoC_SRT 
-				(fromIntegral cl_type) vector
+				(fromIntegral cl_type)
   return (info_lbl, info1, info2)
 
 stdInfo name ptrs nptrs srt_bitmap cl_type desc_str ty_str =
@@ -907,8 +903,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
@@ -918,9 +914,12 @@ parseCmmFile dflags hmods filename = do
 		-- in there we don't want.
   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 ()))
-	dumpIfSet_dyn dflags Opt_D_dump_cmm "Cmm" (pprCmms [cmm])
+    POk pst code -> do
+	cmm <- initC dflags no_module (getCmm (unEC code initEnv [] >> return ()))
+	let ms = getMessages pst
+	printErrorsAndWarnings dflags ms
+        when (errorsFound dflags ms) $ exitWith (ExitFailure 1)
+        dumpIfSet_dyn dflags Opt_D_dump_cmm "Cmm" (pprCmms [cmm])
 	return (Just cmm)
   where
 	no_module = panic "parseCmmFile: no module"