From ca64b568082b44e658b11212c18d8d990fb4cc31 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Tue, 14 Nov 2023 13:03:50 -0500 Subject: [PATCH] macaw-{aarch32,ppc}: Remove vestigial InstructionAtUnmappedAddr error types Now that `macaw-aarch32` and `macaw-ppc` properly handle position-independent code, the `InstructionAtUnmappedAddr` error (which could only be thrown if an IP address was found in position-independent code) is never thrown. Let's delete it. --- macaw-aarch32/src/Data/Macaw/ARM/Disassemble.hs | 1 - macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs | 1 - 2 files changed, 2 deletions(-) diff --git a/macaw-aarch32/src/Data/Macaw/ARM/Disassemble.hs b/macaw-aarch32/src/Data/Macaw/ARM/Disassemble.hs index f760da5e..25890eca 100644 --- 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 index ecddd14d..d0da8a76 100644 --- a/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs +++ b/macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs @@ -252,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)