Merge pull request #771 from PrincetonUniversity/funcptr_validpointer

Changed definition of valid_pointer' wrt locations with PURE resource…

Author: andrew-appel

Diff for: Makefile

@@ -504,7 +504,7 @@ FLOYD_FILES= \
    for_lemmas.v semax_tactics.v diagnosis.v simple_reify.v simpl_reptype.v \
    freezer.v deadvars.v Clightnotations.v unfold_data_at.v hints.v reassoc_seq.v \
    SeparationLogicAsLogicSoundness.v SeparationLogicAsLogic.v SeparationLogicFacts.v \
-   subsume_funspec.v linking.v data_at_lemmas.v Funspec_old_Notation.v assoclists.v VSU.v VSU_DrySafe.v quickprogram.v PTops.v Component.v QPcomposite.v \
+   subsume_funspec.v linking.v data_at_lemmas.v Funspec_old_Notation.v assoclists.v VSU.v quickprogram.v PTops.v Component.v QPcomposite.v \
    data_at_list_solver.v step.v fastforward.v finish.v
 #real_forward.v
 
@@ -515,7 +515,7 @@ PROGS32_FILES= \
   insertionsort.v reverse.v reverse_client.v queue.v sumarray.v message.v string.v object.v \
   revarray.v verif_revarray.v insertionsort.v append.v min.v min64.v int_or_ptr.v \
   dotprod.v strlib.v fib.v \
-  verif_min.v verif_min64.v verif_float.v verif_global.v verif_ptr_compare.v \
+  verif_min.v verif_min64.v verif_float.v verif_global.v verif_ptr_compare.v\
   verif_nest3.v verif_nest2.v verif_load_demo.v verif_store_demo.v \
   logical_compare.v verif_logical_compare.v field_loadstore.v  verif_field_loadstore.v \
   even.v verif_even.v odd.v verif_odd.v verif_evenodd_spec.v  \
@@ -535,14 +535,14 @@ PROGS32_FILES= \
 C64_ORDINARY = reverse.c revarray.c sumarray.c append.c bin_search.c \
     bst.c field_loadstore.c float.c object.c \
     global.c min.c min64.c nest2.c nest3.c \
-    logical_compare.c \
+    logical_compare.c fptr_cmp.c \
     strlib.c switch.c union.c message.c
 
 V64_ORDINARY = verif_reverse2.v verif_revarray.v verif_sumarray.v \
     verif_append2.v verif_bin_search.v \
     verif_bst.v verif_field_loadstore.v verif_float.v verif_object.v \
     verif_global.v verif_min.v verif_min64.v verif_nest2.v verif_nest3.v \
-    verif_logical_compare.v \
+    verif_logical_compare.v  verif_fptr_cmp.v\
     verif_strlib.v verif_switch.v verif_union.v verif_message.v verif_incr.v
 
 SHA_FILES= \
@@ -624,7 +624,7 @@ AES_FILES = \
 # LINKED_C_FILES are those that need to be clightgen'd in a batch with others
 
 SINGLE_C_FILES = reverse.c reverse_client.c revarray.c queue.c queue2.c message.c object.c insertionsort.c float.c global.c logical_compare.c nest2.c nest3.c ptr_compare.c load_demo.c store_demo.c dotprod.c string.c field_loadstore.c merge.c append.c bin_search.c bst.c bst_oo.c min.c min64.c switch.c funcptr.c floyd_tests.c cond.c sumarray.c sumarray2.c int_or_ptr.c union.c cast_test.c strlib.c tree.c fib.c loop_minus1.c libglob.c peel.c structcopy.c printf.c stackframe_demo.c rotate.c \
-  objectSelf.c objectSelfFancy.c objectSelfFancyOverriding.c io.c io_mem.c
+  objectSelf.c objectSelfFancy.c objectSelfFancyOverriding.c io.c io_mem.c fptr_cmp.c
 
 
 LINKED_C_FILES = even.c odd.c

Diff for: floyd/client_lemmas.v

@@ -64,6 +64,7 @@ Definition ListClassicalSep_environ := @LiftClassicalSep environ.
 Definition func_ptr' f v := func_ptr f v && emp.
 
 #[export] Hint Resolve func_ptr_isptr: saturate_local.
+#[export] Hint Resolve SeparationLogic.func_ptr_valid_pointer: valid_pointer.
 
 Lemma func_ptr'_isptr: forall f v, func_ptr' f v |-- !! isptr v.
 Proof.
@@ -73,6 +74,11 @@ apply andp_left1. apply func_ptr_isptr.
 Qed.
 #[export] Hint Resolve func_ptr'_isptr: saturate_local.
 
+Lemma func_ptr'_valid_pointer: forall spec f, func_ptr' spec f |-- valid_pointer f.
+Proof. intros. unfold func_ptr'.
+apply andp_left1. apply SeparationLogic.func_ptr_valid_pointer. Qed.
+#[export] Hint Resolve func_ptr'_valid_pointer : valid_pointer.
+
 Lemma split_func_ptr':
  forall fs p, func_ptr' fs p = func_ptr' fs p * func_ptr' fs p.
 Proof.

Diff for: progs64/fptr_cmp.c

@@ -0,0 +1,19 @@
+int id (int x) { return x; }
+
+int test_id1 () {
+  if (&id) return(1); else return(0);
+}
+
+int test_fptr (int (*f)(int)) {
+  if (f) return(1); else return(0);
+}
+
+int test_id2 () {
+    return (test_fptr (&id)); }
+
+int test_fptr_fptr () {
+  return ((&test_id1)==(&test_id2)); }
+
+int main (){
+  return (test_id1() + test_id2() + test_fptr_fptr()); 
+}