packages feed

llvm-pretty 0.6.0.0 → 0.7.0.0

raw patch · 5 files changed

+135/−34 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

- Text.LLVM.AST: FunAttrs :: Maybe Linkage -> Maybe GC -> FunAttrs
- Text.LLVM.AST: [funGC] :: FunAttrs -> Maybe GC
- Text.LLVM.AST: [funLinkage] :: FunAttrs -> Maybe Linkage
- Text.LLVM.AST: data FunAttrs
- Text.LLVM.AST: emptyFunAttrs :: FunAttrs
- Text.LLVM.AST: instance GHC.Show.Show Text.LLVM.AST.FunAttrs
+ Text.LLVM: FunAttrs :: Maybe Linkage -> Maybe GC -> FunAttrs
+ Text.LLVM: [funGC] :: FunAttrs -> Maybe GC
+ Text.LLVM: [funLinkage] :: FunAttrs -> Maybe Linkage
+ Text.LLVM: data FunAttrs
+ Text.LLVM: emptyFunAttrs :: FunAttrs
+ Text.LLVM: instance GHC.Show.Show Text.LLVM.FunAttrs
+ Text.LLVM.AST: AlignStack :: Int -> FunAttr
+ Text.LLVM.AST: Alwaysinline :: FunAttr
+ Text.LLVM.AST: Builtin :: FunAttr
+ Text.LLVM.AST: Cold :: FunAttr
+ Text.LLVM.AST: DIGlobalVariableExpression :: Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> DIGlobalVariableExpression' lab
+ Text.LLVM.AST: DebugInfoGlobalVariableExpression :: (DIGlobalVariableExpression' lab) -> DebugInfo' lab
+ Text.LLVM.AST: Inlinehint :: FunAttr
+ Text.LLVM.AST: Jumptable :: FunAttr
+ Text.LLVM.AST: Minsize :: FunAttr
+ Text.LLVM.AST: Naked :: FunAttr
+ Text.LLVM.AST: Nobuiltin :: FunAttr
+ Text.LLVM.AST: Noduplicate :: FunAttr
+ Text.LLVM.AST: Noimplicitfloat :: FunAttr
+ Text.LLVM.AST: Noinline :: FunAttr
+ Text.LLVM.AST: Nonlazybind :: FunAttr
+ Text.LLVM.AST: Noredzone :: FunAttr
+ Text.LLVM.AST: Noreturn :: FunAttr
+ Text.LLVM.AST: Nounwind :: FunAttr
+ Text.LLVM.AST: Optnone :: FunAttr
+ Text.LLVM.AST: Optsize :: FunAttr
+ Text.LLVM.AST: Readnone :: FunAttr
+ Text.LLVM.AST: Readonly :: FunAttr
+ Text.LLVM.AST: ReturnsTwice :: FunAttr
+ Text.LLVM.AST: SSP :: FunAttr
+ Text.LLVM.AST: SSPreq :: FunAttr
+ Text.LLVM.AST: SSPstrong :: FunAttr
+ Text.LLVM.AST: SanitizeAddress :: FunAttr
+ Text.LLVM.AST: SanitizeMemory :: FunAttr
+ Text.LLVM.AST: SanitizeThread :: FunAttr
+ Text.LLVM.AST: UWTable :: FunAttr
+ Text.LLVM.AST: [decAttrs] :: Declare -> [FunAttr]
+ Text.LLVM.AST: [defGC] :: Define -> Maybe GC
+ Text.LLVM.AST: [defLinkage] :: Define -> Maybe Linkage
+ Text.LLVM.AST: [dicuSplitDebugInlining] :: DICompileUnit' lab -> Bool
+ Text.LLVM.AST: [digvAlignment] :: DIGlobalVariable' lab -> Maybe Word32
+ Text.LLVM.AST: [digveExpression] :: DIGlobalVariableExpression' lab -> Maybe (ValMd' lab)
+ Text.LLVM.AST: [digveVariable] :: DIGlobalVariableExpression' lab -> Maybe (ValMd' lab)
+ Text.LLVM.AST: data DIGlobalVariableExpression' lab
+ Text.LLVM.AST: data FunAttr
+ Text.LLVM.AST: instance GHC.Base.Functor Text.LLVM.AST.DIGlobalVariableExpression'
+ Text.LLVM.AST: instance GHC.Generics.Generic (Text.LLVM.AST.DIGlobalVariableExpression' lab)
+ Text.LLVM.AST: instance GHC.Generics.Generic1 Text.LLVM.AST.DIGlobalVariableExpression'
+ Text.LLVM.AST: instance GHC.Show.Show Text.LLVM.AST.FunAttr
+ Text.LLVM.AST: instance GHC.Show.Show lab => GHC.Show.Show (Text.LLVM.AST.DIGlobalVariableExpression' lab)
+ Text.LLVM.AST: type DIGlobalVariableExpression = DIGlobalVariableExpression' BlockLabel
+ Text.LLVM.Labels: instance Text.LLVM.Labels.HasLabel Text.LLVM.AST.DIGlobalVariableExpression'
+ Text.LLVM.PP: ppDIGlobalVariableExpression :: DIGlobalVariableExpression -> Doc
+ Text.LLVM.PP: ppFunAttr :: FunAttr -> Doc
- Text.LLVM.AST: DICompileUnit :: DwarfLang -> Maybe (ValMd' lab) -> Maybe String -> Bool -> DIFlags -> Word16 -> Maybe FilePath -> DIEmissionKind -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Word64 -> DICompileUnit' lab
+ Text.LLVM.AST: DICompileUnit :: DwarfLang -> Maybe (ValMd' lab) -> Maybe String -> Bool -> DIFlags -> Word16 -> Maybe FilePath -> DIEmissionKind -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Word64 -> Bool -> DICompileUnit' lab
- Text.LLVM.AST: DIGlobalVariable :: Maybe (ValMd' lab) -> Maybe String -> Maybe String -> Maybe (ValMd' lab) -> Word32 -> Maybe (ValMd' lab) -> Bool -> Bool -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> DIGlobalVariable' lab
+ Text.LLVM.AST: DIGlobalVariable :: Maybe (ValMd' lab) -> Maybe String -> Maybe String -> Maybe (ValMd' lab) -> Word32 -> Maybe (ValMd' lab) -> Bool -> Bool -> Maybe (ValMd' lab) -> Maybe (ValMd' lab) -> Maybe Word32 -> DIGlobalVariable' lab
- Text.LLVM.AST: Declare :: Type -> Symbol -> [Type] -> Bool -> Declare
+ Text.LLVM.AST: Declare :: Type -> Symbol -> [Type] -> Bool -> [FunAttr] -> Declare
- Text.LLVM.AST: Define :: FunAttrs -> Type -> Symbol -> [Typed Ident] -> Bool -> Maybe String -> [BasicBlock] -> FnMdAttachments -> Define
+ Text.LLVM.AST: Define :: Maybe Linkage -> Type -> Symbol -> [Typed Ident] -> Bool -> [FunAttr] -> Maybe String -> Maybe GC -> [BasicBlock] -> FnMdAttachments -> Define
- Text.LLVM.AST: [defAttrs] :: Define -> FunAttrs
+ Text.LLVM.AST: [defAttrs] :: Define -> [FunAttr]

Files

llvm-pretty.cabal view
@@ -1,5 +1,5 @@ Name:                llvm-pretty-Version:             0.6.0.0+Version:             0.7.0.0 License:             BSD3 License-file:        LICENSE Author:              Trevor Elliott
src/Text/LLVM.hs view
@@ -31,7 +31,7 @@   , define'   , declare   , global-+  , FunAttrs(..), emptyFunAttrs     -- * Types   , iT, ptrT, voidT, arrayT   , (=:), (-:)@@ -192,6 +192,7 @@   , decName    = sym   , decArgs    = tys   , decVarArgs = va+  , decAttrs   = []   }  -- | Emit a global declaration.@@ -217,6 +218,18 @@  -- Function Definition --------------------------------------------------------- +data FunAttrs = FunAttrs+  { funLinkage :: Maybe Linkage+  , funGC      :: Maybe GC+  } deriving (Show)++emptyFunAttrs :: FunAttrs+emptyFunAttrs  = FunAttrs+  { funLinkage = Nothing+  , funGC      = Nothing+  }++ -- XXX Do not export freshArg :: Type -> LLVM (Typed Ident) freshArg ty = (Typed ty . Ident) `fmap` freshNameLLVM "a"@@ -257,13 +270,15 @@ define attrs rty fun sig k = do   (args,body) <- defineBody [] sig k   emitDefine Define-    { defAttrs    = attrs+    { defLinkage  = funLinkage attrs     , defName     = fun     , defRetType  = rty     , defArgs     = args     , defVarArgs  = False-    , defBody     = body+    , defAttrs    = []     , defSection  = Nothing+    , defGC       = funGC attrs+    , defBody     = body     , defMetadata = Map.empty     } @@ -282,13 +297,15 @@ define' attrs rty sym sig va k = do   args <- mapM freshArg sig   emitDefine Define-    { defAttrs    = attrs+    { defLinkage  = funLinkage attrs     , defName     = sym     , defRetType  = rty     , defArgs     = args     , defVarArgs  = va-    , defBody     = snd (runBB (k (map (fmap toValue) args)))+    , defAttrs    = []     , defSection  = Nothing+    , defGC       = funGC attrs+    , defBody     = snd (runBB (k (map (fmap toValue) args)))     , defMetadata = Map.empty     }
src/Text/LLVM/AST.hs view
@@ -389,6 +389,7 @@   , decName    :: Symbol   , decArgs    :: [Type]   , decVarArgs :: Bool+  , decAttrs   :: [FunAttr]   } deriving (Show)  -- | The function type of this declaration@@ -399,12 +400,14 @@ -- Function Definitions --------------------------------------------------------  data Define = Define-  { defAttrs    :: FunAttrs+  { defLinkage  :: Maybe Linkage   , defRetType  :: Type   , defName     :: Symbol   , defArgs     :: [Typed Ident]   , defVarArgs  :: Bool+  , defAttrs    :: [FunAttr]   , defSection  :: Maybe String+  , defGC       :: Maybe GC   , defBody     :: [BasicBlock]   , defMetadata :: FnMdAttachments   } deriving (Show)@@ -416,17 +419,40 @@ addDefine :: Define -> Module -> Module addDefine d m = m { modDefines = d : modDefines m } -data FunAttrs = FunAttrs-  { funLinkage :: Maybe Linkage-  , funGC      :: Maybe GC-  } deriving (Show)+-- Function Attributes and attribute groups ------------------------------------ -emptyFunAttrs :: FunAttrs-emptyFunAttrs  = FunAttrs-  { funLinkage = Nothing-  , funGC      = Nothing-  } +data FunAttr+   = AlignStack Int+   | Alwaysinline+   | Builtin+   | Cold+   | Inlinehint+   | Jumptable+   | Minsize+   | Naked+   | Nobuiltin+   | Noduplicate+   | Noimplicitfloat+   | Noinline+   | Nonlazybind+   | Noredzone+   | Noreturn+   | Nounwind+   | Optnone+   | Optsize+   | Readnone+   | Readonly+   | ReturnsTwice+   | SanitizeAddress+   | SanitizeMemory+   | SanitizeThread+   | SSP+   | SSPreq+   | SSPstrong+   | UWTable+  deriving (Show)+ -- Basic Block Labels ----------------------------------------------------------  data BlockLabel@@ -718,7 +744,7 @@   | ExtractValue (Typed (Value' lab)) [Int32]     {- ^ * Get the value of a member of an aggregate value:            the first argument is an aggregate value (not a pointer!),-           the second is a path of indexes, similar to the one in 'GEP'. +           the second is a path of indexes, similar to the one in 'GEP'.          * Middle of basic block.          * Returns the given member of the aggregate value. -} @@ -768,7 +794,7 @@   | IndirectBr (Typed (Value' lab)) [lab]    | Switch (Typed (Value' lab)) lab [(Integer,lab)]-    {- ^ * Multi-way branch: the first value determines the direction +    {- ^ * Multi-way branch: the first value determines the direction            of the branch, the label is a default direction, if the value            does not appear in the jump table, the last argument is the            jump table.@@ -940,6 +966,7 @@   | DebugInfoExpression DIExpression   | DebugInfoFile DIFile   | DebugInfoGlobalVariable (DIGlobalVariable' lab)+  | DebugInfoGlobalVariableExpression (DIGlobalVariableExpression' lab)   | DebugInfoLexicalBlock (DILexicalBlock' lab)   | DebugInfoLexicalBlockFile (DILexicalBlockFile' lab)   | DebugInfoLocalVariable (DILocalVariable' lab)@@ -987,6 +1014,7 @@   , dicuImports            :: Maybe (ValMd' lab)   , dicuMacros             :: Maybe (ValMd' lab)   , dicuDWOId              :: Word64+  , dicuSplitDebugInlining :: Bool   }   deriving (Show,Functor,Generic,Generic1) @@ -1051,10 +1079,19 @@   , digvIsDefinition         :: Bool   , digvVariable             :: Maybe (ValMd' lab)   , digvDeclaration          :: Maybe (ValMd' lab)+  , digvAlignment            :: Maybe Word32   }   deriving (Show,Functor,Generic,Generic1)  type DIGlobalVariable = DIGlobalVariable' BlockLabel++data DIGlobalVariableExpression' lab = DIGlobalVariableExpression+  { digveVariable   :: Maybe (ValMd' lab)+  , digveExpression :: Maybe (ValMd' lab)+  }+  deriving (Show,Functor,Generic,Generic1)++type DIGlobalVariableExpression = DIGlobalVariableExpression' BlockLabel  data DILexicalBlock' lab = DILexicalBlock   { dilbScope  :: Maybe (ValMd' lab)
src/Text/LLVM/Labels.hs view
@@ -148,20 +148,21 @@    relabel f (Resume tv)           = Resume <$> traverse (relabel f) tv -instance HasLabel Clause'             where relabel = genericRelabel-instance HasLabel Value'              where relabel = genericRelabel-instance HasLabel ValMd'              where relabel = genericRelabel-instance HasLabel DebugLoc'           where relabel = genericRelabel-instance HasLabel DebugInfo'          where relabel = genericRelabel-instance HasLabel DIDerivedType'      where relabel = genericRelabel-instance HasLabel DISubroutineType'   where relabel = genericRelabel-instance HasLabel DIGlobalVariable'   where relabel = genericRelabel-instance HasLabel DILocalVariable'    where relabel = genericRelabel-instance HasLabel DISubprogram'       where relabel = genericRelabel-instance HasLabel DICompositeType'    where relabel = genericRelabel-instance HasLabel DILexicalBlock'     where relabel = genericRelabel-instance HasLabel DICompileUnit'      where relabel = genericRelabel-instance HasLabel DILexicalBlockFile' where relabel = genericRelabel+instance HasLabel Clause'                     where relabel = genericRelabel+instance HasLabel Value'                      where relabel = genericRelabel+instance HasLabel ValMd'                      where relabel = genericRelabel+instance HasLabel DebugLoc'                   where relabel = genericRelabel+instance HasLabel DebugInfo'                  where relabel = genericRelabel+instance HasLabel DIDerivedType'              where relabel = genericRelabel+instance HasLabel DISubroutineType'           where relabel = genericRelabel+instance HasLabel DIGlobalVariable'           where relabel = genericRelabel+instance HasLabel DIGlobalVariableExpression' where relabel = genericRelabel+instance HasLabel DILocalVariable'            where relabel = genericRelabel+instance HasLabel DISubprogram'               where relabel = genericRelabel+instance HasLabel DICompositeType'            where relabel = genericRelabel+instance HasLabel DILexicalBlock'             where relabel = genericRelabel+instance HasLabel DICompileUnit'              where relabel = genericRelabel+instance HasLabel DILexicalBlockFile'         where relabel = genericRelabel  -- | Clever instance that actually uses the block name instance HasLabel ConstExpr' where
src/Text/LLVM/PP.hs view
@@ -222,16 +222,19 @@           <+> ppType (decRetType d)           <+> ppSymbol (decName d)            <> ppArgList (decVarArgs d) (map ppType (decArgs d))+          <+> hsep (ppFunAttr <$> decAttrs d)  + ppDefine :: LLVM => Define -> Doc ppDefine d = "define"-         <+> ppMaybe ppLinkage (funLinkage (defAttrs d))+         <+> ppMaybe ppLinkage (defLinkage d)          <+> ppType (defRetType d)          <+> ppSymbol (defName d)           <> ppArgList (defVarArgs d) (map (ppTyped ppIdent) (defArgs d))+         <+> hsep (ppFunAttr <$> defAttrs d)          <+> ppMaybe (\s  -> "section" <+> doubleQuotes (text s)) (defSection d)-         <+> ppMaybe (\gc -> "gc" <+> ppGC gc) (funGC (defAttrs d))+         <+> ppMaybe (\gc -> "gc" <+> ppGC gc) (defGC d)          <+> ppMds (defMetadata d)          <+> char '{'          $+$ vcat (map ppBasicBlock (defBody d))@@ -242,6 +245,40 @@       [] -> empty       mds -> hsep [ "!" <> text k <+> ppValMd md | (k, md) <- mds ] +-- FunAttr ---------------------------------------------------------------------++ppFunAttr :: FunAttr -> Doc+ppFunAttr a =+  case a of+    AlignStack w    -> text "alignstack" <> parens (int w)+    Alwaysinline    -> text "alwaysinline"+    Builtin         -> text "builtin"+    Cold            -> text "cold"+    Inlinehint      -> text "inlinehint"+    Jumptable       -> text "jumptable"+    Minsize         -> text "minsize"+    Naked           -> text "naked"+    Nobuiltin       -> text "nobuiltin"+    Noduplicate     -> text "noduplicate"+    Noimplicitfloat -> text "noimplicitfloat"+    Noinline        -> text "noinline"+    Nonlazybind     -> text "nonlazybind"+    Noredzone       -> text "noredzone"+    Noreturn        -> text "noreturn"+    Nounwind        -> text "nounwind"+    Optnone         -> text "optnone"+    Optsize         -> text "optsize"+    Readnone        -> text "readnone"+    Readonly        -> text "readonly"+    ReturnsTwice    -> text "returns_twice"+    SanitizeAddress -> text "sanitize_address"+    SanitizeMemory  -> text "sanitize_memory"+    SanitizeThread  -> text "sanitize_thread"+    SSP             -> text "ssp"+    SSPreq          -> text "sspreq"+    SSPstrong       -> text "sspstrong"+    UWTable         -> text "uwtable"+ -- Basic Blocks ----------------------------------------------------------------  ppLabelDef :: BlockLabel -> Doc@@ -643,6 +680,7 @@   DebugInfoExpression e         -> ppDIExpression e   DebugInfoFile f               -> ppDIFile f   DebugInfoGlobalVariable gv    -> ppDIGlobalVariable gv+  DebugInfoGlobalVariableExpression gv -> ppDIGlobalVariableExpression gv   DebugInfoLexicalBlock lb      -> ppDILexicalBlock lb   DebugInfoLexicalBlockFile lbf -> ppDILexicalBlockFile lbf   DebugInfoLocalVariable lv     -> ppDILocalVariable lv@@ -746,6 +784,14 @@        , pure ("isDefinition:" <+> ppBool (digvIsDefinition gv))        ,      (("variable:"    <+>) . ppValMd) <$> (digvType gv)        ,      (("declaration:" <+>) . ppValMd) <$> (digvDeclaration gv)+       ,      (("align:"       <+>) . integral) <$> digvAlignment gv+       ])++ppDIGlobalVariableExpression :: DIGlobalVariableExpression -> Doc+ppDIGlobalVariableExpression gve = "!DIGlobalVariableExpression"+  <> parens (mcommas+       [      (("var:"  <+>) . ppValMd) <$> (digveVariable gve)+       ,      (("expr:" <+>) . ppValMd) <$> (digveExpression gve)        ])  ppDILexicalBlock :: DILexicalBlock -> Doc