diff options
author | Cyril SIX <cyril.six@kalray.eu> | 2019-10-16 17:13:05 +0200 |
---|---|---|
committer | Cyril SIX <cyril.six@kalray.eu> | 2019-10-16 17:13:23 +0200 |
commit | 9ee131bd329d1941eb37eb347f36a0c613a719a9 (patch) | |
tree | 25760a2f9e796a0f3436463852bb819c288f0a50 /mppa_k1c | |
parent | 72378d9371bc5da342266bcf14231ab568e0f919 (diff) | |
parent | e1725209b2b4401adc63ce5238fa5db7c134609c (diff) | |
download | compcert-kvx-9ee131bd329d1941eb37eb347f36a0c613a719a9.tar.gz compcert-kvx-9ee131bd329d1941eb37eb347f36a0c613a719a9.zip |
[regression to check!] Merge tag 'v3.6' into mppa-work
Conflicts:
.gitignore
backend/Lineartyping.v
common/Values.v
configure
cparser/Machine.ml
cparser/Machine.mli
driver/Configuration.ml
driver/Frontend.ml
runtime/Makefile
test/c/Makefile
test/c/aes.c
test/compression/Makefile
test/regression/Makefile
test/regression/extasm.c
test/regression/floats-basics.c
test/regression/floats.c
Note : test/regression should be checked, didn't test it yet
Diffstat (limited to 'mppa_k1c')
-rw-r--r-- | mppa_k1c/NeedOp.v | 14 | ||||
-rw-r--r-- | mppa_k1c/SelectOpproof.v | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/mppa_k1c/NeedOp.v b/mppa_k1c/NeedOp.v index d2d4d5f5..7111c48b 100644 --- a/mppa_k1c/NeedOp.v +++ b/mppa_k1c/NeedOp.v @@ -383,20 +383,6 @@ Proof. rewrite modarith_idem. apply mul_sound; rewrite modarith_idem; trivial. - (* maddl *) -- apply addl_sound; trivial. - apply mull_sound; trivial. - rewrite default_idem; trivial. - rewrite default_idem; trivial. - (* msubl *) -- apply subl_sound; trivial. - apply mull_sound; trivial. - rewrite default_idem; trivial. - rewrite default_idem; trivial. -- apply vagree_triple_op_float; assumption. -- apply vagree_triple_op_float; assumption. -- apply vagree_triple_op_single; assumption. -- apply vagree_triple_op_single; assumption. - destruct (eval_condition0 _ _ _) as [b|] eqn:EC. erewrite needs_of_condition0_sound by eauto. apply select_sound; auto. diff --git a/mppa_k1c/SelectOpproof.v b/mppa_k1c/SelectOpproof.v index 583fb545..38280810 100644 --- a/mppa_k1c/SelectOpproof.v +++ b/mppa_k1c/SelectOpproof.v @@ -1204,7 +1204,7 @@ Qed. Theorem eval_cast8unsigned: unary_constructor_sound cast8unsigned (Val.zero_ext 8). Proof. red; intros until x. unfold cast8unsigned. - rewrite Val.zero_ext_and. apply eval_andimm. compute; auto. + rewrite Val.zero_ext_and. apply eval_andimm. compute; auto. discriminate. Qed. Theorem eval_cast16signed: unary_constructor_sound cast16signed (Val.sign_ext 16). @@ -1217,7 +1217,7 @@ Qed. Theorem eval_cast16unsigned: unary_constructor_sound cast16unsigned (Val.zero_ext 16). Proof. red; intros until x. unfold cast8unsigned. - rewrite Val.zero_ext_and. apply eval_andimm. compute; auto. + rewrite Val.zero_ext_and. apply eval_andimm. compute; auto. discriminate. Qed. Theorem eval_intoffloat: |