aarch64 aspec/haskell: sync attribs_from_word
Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>
This commit is contained in:
parent
29518b9bb0
commit
89815424cf
|
@ -61,9 +61,8 @@ definition arch_decode_irq_control_invocation ::
|
||||||
else throwError TruncatedMessage
|
else throwError TruncatedMessage
|
||||||
else throwError IllegalOperation)"
|
else throwError IllegalOperation)"
|
||||||
|
|
||||||
definition attribs_from_word :: "machine_word \<Rightarrow> vm_attributes"
|
definition attribs_from_word :: "machine_word \<Rightarrow> vm_attributes" where
|
||||||
where
|
"attribs_from_word w \<equiv> {attr. \<not>w!!0 \<and> attr = Execute \<or> \<not>w !! 2 \<and> attr = Device}"
|
||||||
"attribs_from_word w \<equiv> if \<not> w!!0 then {Execute} else {}"
|
|
||||||
|
|
||||||
(* FIXME AARCH64: only half updated *)
|
(* FIXME AARCH64: only half updated *)
|
||||||
definition make_user_pte :: "paddr \<Rightarrow> vm_attributes \<Rightarrow> vm_rights \<Rightarrow> pte" where
|
definition make_user_pte :: "paddr \<Rightarrow> vm_attributes \<Rightarrow> vm_rights \<Rightarrow> pte" where
|
||||||
|
|
|
@ -511,7 +511,7 @@ makeUserPTE baseAddr rights attrs vmSize =
|
||||||
pteSmallPage = vmSize == ARMSmallPage,
|
pteSmallPage = vmSize == ARMSmallPage,
|
||||||
pteGlobal = False,
|
pteGlobal = False,
|
||||||
pteExecuteNever = armExecuteNever attrs,
|
pteExecuteNever = armExecuteNever attrs,
|
||||||
pteDevice = armPageCacheable attrs,
|
pteDevice = not (armPageCacheable attrs),
|
||||||
pteRights = rights }
|
pteRights = rights }
|
||||||
|
|
||||||
checkVPAlignment :: VMPageSize -> VPtr -> KernelF SyscallError ()
|
checkVPAlignment :: VMPageSize -> VPtr -> KernelF SyscallError ()
|
||||||
|
|
Loading…
Reference in New Issue