X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FabsCSyn%2FPprAbsC.lhs;h=e022656075aa7b978369a15cc8e6f8a1eb24a123;hb=871db587eda4fcba3fdc049b225a1d63a4ebe641;hp=dc29be7d9a401e8589e1d8125ca672ce5dc79050;hpb=5c67176de89fee19a02056216a7c58579e765148;p=ghc-hetmet.git diff --git a/ghc/compiler/absCSyn/PprAbsC.lhs b/ghc/compiler/absCSyn/PprAbsC.lhs index dc29be7..e022656 100644 --- a/ghc/compiler/absCSyn/PprAbsC.lhs +++ b/ghc/compiler/absCSyn/PprAbsC.lhs @@ -26,27 +26,28 @@ import AbsCUtils ( getAmodeRep, nonemptyAbsC, ) import Constants ( mIN_UPD_SIZE ) -import CallConv ( CallConv, callConvAttribute, cCallConv ) -import CLabel ( externallyVisibleCLabel, mkErrorStdEntryLabel, +import CallConv ( callConvAttribute ) +import CLabel ( externallyVisibleCLabel, needsCDecl, pprCLabel, mkReturnInfoLabel, mkReturnPtLabel, mkClosureTblLabel, - mkStaticClosureLabel, + mkClosureLabel, mkErrorStdEntryLabel, CLabel, CLabelType(..), labelType, labelDynamic ) -import CmdLineOpts ( opt_SccProfilingOn, opt_EmitCExternDecls, opt_GranMacros ) +import CmdLineOpts ( opt_SccProfilingOn, opt_GranMacros ) import CostCentre ( pprCostCentreDecl, pprCostCentreStackDecl ) import Costs ( costs, addrModeCosts, CostRes(..), Side(..) ) -import CStrings ( stringToC ) +import CStrings ( pprStringInCStyle, pprCLabelString ) import FiniteMap ( addToFM, emptyFM, lookupFM, FiniteMap ) -import Const ( Literal(..) ) +import Literal ( Literal(..) ) import TyCon ( tyConDataCons ) import Name ( NamedThing(..) ) -import DataCon ( DataCon{-instance NamedThing-} ) +import DataCon ( dataConWrapId ) import Maybes ( maybeToBool, catMaybes ) -import PrimOp ( primOpNeedsWrapper, pprPrimOp, PrimOp(..) ) -import PrimRep ( isFloatingRep, PrimRep(..), getPrimRepSize, showPrimRep ) +import PrimOp ( primOpNeedsWrapper, pprCCallOp, + PrimOp(..), CCall(..), CCallTarget(..), isDynamicTarget ) +import PrimRep ( isFloatingRep, PrimRep(..), getPrimRepSize ) import SMRep ( pprSMRep ) import Unique ( pprUnique, Unique{-instance NamedThing-} ) import UniqSet ( emptyUniqSet, elementOfUniqSet, @@ -55,11 +56,10 @@ import UniqSet ( emptyUniqSet, elementOfUniqSet, import StgSyn ( SRT(..) ) import BitSet ( intBS ) import Outputable +import GlaExts import Util ( nOfThem ) -import Addr ( Addr ) import ST -import MutableArray infixr 9 `thenTE` \end{code} @@ -150,7 +150,7 @@ pprAbsC (CReturn am return_info) c mk_vector x = hcat [ptext SLIT("RET_VEC"), char '(', pprAmode am, comma, x, rparen ] -pprAbsC (CSplitMarker) _ = ptext SLIT("/* SPLIT */") +pprAbsC (CSplitMarker) _ = ptext SLIT("__STG_SPLIT_MARKER") -- we optimise various degenerate cases of CSwitches. @@ -176,8 +176,8 @@ pprAbsC (CSwitch discrim [(tag,alt_code)] deflt) c -- only one alt do_if_stmt discrim tag alt_code dc c -- What problem is the re-ordering trying to solve ? -pprAbsC (CSwitch discrim [(tag1@(MachInt i1 _), alt_code1), - (tag2@(MachInt i2 _), alt_code2)] deflt) c +pprAbsC (CSwitch discrim [(tag1@(MachInt i1), alt_code1), + (tag2@(MachInt i2), alt_code2)] deflt) c | empty_deflt && ((i1 == 0 && i2 == 1) || (i1 == 1 && i2 == 0)) = if (i1 == 0) then do_if_stmt discrim tag1 alt_code1 alt_code2 c @@ -213,8 +213,8 @@ pprAbsC (CSwitch discrim alts deflt) c -- general case -- Costs for addressing header of switch and cond. branching -- HWL switch_head_cost = addrModeCosts discrim Rhs + (Cost (0, 1, 0, 0, 0)) -pprAbsC stmt@(COpStmt results op@(CCallOp _ _ _ _) args vol_regs) _ - = pprCCall op args results vol_regs +pprAbsC stmt@(COpStmt results (CCallOp ccall) args vol_regs) _ + = pprCCall ccall args results vol_regs pprAbsC stmt@(COpStmt results op args vol_regs) _ = let @@ -239,7 +239,7 @@ pprAbsC stmt@(COpStmt results op args vol_regs) _ the_op where ppr_op_call results args - = hcat [ pprPrimOp op, lparen, + = hcat [ ppr op, lparen, hcat (punctuate comma (map ppr_op_result results)), if null results || null args then empty else comma, hcat (punctuate comma (map pprAmode args)), @@ -284,32 +284,68 @@ pprAbsC (CCallProfCtrMacro op as) _ pprAbsC (CCallProfCCMacro op as) _ = hcat [ptext op, lparen, hcat (punctuate comma (map ppr_amode as)),pp_paren_semi] -pprAbsC stmt@(CCallTypedef op@(CCallOp op_str is_asm may_gc cconv) results args) _ - = hsep [ ptext SLIT("typedef") +pprAbsC stmt@(CCallTypedef is_tdef (CCall op_str is_asm may_gc cconv) results args) _ + = hsep [ ptext (if is_tdef then SLIT("typedef") else SLIT("extern")) , ccall_res_ty , fun_nm , parens (hsep (punctuate comma ccall_decl_ty_args)) ] <> semi where - fun_nm = parens (text (callConvAttribute cconv) <+> char '*' <> ccall_fun_ty) + {- + In the non-casm case, to ensure that we're entering the given external + entry point using the correct calling convention, we have to do the following: + + - When entering via a function pointer (the `dynamic' case) using the specified + calling convention, we emit a typedefn declaration attributed with the + calling convention to use together with the result and parameter types we're + assuming. Coerce the function pointer to this type and go. + + - to enter the function at a given code label, we emit an extern declaration + for the label here, stating the calling convention together with result and + argument types we're assuming. + + The C compiler will hopefully use this extern declaration to good effect, + reporting any discrepancies between our extern decl and any other that + may be in scope. + + Re: calling convention, notice that gcc (2.8.1 and egcs-1.0.2) will for + the external function `foo' use the calling convention of the first `foo' + prototype it encounters (nor does it complain about conflicting attribute + declarations). The consequence of this is that you cannot override the + calling convention of `foo' using an extern declaration (you'd have to use + a typedef), but why you would want to do such a thing in the first place + is totally beyond me. + + ToDo: petition the gcc folks to add code to warn about conflicting attribute + declarations. + + -} + + fun_nm + | is_tdef = parens (text (callConvAttribute cconv) <+> char '*' <> ccall_fun_ty) + | otherwise = text (callConvAttribute cconv) <+> ccall_fun_ty ccall_fun_ty = case op_str of - Right u -> ptext SLIT("_ccall_fun_ty") <> ppr u + DynamicTarget u -> ptext SLIT("_ccall_fun_ty") <> ppr u + StaticTarget x -> pprCLabelString x ccall_res_ty = case non_void_results of [] -> ptext SLIT("void") - [amode] -> text (showPrimRep (getAmodeRep amode)) + [amode] -> ppr (getAmodeRep amode) _ -> panic "pprAbsC{CCallTypedef}: ccall_res_ty" - ccall_decl_ty_args = tail ccall_arg_tys - ccall_arg_tys = map (text.showPrimRep.getAmodeRep) non_void_args + ccall_decl_ty_args + | is_tdef = tail ccall_arg_tys + | otherwise = ccall_arg_tys + + ccall_arg_tys = map (ppr . getAmodeRep) non_void_args -- the first argument will be the "I/O world" token (a VoidRep) -- all others should be non-void non_void_args = - let nvas = tail args + let nvas = init args in ASSERT (all non_void nvas) nvas -- there will usually be two results: a (void) state which we @@ -324,17 +360,20 @@ pprAbsC (CCodeBlock lbl abs_C) _ else case (pprTempAndExternDecls abs_C) of { (pp_temps, pp_exts) -> vcat [ + empty, + pp_exts, hcat [text (if (externallyVisibleCLabel lbl) then "FN_(" -- abbreviations to save on output else "IFN_("), pprCLabel lbl, text ") {"], - pp_exts, pp_temps, + pp_temps, nest 8 (ptext SLIT("FB_")), nest 8 (pprAbsC abs_C (costs abs_C)), nest 8 (ptext SLIT("FE_")), - char '}' ] + char '}', + char ' ' ] } @@ -379,16 +418,18 @@ pprAbsC stmt@(CStaticClosure closure_lbl cl_info cost_centre amodes) _ where rep = getAmodeRep item - padding_wds = - if not (closureUpdReqd cl_info) then - [] - else - case max 0 (mIN_UPD_SIZE - length amodes) of { still_needed -> - nOfThem still_needed (mkIntCLit 0) } -- a bunch of 0s + upd_reqd = closureUpdReqd cl_info + + padding_wds + | not upd_reqd = [] + | otherwise = case max 0 (mIN_UPD_SIZE - length amodes) of { still_needed -> + nOfThem still_needed (mkIntCLit 0) } -- a bunch of 0s + -- always have a static link field, it's used to save the closure's + -- info pointer when we're reverting CAFs (see comment in Storage.c) static_link_field - | staticClosureNeedsLink cl_info = [mkIntCLit 0] - | otherwise = [] + | upd_reqd || staticClosureNeedsLink cl_info = [mkIntCLit 0] + | otherwise = [] pprAbsC stmt@(CClosureInfoAndCode cl_info slow maybe_fast cl_descr) _ = vcat [ @@ -459,15 +500,15 @@ pprAbsC stmt@(CClosureInfoAndCode cl_info slow maybe_fast cl_descr) _ type_str = pprSMRep (closureSMRep cl_info) - pp_descr = hcat [char '"', text (stringToC cl_descr), char '"'] - pp_type = hcat [char '"', text (stringToC (closureTypeDescr cl_info)), char '"'] + pp_descr = pprStringInCStyle cl_descr + pp_type = pprStringInCStyle (closureTypeDescr cl_info) pprAbsC stmt@(CClosureTbl tycon) _ = vcat ( ptext SLIT("CLOSURE_TBL") <> lparen <> pprCLabel (mkClosureTblLabel tycon) <> rparen : punctuate comma ( - map (pp_closure_lbl . mkStaticClosureLabel . getName) (tyConDataCons tycon) + map (pp_closure_lbl . mkClosureLabel . getName . dataConWrapId) (tyConDataCons tycon) ) ) $$ ptext SLIT("};") @@ -525,6 +566,14 @@ pprAbsC stmt@(CRetVector lbl amodes srt liveness) _ LvLarge _ -> SLIT("RET_VEC_BIG") +pprAbsC stmt@(CModuleInitBlock lbl code) _ + = vcat [ + ptext SLIT("START_MOD_INIT") <> parens (pprCLabel lbl), + case (pprTempAndExternDecls stmt) of { (_, pp_exts) -> pp_exts }, + pprAbsC code (costs code), + hcat [ptext SLIT("END_MOD_INIT"), lparen, rparen] + ] + pprAbsC (CCostCentreDecl is_local cc) _ = pprCostCentreDecl is_local cc pprAbsC (CCostCentreStackDecl ccs) _ = pprCostCentreStackDecl ccs \end{code} @@ -552,16 +601,14 @@ ppLocalnessMacro include_dyn_prefix clabel = where is_visible = externallyVisibleCLabel clabel label_type = labelType clabel - is_dynamic = labelDynamic clabel visiblity_prefix | is_visible = char 'E' | otherwise = char 'I' dyn_prefix - | not include_dyn_prefix = empty - | is_dynamic = char 'D' - | otherwise = empty + | include_dyn_prefix && labelDynamic clabel = char 'D' + | otherwise = empty \end{code} @@ -591,25 +638,17 @@ ppr_vol_regs (r:rs) (($$) ((<>) (ptext SLIT("CALLER_SAVE_")) pp_reg) more_saves, ($$) ((<>) (ptext SLIT("CALLER_RESTORE_")) pp_reg) more_restores) --- pp_basic_{saves,restores}: The BaseReg, SpA, SuA, SpB, SuB, Hp and +-- pp_basic_{saves,restores}: The BaseReg, Sp, Su, Hp and -- HpLim (see StgRegs.lh) may need to be saved/restored around CCalls, -- depending on the platform. (The "volatile regs" stuff handles all -- other registers.) Just be *sure* BaseReg is OK before trying to do -- anything else. The correct sequence of saves&restores are -- encoded by the CALLER_*_SYSTEM macros. -pp_basic_saves - = vcat - [ ptext SLIT("CALLER_SAVE_Base") - , ptext SLIT("CALLER_SAVE_SYSTEM") - ] - +pp_basic_saves = ptext SLIT("CALLER_SAVE_SYSTEM") pp_basic_restores = ptext SLIT("CALLER_RESTORE_SYSTEM") \end{code} \begin{code} -has_srt (_, NoSRT) = False -has_srt _ = True - pp_srt_info srt = case srt of (lbl, NoSRT) -> @@ -644,10 +683,10 @@ do_if_stmt discrim tag alt_code deflt c = case tag of -- This special case happens when testing the result of a comparison. -- We can just avoid some redundant clutter in the output. - MachInt n _ | n==0 -> ppr_if_stmt (pprAmode discrim) + MachInt n | n==0 -> ppr_if_stmt (pprAmode discrim) deflt alt_code (addrModeCosts discrim Rhs) c - other -> let + other -> let cond = hcat [ pprAmode discrim , ptext SLIT(" == ") , tcast @@ -661,10 +700,9 @@ do_if_stmt discrim tag alt_code deflt c -- in C (when minInt is a number not a constant -- expression which evaluates to it.) -- - tcast = - case other of - MachInt _ signed | signed -> ptext SLIT("(I_)") - _ -> empty + tcast = case other of + MachInt _ -> ptext SLIT("(I_)") + _ -> empty in ppr_if_stmt cond alt_code deflt @@ -737,13 +775,12 @@ Amendment to the above: if we can GC, we have to: that the runtime check that PerformGC is being used sensibly will work. \begin{code} -pprCCall op@(CCallOp op_str is_asm may_gc cconv) args results vol_regs +pprCCall call@(CCall op_str is_asm may_gc cconv) args results vol_regs = vcat [ char '{', declare_local_vars, -- local var for *result* vcat local_arg_decls, pp_save_context, - declare_fun_extern, -- declare expected function type. process_casm local_vars pp_non_void_args casm_str, pp_restore_context, assign_results, @@ -752,16 +789,17 @@ pprCCall op@(CCallOp op_str is_asm may_gc cconv) args results vol_regs where (pp_saves, pp_restores) = ppr_vol_regs vol_regs (pp_save_context, pp_restore_context) - | may_gc = ( text "do { SaveThreadState();" - , text "LoadThreadState();} while(0);" + | may_gc = ( text "{ I_ id; SUSPEND_THREAD(id);" + , text "RESUME_THREAD(id);}" ) | otherwise = ( pp_basic_saves $$ pp_saves, pp_basic_restores $$ pp_restores) - non_void_args = - let nvas = tail args - in ASSERT (all non_void nvas) nvas - -- the first argument will be the "I/O world" token (a VoidRep) + non_void_args = + let nvas = init args + in ASSERT2 ( all non_void nvas, pprCCallOp call <+> hsep (map pprAmode args) ) + nvas + -- the last argument will be the "I/O world" token (a VoidRep) -- all others should be non-void non_void_results = @@ -773,88 +811,17 @@ pprCCall op@(CCallOp op_str is_asm may_gc cconv) args results vol_regs (local_arg_decls, pp_non_void_args) = unzip [ ppr_casm_arg a i | (a,i) <- non_void_args `zip` [1..] ] - - {- - In the non-casm case, to ensure that we're entering the given external - entry point using the correct calling convention, we have to do the following: - - - When entering via a function pointer (the `dynamic' case) using the specified - calling convention, we emit a typedefn declaration attributed with the - calling convention to use together with the result and parameter types we're - assuming. Coerce the function pointer to this type and go. - - - to enter the function at a given code label, we emit an extern declaration - for the label here, stating the calling convention together with result and - argument types we're assuming. - - The C compiler will hopefully use this extern declaration to good effect, - reporting any discrepancies between our extern decl and any other that - may be in scope. - - Re: calling convention, notice that gcc (2.8.1 and egcs-1.0.2) will for - the external function `foo' use the calling convention of the first `foo' - prototype it encounters (nor does it complain about conflicting attribute - declarations). The consequence of this is that you cannot override the - calling convention of `foo' using an extern declaration (you'd have to use - a typedef), but why you would want to do such a thing in the first place - is totally beyond me. - - ToDo: petition the gcc folks to add code to warn about conflicting attribute - declarations. - - -} - declare_fun_extern - | is_dynamic || is_asm || not opt_EmitCExternDecls = empty - | otherwise = - hsep [ typedef_or_extern - , ccall_res_ty - , fun_nm - , parens (hsep (punctuate comma ccall_decl_ty_args)) - ] <> semi - where - typedef_or_extern - | is_dynamic = ptext SLIT("typedef") - | otherwise = ptext SLIT("extern") - - fun_nm - | is_dynamic = parens (text (callConvAttribute cconv) <+> char '*' <> ccall_fun_ty) - | otherwise = text (callConvAttribute cconv) <+> ptext asm_str - - -- leave out function pointer - ccall_decl_ty_args - | is_dynamic = tail ccall_arg_tys - | otherwise = ccall_arg_tys - - ccall_arg_tys = map (text.showPrimRep.getAmodeRep) non_void_args - - ccall_res_ty = - case non_void_results of - [] -> ptext SLIT("void") - [amode] -> text (showPrimRep (getAmodeRep amode)) - _ -> panic "pprCCall: ccall_res_ty" - - ccall_fun_ty = - ptext SLIT("_ccall_fun_ty") <> - case op_str of - Right u -> ppr u - _ -> empty - (declare_local_vars, local_vars, assign_results) = ppr_casm_results non_void_results - (Left asm_str) = op_str - is_dynamic = - case op_str of - Left _ -> False - _ -> True - casm_str = if is_asm then _UNPK_ asm_str else ccall_str + StaticTarget asm_str = op_str -- Must be static if it's a casm -- Remainder only used for ccall - fun_name - | is_dynamic = parens (parens (ccall_fun_ty) <> text "%0") - | otherwise = ptext asm_str + fun_name = case op_str of + DynamicTarget u -> parens (parens (ptext SLIT("_ccall_fun_ty") <> ppr u) <> text "%0") + StaticTarget st -> pprCLabelString st ccall_str = showSDoc (hcat [ @@ -866,9 +833,8 @@ pprCCall op@(CCallOp op_str is_asm may_gc cconv) args results vol_regs text "));" ]) - ccall_fun_args - | is_dynamic = tail ccall_args - | otherwise = ccall_args + ccall_fun_args | isDynamicTarget op_str = tail ccall_args + | otherwise = ccall_args ccall_args = zipWith (\ _ i -> char '%' <> int i) non_void_args [0..] @@ -967,7 +933,7 @@ process_casm results args string = process results args string process [] _ "" = empty process (_:_) _ "" = error ("process_casm: non-void result not assigned while processing _casm_ \"" ++ string ++ - "\"\n(Try changing result type to PrimIO ()\n") + "\"\n(Try changing result type to IO ()\n") process ress args ('%':cs) = case cs of @@ -1120,6 +1086,29 @@ pprAmode amode = ppr_amode amode \end{code} +When we have an indirection through a CIndex, we have to be careful to +get the type casts right. + +this amode: + + CVal (CIndex kind1 base offset) kind2 + +means (in C speak): + + *(kind2 *)((kind1 *)base + offset) + +That is, the indexing is done in units of kind1, but the resulting +amode has kind2. + +\begin{code} +ppr_amode (CVal reg_rel@(CIndex _ _ _) kind) + = case (pprRegRelative False{-no sign wanted-} reg_rel) of + (pp_reg, Nothing) -> panic "ppr_amode: CIndex" + (pp_reg, Just offset) -> + hcat [ char '*', parens (pprPrimKind kind <> char '*'), + parens (pp_reg <> char '+' <> offset) ] +\end{code} + Now the rest of the cases for ``workhorse'' @ppr_amode@: \begin{code} @@ -1146,14 +1135,11 @@ ppr_amode (CIntLike int) ppr_amode (CLit lit) = pprBasicLit lit -ppr_amode (CLitLit str _) = ptext str - ppr_amode (CJoinPoint _) = panic "ppr_amode: CJoinPoint" ppr_amode (CMacroExpr pk macro as) - = parens (pprPrimKind pk) <> - parens (ptext (cExprMacroText macro) <> + = parens (ptext (cExprMacroText macro) <> parens (hcat (punctuate comma (map pprAmode as)))) \end{code} @@ -1162,6 +1148,7 @@ cExprMacroText ENTRY_CODE = SLIT("ENTRY_CODE") cExprMacroText ARG_TAG = SLIT("ARG_TAG") cExprMacroText GET_TAG = SLIT("GET_TAG") cExprMacroText UPD_FRAME_UPDATEE = SLIT("UPD_FRAME_UPDATEE") +cExprMacroText CCS_HDR = SLIT("CCS_HDR") cStmtMacroText ARGS_CHK = SLIT("ARGS_CHK") cStmtMacroText ARGS_CHK_LOAD_NODE = SLIT("ARGS_CHK_LOAD_NODE") @@ -1172,6 +1159,9 @@ cStmtMacroText PUSH_UPD_FRAME = SLIT("PUSH_UPD_FRAME") cStmtMacroText PUSH_SEQ_FRAME = SLIT("PUSH_SEQ_FRAME") cStmtMacroText UPDATE_SU_FROM_UPD_FRAME = SLIT("UPDATE_SU_FROM_UPD_FRAME") cStmtMacroText SET_TAG = SLIT("SET_TAG") +cStmtMacroText REGISTER_FOREIGN_EXPORT = SLIT("REGISTER_FOREIGN_EXPORT") +cStmtMacroText REGISTER_IMPORT = SLIT("REGISTER_IMPORT") +cStmtMacroText REGISTER_DIMPORT = SLIT("REGISTER_DIMPORT") cStmtMacroText GRAN_FETCH = SLIT("GRAN_FETCH") cStmtMacroText GRAN_RESCHEDULE = SLIT("GRAN_RESCHEDULE") cStmtMacroText GRAN_FETCH_AND_RESCHEDULE= SLIT("GRAN_FETCH_AND_RESCHEDULE") @@ -1206,9 +1196,9 @@ pp_liveness :: Liveness -> SDoc pp_liveness lv = case lv of LvLarge lbl -> char '&' <> pprCLabel lbl - LvSmall mask - | bitmap_int == (minBound :: Int) -> int (bitmap_int+1) <> text "-1" - | otherwise -> int bitmap_int + LvSmall mask -- Avoid gcc bug when printing minInt + | bitmap_int == minInt -> int (bitmap_int+1) <> text "-1" + | otherwise -> int bitmap_int where bitmap_int = intBS mask \end{code} @@ -1275,9 +1265,9 @@ pprMagicId BaseReg = ptext SLIT("BaseReg") pprMagicId (VanillaReg pk n) = hcat [ pprVanillaReg n, char '.', pprUnionTag pk ] -pprMagicId (FloatReg n) = (<>) (ptext SLIT("F")) (int IBOX(n)) -pprMagicId (DoubleReg n) = (<>) (ptext SLIT("D")) (int IBOX(n)) -pprMagicId (LongReg _ n) = (<>) (ptext SLIT("L")) (int IBOX(n)) +pprMagicId (FloatReg n) = ptext SLIT("F") <> int (I# n) +pprMagicId (DoubleReg n) = ptext SLIT("D") <> int (I# n) +pprMagicId (LongReg _ n) = ptext SLIT("L") <> int (I# n) pprMagicId Sp = ptext SLIT("Sp") pprMagicId Su = ptext SLIT("Su") pprMagicId SpLim = ptext SLIT("SpLim") @@ -1286,8 +1276,8 @@ pprMagicId HpLim = ptext SLIT("HpLim") pprMagicId CurCostCentre = ptext SLIT("CCCS") pprMagicId VoidReg = panic "pprMagicId:VoidReg!" -pprVanillaReg :: FAST_INT -> SDoc -pprVanillaReg n = (<>) (char 'R') (int IBOX(n)) +pprVanillaReg :: Int# -> SDoc +pprVanillaReg n = char 'R' <> int (I# n) pprUnionTag :: PrimRep -> SDoc @@ -1298,21 +1288,24 @@ pprUnionTag RetRep = char 'p' pprUnionTag CostCentreRep = panic "pprUnionTag:CostCentre?" pprUnionTag CharRep = char 'c' +pprUnionTag Int8Rep = ptext SLIT("i8") pprUnionTag IntRep = char 'i' pprUnionTag WordRep = char 'w' pprUnionTag AddrRep = char 'a' pprUnionTag FloatRep = char 'f' pprUnionTag DoubleRep = panic "pprUnionTag:Double?" -pprUnionTag StablePtrRep = char 'i' +pprUnionTag StablePtrRep = char 'p' pprUnionTag StableNameRep = char 'p' pprUnionTag WeakPtrRep = char 'p' pprUnionTag ForeignObjRep = char 'p' +pprUnionTag PrimPtrRep = char 'p' pprUnionTag ThreadIdRep = char 't' pprUnionTag ArrayRep = char 'p' pprUnionTag ByteArrayRep = char 'b' +pprUnionTag BCORep = char 'p' pprUnionTag _ = panic "pprUnionTag:Odd kind" \end{code} @@ -1517,7 +1510,7 @@ ppr_decls_AbsC (CClosureInfoAndCode cl_info slow maybe_fast _) Nothing -> mkErrorStdEntryLabel Just _ -> entryLabelFromCI cl_info -ppr_decls_AbsC (CSRT lbl closure_lbls) +ppr_decls_AbsC (CSRT _ closure_lbls) = mapTE labelSeenTE closure_lbls `thenTE` \ seen -> returnTE (Nothing, if and seen then Nothing @@ -1526,6 +1519,9 @@ ppr_decls_AbsC (CSRT lbl closure_lbls) ppr_decls_AbsC (CRetDirect _ code _ _) = ppr_decls_AbsC code ppr_decls_AbsC (CRetVector _ amodes _ _) = ppr_decls_Amodes amodes +ppr_decls_AbsC (CModuleInitBlock _ code) = ppr_decls_AbsC code + +ppr_decls_AbsC (_) = returnTE (Nothing, Nothing) \end{code} \begin{code} @@ -1536,14 +1532,12 @@ ppr_decls_Amode (CVal _ _) = returnTE (Nothing, Nothing) ppr_decls_Amode (CAddr _) = returnTE (Nothing, Nothing) ppr_decls_Amode (CReg _) = returnTE (Nothing, Nothing) ppr_decls_Amode (CLit _) = returnTE (Nothing, Nothing) -ppr_decls_Amode (CLitLit _ _) = returnTE (Nothing, Nothing) -- CIntLike must be a literal -- no decls ppr_decls_Amode (CIntLike int) = returnTE (Nothing, Nothing) --- CCharLike may have be arbitrary value -- may have decls -ppr_decls_Amode (CCharLike char) - = ppr_decls_Amode char +-- CCharLike too +ppr_decls_Amode (CCharLike char) = returnTE (Nothing, Nothing) -- now, the only place where we actually print temps/externs... ppr_decls_Amode (CTemp uniq kind) @@ -1623,7 +1617,7 @@ floatToWord (CLit (MachFloat r)) arr <- newFloatArray ((0::Int),0) writeFloatArray arr 0 (fromRational r) i <- readIntArray arr 0 - return (CLit (MachInt (toInteger i) True)) + return (CLit (MachInt (toInteger i))) ) doubleToWords :: CAddrMode -> [CAddrMode] @@ -1634,8 +1628,8 @@ doubleToWords (CLit (MachDouble r)) writeDoubleArray arr 0 (fromRational r) i1 <- readIntArray arr 0 i2 <- readIntArray arr 1 - return [ CLit (MachInt (toInteger i1) True) - , CLit (MachInt (toInteger i2) True) + return [ CLit (MachInt (toInteger i1)) + , CLit (MachInt (toInteger i2)) ] ) | otherwise -- doubles are 1 word @@ -1643,6 +1637,6 @@ doubleToWords (CLit (MachDouble r)) arr <- newDoubleArray ((0::Int),0) writeDoubleArray arr 0 (fromRational r) i <- readIntArray arr 0 - return [ CLit (MachInt (toInteger i) True) ] + return [ CLit (MachInt (toInteger i)) ] ) \end{code}