Merge

coq/binary/Makefile

-bytes:
-	ocamlc -c CoqChecker.ml
-	ocamlc -o coq_checker_bytes nums.cma big.ml CoqChecker.ml coq_main.ml
+#bytes:
+#	ocamlc -c CoqChecker.ml
+#	ocamlc -o coq_checker_bytes nums.cma big.ml CoqChecker.ml coq_main.ml
 native:
 	ocamlc -c CoqChecker.ml
 	ocamlc -o coq_checker_native nums.cma big.ml CoqChecker.ml coq_main.ml
 
-all: bytes native
+all: native

hol4/binary/Holmakefile

-INCLUDES = .. ../cakeml/compiler ../cakeml/compiler/backend
+INCLUDES = .. ../cakeml/compiler ../cakeml/compiler/backend ../cakeml/misc
 OPTIONS = QUIT_ON_FAILURE
 
 ifdef POLY

cakeml @ 9f7a2e8b

-Subproject commit 3f8f06e6f46b79db0217c67bc1842309900666b4
+Subproject commit 9f7a2e8b53e4f091ae49340aed425376ed30ae26

scripts/formal/cpp_2018_times.sh

@@ -24,7 +24,7 @@ do
     FILENAME=${FILEPRE/.\/testcases\/cpp2018\//}
     PMAPSUFF=${file/scala/txt}
     PMAP=${PMAPSUFF/.\/testcases\/cpp2018\//}
-    /usr/bin/time -o $1 -a -f " $FILENAME , %e " ./daisy $file --certificate=coq --errorMethod=interval --mixed-precision=testcases/mixed-precision-maps/$PMAP
+#    /usr/bin/time -o $1 -a -f " $FILENAME , %e " ./daisy $file --certificate=coq --errorMethod=interval --mixed-precision=testcases/mixed-precision-maps/$PMAP
     #echo "HOL4 Certificate"
     /usr/bin/time -o $1 -a -f " $FILENAME , %e " ./daisy $file --certificate=hol4 --errorMethod=interval --mixed-precision=testcases/mixed-precision-maps/$PMAP
     #echo "HOL4 Binary Certificate"
@@ -33,8 +33,8 @@ do
 done
 
 echo "################################################
-    Certificate test - Coq
-################################################" >>$1
+   Certificate test - Coq
+###############################################" >>$1
 
 cd coq
   arrCoq=()

src/main/scala/daisy/backend/CertificatePhase.scala

@@ -781,7 +781,7 @@ object CertificatePhase extends DaisyPhase {
       "Proof.\n  vm_compute; auto.\nQed.\n"
     } else if (prover == "hol4"){
       "val _ = store_thm (\""+s"ErrorBound_${fName}_Sound"+"\",\n" +
-      s"``CertificateCheckerCmd $lastGenName $analysisResultName $precondName $defVarsName``,\n daisy_eval_tac \\ fs[]);\n"
+      s"``CertificateCheckerCmd $lastGenName $analysisResultName $precondName $defVarsName``,\n daisy_eval_tac \\\\ fs[]);\n"
     } else
       ""