From 652a316b23383ea5983b85c7b2ecf8de358f3bd0 Mon Sep 17 00:00:00 2001 From: Norman Ramsey Date: Sat, 3 May 2008 22:47:20 +0000 Subject: [PATCH] replace hints with kinds in parser as well --- compiler/cmm/CmmParse.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y index 2f42f8c..55db17c 100644 --- a/compiler/cmm/CmmParse.y +++ b/compiler/cmm/CmmParse.y @@ -472,10 +472,10 @@ cmm_kind_exprs :: { [ExtFCode CmmActual] } | cmm_kind_expr ',' cmm_kind_exprs { $1 : $3 } cmm_kind_expr :: { ExtFCode CmmActual } - : expr { do e <- $1; return (CmmHinted e (inferCmmKind e)) } + : expr { do e <- $1; return (CmmKinded e (inferCmmKind e)) } | expr STRING {% do h <- parseCmmKind $2; return $ do - e <- $1; return (CmmHinted e h) } + e <- $1; return (CmmKinded e h) } exprs0 :: { [ExtFCode CmmExpr] } : {- empty -} { [] } @@ -499,10 +499,10 @@ cmm_formals :: { [ExtFCode CmmFormal] } | cmm_formal ',' cmm_formals { $1 : $3 } cmm_formal :: { ExtFCode CmmFormal } - : local_lreg { do e <- $1; return (CmmHinted e (inferCmmKind (CmmReg (CmmLocal e)))) } + : local_lreg { do e <- $1; return (CmmKinded e (inferCmmKind (CmmReg (CmmLocal e)))) } | STRING local_lreg {% do h <- parseCmmKind $1; return $ do - e <- $2; return (CmmHinted e h) } + e <- $2; return (CmmKinded e h) } local_lreg :: { ExtFCode LocalReg } : NAME { do e <- lookupName $1; @@ -924,13 +924,13 @@ foreignCall conv_string results_code expr_code args_code vols safety ret (CmmCallee expr' convention) args vols NoC_SRT ret) where unused = panic "not used by emitForeignCall'" -adjCallTarget :: CCallConv -> CmmExpr -> [CmmHinted CmmExpr] -> CmmExpr +adjCallTarget :: CCallConv -> CmmExpr -> [CmmKinded CmmExpr] -> CmmExpr #ifdef mingw32_TARGET_OS -- On Windows, we have to add the '@N' suffix to the label when making -- a call with the stdcall calling convention. adjCallTarget StdCallConv (CmmLit (CmmLabel lbl)) args = CmmLit (CmmLabel (addLabelSize lbl (sum (map size args)))) - where size (CmmHinted e _) = max wORD_SIZE (machRepByteWidth (cmmExprRep e)) + where size (CmmKinded e _) = max wORD_SIZE (machRepByteWidth (cmmExprRep e)) -- c.f. CgForeignCall.emitForeignCall #endif adjCallTarget _ expr _ -- 1.7.10.4