Add {-# OPTIONS_GHC -w #-} and some blurb to all compiler modules

[ghc-hetmet.git] / compiler / cmm / CmmParse.y

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 200ec38..039c616 100644 (file)
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -7,6 +7,13 @@
 -----------------------------------------------------------------------------
 
 {
+{-# OPTIONS_GHC -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+-- for details
+
 module CmmParse ( parseCmmFile ) where
 
 import CgMonad
@@ -202,15 +209,15 @@ lits      :: { [ExtFCode CmmExpr] }
 
 cmmproc :: { ExtCode }
 -- TODO: add real SRT/info tables to parsed Cmm
-       : info maybe_formals maybe_frame maybe_gc_block '{' body '}'
-               { do ((entry_ret_label, info, live, formals, frame, gc_block), stmts) <-
+       : info maybe_formals maybe_gc_block maybe_frame '{' body '}'
+               { do ((entry_ret_label, info, live, formals, gc_block, frame), stmts) <-
                       getCgStmtsEC' $ loopDecls $ do {
                         (entry_ret_label, info, live) <- $1;
                         formals <- sequence $2;
-                        frame <- $3;
-                        gc_block <- $4;
+                        gc_block <- $3;
+                        frame <- $4;
                         $6;
-                        return (entry_ret_label, info, live, formals, frame, gc_block) }
+                        return (entry_ret_label, info, live, formals, gc_block, frame) }
                     blks <- code (cgStmtsToBlocks stmts)
                     code (emitInfoTableAndCode entry_ret_label (CmmInfo gc_block frame info) formals blks) }
 
@@ -219,14 +226,14 @@ cmmproc :: { ExtCode }
                     formals <- sequence $2;
                     code (emitInfoTableAndCode entry_ret_label (CmmInfo Nothing Nothing info) formals []) }
 
-       | NAME maybe_formals maybe_frame maybe_gc_block '{' body '}'
-               { do ((formals, frame, gc_block), stmts) <-
+       | NAME maybe_formals maybe_gc_block maybe_frame '{' body '}'
+               { do ((formals, gc_block, frame), stmts) <-
                        getCgStmtsEC' $ loopDecls $ do {
                          formals <- sequence $2;
-                         frame <- $3;
-                         gc_block <- $4;
+                         gc_block <- $3;
+                         frame <- $4;
                          $6;
-                         return (formals, frame, gc_block) }
+                         return (formals, gc_block, frame) }
                      blks <- code (cgStmtsToBlocks stmts)
                     code (emitProc (CmmInfo gc_block frame CmmNonInfoTable) (mkRtsCodeLabelFS $1) formals blks) }
 
@@ -250,6 +257,19 @@ info       :: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
                        []) }
                -- we leave most of the fields zero here.  This is only used
                -- to generate the BCO info table in the RTS at the moment.
+
+       -- A variant with a non-zero arity (needed to write Main_main in Cmm)
+       | 'INFO_TABLE_FUN' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ',' INT ',' INT ')'
+               -- ptrs, nptrs, closure type, description, type, fun type, arity
+               { do prof <- profilingInfo $11 $13
+                    return (mkRtsEntryLabelFS $3,
+                       CmmInfoTable prof (fromIntegral $9)
+                                    (FunInfo (fromIntegral $5, fromIntegral $7) NoC_SRT (fromIntegral $15) (fromIntegral $17)
+                                     (ArgSpec 0)
+                                     zeroCLit),
+                       []) }
+               -- we leave most of the fields zero here.  This is only used
+               -- to generate the BCO info table in the RTS at the moment.
        
        | 'INFO_TABLE_CONSTR' '(' NAME ',' INT ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
                -- ptrs, nptrs, tag, closure type, description, type
@@ -878,6 +898,7 @@ foreignCall
 foreignCall conv_string results_code expr_code args_code vols safety ret
   = do  convention <- case conv_string of
           "C" -> return CCallConv
+          "stdcall" -> return StdCallConv
           "C--" -> return CmmCallConv
           _ -> fail ("unknown calling convention: " ++ conv_string)
        return $ do