GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-11-23 08:27:24 +03:00
Code Issues Projects Releases Wiki Activity

Remove the BinaryAddrWidth type family

Browse Source
This commit is contained in:
Tristan Ravitch 2018-10-30 10:34:43 -07:00
parent d464403a25
commit ebcbbe6c5c
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
macaw-ppc/src/Data/Macaw/PPC.hs
View File

@ -67,8 +67,7 @@ archDemandContext _ =
, MDS.archFnHasSideEffects = ppcPrimFnHasSideEffects , MDS.archFnHasSideEffects = ppcPrimFnHasSideEffects
} }
ppc64_linux_info :: ( BL.BinaryAddrWidth binFmt ~ 64 ppc64_linux_info :: ( BL.ArchBinaryData PPC64.PPC binFmt ~ TOC.TOC 64
, BL.ArchBinaryData PPC64.PPC binFmt ~ TOC.TOC 64
) => ) =>
BL.LoadedBinary PPC64.PPC binFmt BL.LoadedBinary PPC64.PPC binFmt
-> MI.ArchitectureInfo PPC64.PPC -> MI.ArchitectureInfo PPC64.PPC
@ -92,8 +91,7 @@ ppc64_linux_info binData =
where where
proxy = Proxy @PPC64.PPC proxy = Proxy @PPC64.PPC
ppc32_linux_info :: ( BL.BinaryAddrWidth binFmt ~ 32 ppc32_linux_info :: ( BL.ArchBinaryData PPC32.PPC binFmt ~ TOC.TOC 32
, BL.ArchBinaryData PPC32.PPC binFmt ~ TOC.TOC 32
) => ) =>
BL.LoadedBinary PPC32.PPC binFmt BL.LoadedBinary PPC32.PPC binFmt
-> MI.ArchitectureInfo PPC32.PPC -> MI.ArchitectureInfo PPC32.PPC

1
macaw-ppc/src/Data/Macaw/PPC/Eval.hs
View File

@ -79,7 +79,6 @@ postPPCTermStmtAbsState preservePred mem s0 regState stmt =
-- One value that is definitely set is the link register, which holds the -- One value that is definitely set is the link register, which holds the
-- abstract return value. -- abstract return value.
mkInitialAbsState :: ( PPCArchConstraints ppc, Typeable ppc mkInitialAbsState :: ( PPCArchConstraints ppc, Typeable ppc
, BL.BinaryAddrWidth binFmt ~ RegAddrWidth (PPCReg ppc)
, BL.ArchBinaryData ppc binFmt ~ TOC.TOC (ArchAddrWidth ppc) , BL.ArchBinaryData ppc binFmt ~ TOC.TOC (ArchAddrWidth ppc)
) => ) =>
proxy ppc proxy ppc

2
submodules/macaw-loader

@ -1 +1 @@
Subproject commit ceddaa4242c53108e8517e3d6a6d2dcee777309d Subproject commit 3bcd172a943dfe9a92bc0794cd72e894e4bf7898