diff options
| author |  Robert Sloan <varomodt@gmail.com> | 2016-06-06 11:34:17 -0400 |
|---|---|---|
| committer | Robert Sloan <varomodt@gmail.com> | 2016-06-06 11:34:17 -0400 |
| commit | 490ea83249d65567926819f83037e0940c71c86c (patch) | |
| tree | 8eb67102a3adccf19d1e74b64efe017062b1976f | |
| parent | 938c13966d7db45d2acb08b946003ea87ef42cfd (diff) | |
| parent | 711187d4b8c05266b85d85a379ca535c4564cc0d (diff) | |
merging with master
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | _CoqProject | 11 | ||||
| -rw-r--r-- | src/Assembly/Pipeline.v | 2 |
3 files changed, 12 insertions, 5 deletions
@@ -4,10 +4,8 @@ SRC_DIR := src .PHONY: coq clean install coqprime update-_CoqProject .DEFAULT_GOAL := coq -SORT_COQPROJECT = sed 's,[^/]*/,~&,g' | env LC_COLLATE=C sort | sed 's,~,,g' - update-_CoqProject:: - (echo '-R $(SRC_DIR) $(MOD_NAME)'; (git ls-files 'src/*.v' | $(SORT_COQPROJECT))) > _CoqProject + (echo '-R $(SRC_DIR) $(MOD_NAME)'; git ls-files src/*.v) > _CoqProject coq: coqprime Makefile.coq $(MAKE) -f Makefile.coq diff --git a/_CoqProject b/_CoqProject index 6d2b3a880..d4a8857a1 100644 --- a/_CoqProject +++ b/_CoqProject @@ -30,3 +30,14 @@ src/Util/NatUtil.v src/Util/NumTheoryUtil.v src/Util/WordUtil.v src/Util/ZUtil.v +src/Assembly/QhasmCommon.v +src/Assembly/QhasmUtil.v +src/Assembly/State.v +src/Assembly/QhasmEvalCommon.v +src/Assembly/Pseudo.v +src/Assembly/AlmostQhasm.v +src/Assembly/Qhasm.v +src/Assembly/PseudoConversion.v +src/Assembly/AlmostConversion.v +src/Assembly/StringConversion.v +src/Assembly/Pipeline.v diff --git a/src/Assembly/Pipeline.v b/src/Assembly/Pipeline.v index acdfc3b03..949bebade 100644 --- a/src/Assembly/Pipeline.v +++ b/src/Assembly/Pipeline.v @@ -26,6 +26,4 @@ Module PipelineExample. Program Definition asdf: Program Unary32 := ($0 :+: $0)%p. Definition exStr := Pipeline.toString asdf. - - Eval vm_compute in exStr. End PipelineExample. |