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

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 2cf1d1d..40040db 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -201,21 +201,21 @@ lits	:: { [ExtFCode CmmExpr] }
 cmmproc :: { ExtCode }
 -- TODO: add real SRT/info tables to parsed Cmm
 	: info maybe_formals maybe_frame maybe_gc_block '{' body '}'
-		{ do ((info_lbl, info, live, formals, frame, gc_block), stmts) <-
+		{ 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;
 		         gc_block <- $4;
 		         $6;
-		         return (info_lbl, info, live, formals, frame, gc_block) }
+		         return (info_lbl, entry_ret_label, info, live, formals, frame, gc_block) }
 		     blks <- code (cgStmtsToBlocks stmts)
-		     code (emitInfoTableAndCode info_lbl (CmmInfo gc_block 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 maybe_gc_block '{' body '}'
 		{ do ((formals, frame, gc_block), stmts) <-
@@ -228,11 +228,12 @@ cmmproc :: { ExtCode }
                      blks <- code (cgStmtsToBlocks stmts)
 		     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),
 			[]) }
@@ -240,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)
@@ -255,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),
 			[]) }
@@ -263,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),
 			[]) }
@@ -278,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) }