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

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 32512fe..40040db 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -200,37 +200,40 @@ 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, entry_ret_label, info, live, formals, frame, gc_block), stmts) <-
 		       getCgStmtsEC' $ loopDecls $ do {
-		         (info_lbl, info, live) <- $1;
+		         (info_lbl, entry_ret_label, info, live) <- $1;
 		         formals <- sequence $2;
 		         frame <- $3;
-		         $5;
-		         return (info_lbl, info, live, formals, frame) }
+		         gc_block <- $4;
+		         $6;
+		         return (info_lbl, entry_ret_label, info, live, formals, frame, gc_block) }
 		     blks <- code (cgStmtsToBlocks stmts)
-		     code (emitInfoTableAndCode info_lbl (CmmInfo Nothing frame info) formals blks) }
+		     code (emitInfoTableAndCode entry_ret_label (CmmInfo gc_block frame info) formals blks) }
 
 	| info maybe_formals ';'
-		{ do (info_lbl, info, live) <- $1;
+		{ do (info_lbl, entry_ret_label, info, live) <- $1;
 		     formals <- sequence $2;
-		     code (emitInfoTableAndCode info_lbl (CmmInfo Nothing Nothing info) formals []) }
+		     code (emitInfoTableAndCode entry_ret_label (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	:: { ExtFCode (CLabel, CLabel, CmmInfoTable, [Maybe LocalReg]) }
 	: 'INFO_TABLE' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ')'
 		-- ptrs, nptrs, closure type, description, type
 		{ do prof <- profilingInfo $11 $13
-		     return (mkRtsInfoLabelFS $3,
+		     let infoLabel = mkRtsInfoLabelFS $3
+		     return (infoLabel, infoLblToEntryLbl infoLabel,
 			CmmInfoTable prof (fromIntegral $9)
 				     (ThunkInfo (fromIntegral $5, fromIntegral $7) NoC_SRT),
 			[]) }
@@ -238,7 +241,8 @@ info	:: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
 	| 'INFO_TABLE_FUN' '(' NAME ',' INT ',' INT ',' INT ',' STRING ',' STRING ',' INT ')'
 		-- ptrs, nptrs, closure type, description, type, fun type
 		{ do prof <- profilingInfo $11 $13
-		     return (mkRtsInfoLabelFS $3,
+		     let infoLabel = mkRtsInfoLabelFS $3
+		     return (infoLabel, infoLblToEntryLbl infoLabel,
 			CmmInfoTable prof (fromIntegral $9)
 				     (FunInfo (fromIntegral $5, fromIntegral $7) NoC_SRT (fromIntegral $15) 0
 				      (ArgSpec 0)
@@ -253,7 +257,8 @@ info	:: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
 		     -- If profiling is on, this string gets duplicated,
 		     -- but that's the way the old code did it we can fix it some other time.
 		     desc_lit <- code $ mkStringCLit $13
-		     return (mkRtsInfoLabelFS $3,
+		     let infoLabel = mkRtsInfoLabelFS $3
+		     return (infoLabel, infoLblToEntryLbl infoLabel,
 			CmmInfoTable prof (fromIntegral $11)
 				     (ConstrInfo (fromIntegral $5, fromIntegral $7) (fromIntegral $9) desc_lit),
 			[]) }
@@ -261,14 +266,16 @@ info	:: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
 	| 'INFO_TABLE_SELECTOR' '(' NAME ',' INT ',' INT ',' STRING ',' STRING ')'
 		-- selector, closure type, description, type
 		{ do prof <- profilingInfo $9 $11
-		     return (mkRtsInfoLabelFS $3,
+		     let infoLabel = mkRtsInfoLabelFS $3
+		     return (infoLabel, infoLblToEntryLbl infoLabel,
 			CmmInfoTable prof (fromIntegral $7)
 				     (ThunkSelectorInfo (fromIntegral $5) NoC_SRT),
 			[]) }
 
 	| 'INFO_TABLE_RET' '(' NAME ',' INT ')'
 		-- closure type (no live regs)
-		{ return (mkRtsInfoLabelFS $3,
+		{ do let infoLabel = mkRtsInfoLabelFS $3
+		     return (infoLabel, infoLblToRetLbl infoLabel,
 			CmmInfoTable (ProfilingInfo zeroCLit zeroCLit) (fromIntegral $5)
 				     (ContInfo [] NoC_SRT),
 			[]) }
@@ -276,7 +283,8 @@ info	:: { ExtFCode (CLabel, CmmInfoTable, [Maybe LocalReg]) }
 	| 'INFO_TABLE_RET' '(' NAME ',' INT ',' formals0 ')'
 		-- closure type, live regs
 		{ do live <- sequence (map (liftM Just) $7)
-		     return (mkRtsInfoLabelFS $3,
+		     let infoLabel = mkRtsInfoLabelFS $3
+		     return (infoLabel, infoLblToRetLbl infoLabel,
 			CmmInfoTable (ProfilingInfo zeroCLit zeroCLit) (fromIntegral $5)
 			             (ContInfo live NoC_SRT),
 			live) }
@@ -511,6 +519,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 +872,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))