X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmParse.y;h=23f98801522380a79f33ef63e043b06b52987bd1;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hp=32512fe0476a7ee0e912e07db4ec325ae9dbee76;hpb=1f8efd5d6214c490ef4942134abf5de9f468d29c;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 32512fe..23f9880 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -200,14 +200,15 @@ lits	:: { [ExtFCode CmmExpr] }
 
 cmmproc :: { ExtCode }
 -- TODO: add real SRT/info tables to parsed Cmm
-	: info maybe_formals maybe_frame '{' body '}'
-		{ do ((info_lbl, info, live, formals, frame), stmts) <-
+	: info maybe_formals maybe_frame maybe_gc_block '{' body '}'
+		{ do ((info_lbl, info, live, formals, frame, gc_block), stmts) <-
 		       getCgStmtsEC' $ loopDecls $ do {
 		         (info_lbl, info, live) <- $1;
 		         formals <- sequence $2;
 		         frame <- $3;
-		         $5;
-		         return (info_lbl, info, live, formals, frame) }
+		         gc_block <- $4;
+		         $6;
+		         return (info_lbl, info, live, formals, frame, gc_block) }
 		     blks <- code (cgStmtsToBlocks stmts)
 		     code (emitInfoTableAndCode info_lbl (CmmInfo Nothing frame info) formals blks) }
 
@@ -216,15 +217,16 @@ cmmproc :: { ExtCode }
 		     formals <- sequence $2;
 		     code (emitInfoTableAndCode info_lbl (CmmInfo Nothing Nothing info) formals []) }
 
-	| NAME maybe_formals maybe_frame '{' body '}'
-		{ do ((formals, frame), stmts) <-
+	| NAME maybe_formals maybe_frame maybe_gc_block '{' body '}'
+		{ do ((formals, frame, gc_block), stmts) <-
 			getCgStmtsEC' $ loopDecls $ do {
 		          formals <- sequence $2;
 			  frame <- $3;
-		          $5;
-		          return (formals, frame) }
+		          gc_block <- $4;
+		          $6;
+		          return (formals, frame, gc_block) }
                      blks <- code (cgStmtsToBlocks stmts)
-		     code (emitProc (CmmInfo Nothing frame CmmNonInfoTable) (mkRtsCodeLabelFS $1) formals blks) }
+		     code (emitProc (CmmInfo gc_block frame CmmNonInfoTable) (mkRtsCodeLabelFS $1) formals blks) }
 
 info	:: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
 	: 'INFO_TABLE' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
@@ -511,6 +513,11 @@ maybe_frame :: { ExtFCode (Maybe UpdateFrame) }
 					       args <- sequence $4;
 					       return $ Just (UpdateFrame target args) } }
 
+maybe_gc_block :: { ExtFCode (Maybe BlockId) }
+	: {- empty -}			{ return Nothing }
+	| 'goto' NAME
+		{ do l <- lookupLabel $2; return (Just l) }
+
 type	:: { MachRep }
 	: 'bits8'		{ I8 }
 	| typenot8		{ $1 }
@@ -859,6 +866,7 @@ foreignCall conv_string results_code expr_code args_code vols safety
 	  results <- sequence results_code
 	  expr <- expr_code
 	  args <- sequence args_code
+	  --code (stmtC (CmmCall (CmmForeignCall expr convention) results args safety))
           case convention of
             -- Temporary hack so at least some functions are CmmSafe
             CmmCallConv -> code (stmtC (CmmCall (CmmForeignCall expr convention) results args safety))