Const structs

src/ASTShow.hs

@@ -33,7 +33,7 @@ instance Show Module where
            bracketList "(" ", " ")" (show <$> modParams mod) ++
            (if typeMods == defaultTypeModifiers
                then ""
-               else "\n modifiers       : " ++ (show $ typeModifiers int)) ++
+               else "\n modifiers       : " ++ show (typeModifiers int)) ++
            "\n  representation  : " ++
            (if modIsType mod
             then maybe "(not yet known)" show (modTypeRep mod)
@@ -46,6 +46,9 @@ instance Show Module where
            intercalate "\n                    "
            (List.map show $ Set.toList $ Set.unions $
             List.map Map.keysSet $ Map.elems $ pubProcs int) ++
+           "\n  constants       : "
+           ++ showMap "" "\n                    " ""
+                    ((++":: ") . show) show (modStructs mod) ++ 
            if isNothing maybeimpl then "\n  implementation not available"
            else let impl = fromJust maybeimpl
                 in
@@ -65,8 +68,7 @@ instance Show Module where
                        (modSubmods impl)) ++
                  "\n  procs           : " ++ "\n" ++
                  showMap "" "\n\n" "" (const "") (showProcDefs 0)
-                  (modProcs impl) ++
-                  ""
+                  (modProcs impl)
 
 
 -- |How to show a map, one line per item.

src/AliasAnalysis.hs

@@ -37,10 +37,13 @@ import           Config        (specialName2)
 -- something outside the procedure scope ("AliasByParam" / "MaybeAliasByParam").
 -- "AliasByParam" and "MaybeAliasByParam" won't be removed during the analysis,
 -- but if the existence of a "MaybeAliasByParam" can change the outcome then we
--- consider the corresponding parameter as interesting.
+-- consider the corresponding parameter as interesting.  For variables aliased
+-- to globals (resource values), we use "AliasByGlobal". For variables aliased
+-- to global constant structures, we use "AliasByConst". 
 data AliasMapLocalItem
     = LiveVar           PrimVarName
     | AliasByGlobal     GlobalInfo
+    | AliasByConst
     | AliasByParam      PrimVarName
     | MaybeAliasByParam PrimVarName
     deriving (Eq, Ord, Show)
@@ -273,7 +276,7 @@ updateAliasedByPrim aliasMap prim =
             let ProcDefPrim _ calleeProto _ analysis _ = procImpln calleeDef
             let calleeParamAliases = procArgAliasMap analysis
             logAlias $ "--- call          " ++ show spec ++" (callee): "
-            logAlias $ "" ++ show calleeProto
+                        ++ show calleeProto
             logAlias $ "PrimCall args:    " ++ show args
             let paramArgMap = mapParamToArgVar calleeProto args
             -- calleeArgsAliasMap is the alias map of actual arguments passed
@@ -342,6 +345,7 @@ _maybeAliasPrimArgs args = do
         case arg of
         ArgVar{argVarName=var, argVarType=ty} -> maybeAddressAlias arg ty $ LiveVar var
         ArgGlobal global ty -> maybeAddressAlias arg ty $ AliasByGlobal global
+        ArgConstRef global ty -> maybeAddressAlias arg ty AliasByConst
         _ -> return Nothing
     maybeAddressAlias arg ty item = do
         rep <- lookupTypeRepresentation ty

src/BinaryFactory.hs

@@ -43,6 +43,8 @@ instance Binary ProcFunctor
 instance Binary ParamInfo
 instance Binary Prim
 instance Binary PrimVarName
+instance Binary ConstValue
+instance Binary StructInfo
 instance Binary PrimArg
 instance Binary ProcAnalysis
 instance Binary GlobalFlows
@@ -72,6 +74,7 @@ instance Binary Module
 instance Binary PubProcInfo
 instance Binary ModuleInterface
 instance Binary Pragma
+instance Binary StructID
 
 instance Binary ProcModifiers
 instance Binary Inlining