GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-12-18 03:21:49 +03:00
Code Issues Projects Releases Wiki Activity

Use defined functions to generate TH for ARM

Browse Source
This commit is contained in:
Luke Maurer 2018-06-26 11:04:29 -07:00
parent fbdae275cb
commit d3c40eb308
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
macaw-arm/src/Data/Macaw/ARM/Semantics/ARMSemantics.hs
View File

@ -21,7 +21,7 @@ import qualified Data.Macaw.Types as MT
import Data.Proxy ( Proxy(..) )
import Dismantle.ARM -- must be present to supply definitions for genExecInstruction output
import qualified SemMC.Architecture.AArch32 as ARMSem
import SemMC.Architecture.ARM.Opcodes ( allA32Semantics, allA32OpcodeInfo )
import SemMC.Architecture.ARM.Opcodes ( allA32Semantics, allA32OpcodeInfo, a32DefinedFunctions )
execInstruction :: MC.Value ARMSem.AArch32 ids (MT.BVType 32)
@ -34,5 +34,6 @@ execInstruction = $(genExecInstructionLogStdErr (Proxy @ARMSem.AArch32)
'a32InstructionMatcher
allA32Semantics
allA32OpcodeInfo
a32DefinedFunctions
([t| Dismantle.ARM.Operand |], [t| ARMSem.AArch32 |])
)

2
macaw-arm/src/Data/Macaw/ARM/Semantics/TH.hs
View File

@ -62,7 +62,7 @@ armNonceAppEval bvi nonceApp =
S.FnApp symFn args ->
let nm = symFnName symFn
in case nm of
"arm_is_r15" -> return $
"uf_arm_is_r15" -> return $
-- This requires special handling because this can
-- be checking actual GPR locations or the results
-- of an expression extracting a register number

3
macaw-arm/src/Data/Macaw/ARM/Semantics/ThumbSemantics.hs
View File

@ -21,7 +21,7 @@ import qualified Data.Macaw.Types as MT
import Data.Proxy ( Proxy(..) )
import Dismantle.Thumb -- as ThumbDis -- must be present to supply definitions for genExecInstruction output
import qualified SemMC.Architecture.AArch32 as ARMSem
import SemMC.Architecture.ARM.Opcodes ( allT32Semantics, allT32OpcodeInfo )
import SemMC.Architecture.ARM.Opcodes ( allT32Semantics, allT32OpcodeInfo, t32DefinedFunctions )
execInstruction :: MC.Value ARMSem.AArch32 ids (MT.BVType 32)
@ -34,5 +34,6 @@ execInstruction = $(genExecInstructionLogStdErr (Proxy @ARMSem.AArch32)
't32InstructionMatcher
allT32Semantics
allT32OpcodeInfo
t32DefinedFunctions
([t| Dismantle.Thumb.Operand |], [t| ARMSem.AArch32 |])
)