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

[arm] Update for change in export of numGPR from semmc-ppc.

Browse Source
This commit is contained in:
Kevin Quick 2018-03-10 10:03:01 -08:00
parent 86defa921b
commit 1bceb8dc32
No known key found for this signature in database
GPG Key ID: E6D7733599CC0A21
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
macaw-arm/src/Data/Macaw/ARM/ARMReg.hs
View File

@ -35,7 +35,6 @@ import GHC.TypeLits
import Language.Haskell.TH
import Language.Haskell.TH.Syntax ( lift )
import qualified SemMC.ARM as ARM
import SemMC.Architecture.ARM.BaseSemantics ( numGPR )
import qualified SemMC.Architecture.ARM.Location as Loc
import qualified Text.PrettyPrint.HughesPJClass as PP
@ -107,7 +106,7 @@ instance ( 1 <= MC.RegAddrWidth ARMReg
syscallArgumentRegs = error "MC.RegisterInfo ARMReg syscallArgumentsRegs undefined"
armRegs :: forall w. (w ~ MC.RegAddrWidth ARMReg, 1 <= w) => [Some ARMReg]
armRegs = [ Some (ARM_GP n) | n <- [0..numGPR-1] ] <>
armRegs = [ Some (ARM_GP n) | n <- [0..ARM.numGPR-1] ] <>
[ Some ARM_PC
, Some ARM_CPSR
]
@ -123,7 +122,7 @@ linuxSystemCallPreservedRegisters :: (w ~ MC.RegAddrWidth ARMReg, 1 <= w)
=> proxy arm
-> Set.Set (Some ARMReg)
linuxSystemCallPreservedRegisters _ =
Set.fromList [ Some (ARM_GP rnum) | rnum <- [8..numGPR-1] ]
Set.fromList [ Some (ARM_GP rnum) | rnum <- [8..ARM.numGPR-1] ]
-- Currently, we are only considering the non-volatile GPRs. There
-- are also a set of non-volatile floating point registers. I have
-- to check on the vector registers.