Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for function pointer types from DWARF #309

Merged
merged 1 commit into from
May 22, 2024
Merged

add support for function pointer types from DWARF #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/macaw
Open in desktop
Submodule macaw updated 7 files
+4 −4 .github/workflows/ci.yaml
+1 −1 .gitmodules
+3 −0 base/ChangeLog.md
+3 −3 base/src/Data/Macaw/Dwarf.hs
+16 −2 base/src/Data/Macaw/Memory/ElfLoader.hs
+2 −0 base/src/Data/Macaw/Types.hs
+5 −2 refinement/src/Data/Macaw/Refinement/Path.hs
32 changes: 29 additions & 3 deletions src/Reopt/TypeInference/DebugTypes.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Control.Monad.Except (
MonadError (throwError),
runExceptT,
)
import Control.Monad.Extra (forM)
import Control.Monad.Trans (
MonadTrans (lift),
)
Expand Down Expand Up @@ -68,6 +69,7 @@ import Reopt.TypeInference.HeaderTypes (
AnnType (
DoubleAnnType,
FloatAnnType,
FunPtrAnnType,
IAnnType,
PtrAnnType,
VoidAnnType
Expand Down Expand Up @@ -118,7 +120,16 @@ resolveDwarfType ::
ExceptT ArgResolverError (IncCompM (ReoptLogEvent w) r) AnnType
resolveDwarfType typeMap ref = do
tp <- resolveDwarfTypeRef typeMap ref
case tp of
resolveDwarfTypeApp typeMap ref tp

resolveDwarfTypeApp ::
Map Dwarf.TypeRef Dwarf.AbsType ->
-- | Still needed for reporting errors
Dwarf.TypeRef ->
Dwarf.TypeApp ->
ExceptT ArgResolverError (IncCompM (ReoptLogEvent w) r) AnnType
resolveDwarfTypeApp typeMap ref tApp =
case tApp of
Dwarf.BoolType -> do
pure $! IAnnType 1
Dwarf.UnsignedIntType byteCount -> do
Expand All @@ -137,9 +148,24 @@ resolveDwarfType typeMap ref = do
pure $! IAnnType 8
Dwarf.ArrayType _ _ -> do
throwDwarfTypeError ref "Array arguments are not supported."
Dwarf.PointerType _ _ -> do
-- We just use void pointers for now.
Dwarf.PointerType _ Nothing -> do
pure $ PtrAnnType VoidAnnType
Dwarf.PointerType _ (Just tr) -> do
dty <- resolveDwarfTypeRef typeMap tr
-- Here we distinguish function pointers from other "regular" pointers
case dty of
Dwarf.SubroutineTypeF std -> do
args <- forM (Dwarf.fntypeFormals std) $ \ var -> do
case Dwarf.varType var of
Nothing -> throwDwarfTypeError ref "void in argument position is not supported."
Just tr' -> resolveDwarfType typeMap tr'
ret <- case Dwarf.fntypeType std of
Nothing -> pure VoidAnnType
Just retTypeRef -> resolveDwarfType typeMap retTypeRef
pure $ FunPtrAnnType ret args
_ -> do
ty <- resolveDwarfTypeApp typeMap tr dty
pure $ PtrAnnType ty
Dwarf.StructType _ -> do
throwDwarfTypeError ref "Struct arguments are not supported."
Dwarf.UnionType _ -> do
Expand Down
Loading