Merge pull request #350 from GaloisInc/macaw-ppc-pic-ip-addresses

`macaw-ppc`: Don't assume absolute IP addresses when decoding
GaloisInc · Nov 14, 2023 · 2e49eb5 · 2e49eb5
2 parents 0c6872a + ca64b56
commit 2e49eb5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/macaw-aarch32/src/Data/Macaw/ARM/Disassemble.hs b/macaw-aarch32/src/Data/Macaw/ARM/Disassemble.hs
@@ -331,7 +331,6 @@ data TranslationError w = TranslationError { transErrorAddr :: MM.MemSegmentOff
 data TranslationErrorReason w = InvalidNextPC (MM.MemAddr w) (MM.MemAddr w)
                               | DecodeError (ARMMemoryError w)
                               | UnsupportedInstruction InstructionSet
-                              | InstructionAtUnmappedAddr InstructionSet
                               | GenerationError InstructionSet SG.GeneratorError
                               deriving (Show)
 

diff --git a/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs b/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
@@ -34,6 +35,7 @@ import qualified Data.Macaw.Memory as MM
 import qualified Data.Macaw.Memory.Permissions as MMP
 import           Data.Macaw.Types ( BVType )
 import qualified Data.Parameterized.Map as MapF
+import qualified Data.Parameterized.NatRepr as PN
 import qualified Data.Parameterized.Nonce as NC
 
 import qualified SemMC.Architecture.PPC as SP
@@ -127,9 +129,9 @@ disassembleBlock lookupSemantics gs curIPAddr blockOff maxOffset = do
       -- Note: In PowerPC, the IP is incremented *after* an instruction
       -- executes, rather than before as in X86.  We have to pass in the
       -- physical address of the instruction here.
-      ipVal <- case MM.asAbsoluteAddr (MM.segoffAddr curIPAddr) of
-                 Nothing -> failAt gs blockOff curIPAddr (InstructionAtUnmappedAddr i)
-                 Just addr -> return (BVValue (SP.addrWidth SP.knownVariant) (fromIntegral addr))
+      let ipVal = MC.BVValue
+                    (PN.knownNat @(ArchAddrWidth ppc))
+                    (fromIntegral (MM.addrOffset (MM.segoffAddr curIPAddr)))
       case lookupSemantics ipVal i of
         Nothing -> failAt gs blockOff curIPAddr (UnsupportedInstruction i)
         Just transformer -> do
@@ -250,7 +252,6 @@ data TranslationError w = TranslationError { transErrorAddr :: MM.MemSegmentOff
 data TranslationErrorReason w = InvalidNextIP Word64 Word64
                               | DecodeError (PPCMemoryError w)
                               | UnsupportedInstruction D.Instruction
-                              | InstructionAtUnmappedAddr D.Instruction
                               | GenerationError D.Instruction GeneratorError
                               deriving (Show)