Skip to content

Commit e3797a8

Browse files
committed
squash arm access: update for relaxed conditions
Signed-off-by: Corey Lewis <corey.lewis@proofcraft.systems>
1 parent 128df1c commit e3797a8

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

proof/access-control/Syscall_AC.thy

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,7 @@ lemma handle_reply_respects:
402402

403403

404404
lemma thread_set_time_slice_pas_refined[wp]:
405-
"\<lbrace>pas_refined aag and pspace_aligned and valid_vspace_objs and valid_arch_state\<rbrace>
406-
thread_set_time_slice tptr time
407-
\<lbrace>\<lambda>_. pas_refined aag\<rbrace>"
405+
"thread_set_time_slice tptr time \<lbrace>pas_refined aag\<rbrace>"
408406
by (simp add: thread_set_time_slice_def | wp thread_set_pas_refined)+
409407

410408
lemma dec_domain_time_pas_refined[wp]:
@@ -583,8 +581,7 @@ lemma dec_domain_time_integrity[wp]:
583581
done
584582

585583
lemma timer_tick_integrity[wp]:
586-
"\<lbrace>integrity aag X st and pas_refined aag and (\<lambda>s. ct_active s \<longrightarrow> is_subject aag (cur_thread s))
587-
and pspace_aligned and valid_vspace_objs and valid_arch_state\<rbrace>
584+
"\<lbrace>integrity aag X st and pas_refined aag and (\<lambda>s. ct_active s \<longrightarrow> is_subject aag (cur_thread s))\<rbrace>
588585
timer_tick
589586
\<lbrace>\<lambda>_. integrity aag X st\<rbrace>"
590587
apply (simp add: timer_tick_def)
@@ -616,8 +613,6 @@ lemma handle_interrupt_integrity_autarch:
616613
ackInterrupt_device_state_inv resetTimer_device_state_inv
617614
handle_reserved_irq_integrity_autarch
618615
simp: get_irq_slot_def get_irq_state_def)+
619-
apply (rule conjI[rotated], fastforce) \<comment> \<open>IRQTimer preconditions\<close>
620-
apply clarsimp
621616
apply (rule conjI, fastforce)+ \<comment> \<open>valid_objs etc.\<close>
622617
apply (clarsimp simp: cte_wp_at_caps_of_state)
623618
apply (rule_tac s = s in hacky_ipc_Send [where irq = irq])

proof/access-control/Tcb_AC.thy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ lemma set_priority_integrity_autarch[wp]:
134134
by (simp add: set_priority_def | wp)+
135135

136136
lemma set_priority_pas_refined[wp]:
137-
"\<lbrace>pas_refined aag and pspace_aligned and valid_vspace_objs and valid_arch_state\<rbrace>
138-
set_priority tptr prio
139-
\<lbrace>\<lambda>_. pas_refined aag\<rbrace>"
137+
"set_priority tptr prio \<lbrace>pas_refined aag\<rbrace>"
140138
unfolding set_priority_def thread_set_priority_def
141139
by (wpsimp wp: thread_set_pas_refined)
142140

0 commit comments

Comments
 (0)