diff --git a/macaw-ppc/src/Data/Macaw/PPC.hs b/macaw-ppc/src/Data/Macaw/PPC.hs index 4ec9ed88..cc8e4fc8 100644 --- a/macaw-ppc/src/Data/Macaw/PPC.hs +++ b/macaw-ppc/src/Data/Macaw/PPC.hs @@ -67,8 +67,7 @@ archDemandContext _ = , MDS.archFnHasSideEffects = ppcPrimFnHasSideEffects } -ppc64_linux_info :: ( BL.BinaryAddrWidth binFmt ~ 64 - , BL.ArchBinaryData PPC64.PPC binFmt ~ TOC.TOC 64 +ppc64_linux_info :: ( BL.ArchBinaryData PPC64.PPC binFmt ~ TOC.TOC 64 ) => BL.LoadedBinary PPC64.PPC binFmt -> MI.ArchitectureInfo PPC64.PPC @@ -92,8 +91,7 @@ ppc64_linux_info binData = where proxy = Proxy @PPC64.PPC -ppc32_linux_info :: ( BL.BinaryAddrWidth binFmt ~ 32 - , BL.ArchBinaryData PPC32.PPC binFmt ~ TOC.TOC 32 +ppc32_linux_info :: ( BL.ArchBinaryData PPC32.PPC binFmt ~ TOC.TOC 32 ) => BL.LoadedBinary PPC32.PPC binFmt -> MI.ArchitectureInfo PPC32.PPC diff --git a/macaw-ppc/src/Data/Macaw/PPC/Eval.hs b/macaw-ppc/src/Data/Macaw/PPC/Eval.hs index e8101fe9..06fda38b 100644 --- a/macaw-ppc/src/Data/Macaw/PPC/Eval.hs +++ b/macaw-ppc/src/Data/Macaw/PPC/Eval.hs @@ -79,7 +79,6 @@ postPPCTermStmtAbsState preservePred mem s0 regState stmt = -- One value that is definitely set is the link register, which holds the -- abstract return value. mkInitialAbsState :: ( PPCArchConstraints ppc, Typeable ppc - , BL.BinaryAddrWidth binFmt ~ RegAddrWidth (PPCReg ppc) , BL.ArchBinaryData ppc binFmt ~ TOC.TOC (ArchAddrWidth ppc) ) => proxy ppc diff --git a/submodules/macaw-loader b/submodules/macaw-loader index ceddaa42..3bcd172a 160000 --- a/submodules/macaw-loader +++ b/submodules/macaw-loader @@ -1 +1 @@ -Subproject commit ceddaa4242c53108e8517e3d6a6d2dcee777309d +Subproject commit 3bcd172a943dfe9a92bc0794cd72e894e4bf7898