Add thisAdjustment and DIEnumerator

Ptival · Feb 21, 2017 · 9ff4eb4 · 9ff4eb4
1 parent 40f85fc
commit 9ff4eb4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/llvm-pretty.cabal b/llvm-pretty.cabal
@@ -1,5 +1,5 @@
 Name:                llvm-pretty
-Version:             0.5.0.0
+Version:             0.6.0.0
 License:             BSD3
 License-file:        LICENSE
 Author:              Trevor Elliott

diff --git a/src/Text/LLVM/AST.hs b/src/Text/LLVM/AST.hs
@@ -936,6 +936,7 @@ data DebugInfo' lab
   | DebugInfoCompileUnit (DICompileUnit' lab)
   | DebugInfoCompositeType (DICompositeType' lab)
   | DebugInfoDerivedType (DIDerivedType' lab)
+  | DebugInfoEnumerator String !Int64
   | DebugInfoExpression DIExpression
   | DebugInfoFile DIFile
   | DebugInfoGlobalVariable (DIGlobalVariable' lab)
@@ -1100,6 +1101,7 @@ data DISubprogram' lab = DISubprogram
   , dispContainingType :: Maybe (ValMd' lab)
   , dispVirtuality     :: DwarfVirtuality
   , dispVirtualIndex   :: Word32
+  , dispThisAdjustment :: Int64
   , dispFlags          :: DIFlags
   , dispIsOptimized    :: Bool
   , dispTemplateParams :: Maybe (ValMd' lab)

diff --git a/src/Text/LLVM/PP.hs b/src/Text/LLVM/PP.hs
@@ -24,6 +24,7 @@ import qualified Data.Map as Map
 import Data.Maybe (catMaybes,fromMaybe)
 import Numeric (showHex)
 import Text.PrettyPrint.HughesPJ
+import Data.Int
 
 
 -- Pretty-printer Config -------------------------------------------------------
@@ -638,6 +639,7 @@ ppDebugInfo di = case di of
   DebugInfoCompileUnit cu       -> ppDICompileUnit cu
   DebugInfoCompositeType ct     -> ppDICompositeType ct
   DebugInfoDerivedType dt       -> ppDIDerivedType dt
+  DebugInfoEnumerator nm v      -> ppDIEnumerator nm v
   DebugInfoExpression e         -> ppDIExpression e
   DebugInfoFile f               -> ppDIFile f
   DebugInfoGlobalVariable gv    -> ppDIGlobalVariable gv
@@ -714,6 +716,12 @@ ppDIDerivedType dt = "!DIDerivedType"
        ,     (("extraData:" <+>) . ppValMd) <$> (didtExtraData dt)
        ])
 
+ppDIEnumerator :: String -> Int64 -> Doc
+ppDIEnumerator n v = "!DIEnumerator"
+  <> parens (commas [ "name:"  <+> doubleQuotes (text n)
+                    , "value:" <+> integral v
+                    ])
+
 ppDIExpression :: DIExpression -> Doc
 ppDIExpression e = "!DIExpression"
   <> parens (commas (map integral (dieElements e)))