diff options
| author |  Jason Gross <jasongross9@gmail.com> | 2016-07-22 15:33:31 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-22 15:33:31 -0700 |
| commit | 2abb4b5ea3440d478540aad852cfe81e65596189 (patch) | |
| tree | 3851f94e613e595bc99da6c932ec99e033694fa3 /src/Assembly/Pseudo.v | |
| parent | 29bb3dd531be45ba7960b34ef759b44436e48905 (diff) | |
| parent | 4519b114c66b184611068b2cc9bdad644f4a5a47 (diff) | |
Merge pull request #37 from JasonGross/fix-intuition
Redesign intuition, speeding up overall compilation by 20%
Diffstat (limited to 'src/Assembly/Pseudo.v')
| -rw-r--r-- | src/Assembly/Pseudo.v | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Assembly/Pseudo.v b/src/Assembly/Pseudo.v index e3f1e63ff..b8aae4521 100644 --- a/src/Assembly/Pseudo.v +++ b/src/Assembly/Pseudo.v @@ -1,6 +1,7 @@ -Require Import QhasmCommon QhasmUtil State. -Require Import Language QhasmEvalCommon. -Require Import List Compare_dec Omega. +Require Import Crypto.Assembly.QhasmCommon Crypto.Assembly.QhasmUtil Crypto.Assembly.State. +Require Import Crypto.Assembly.Language Crypto.Assembly.QhasmEvalCommon. +Require Import Coq.Lists.List Coq.Arith.Compare_dec Coq.omega.Omega. +Require Export Crypto.Util.FixCoqMistakes. Module Pseudo <: Language. Import EvalUtil ListState. @@ -96,7 +97,7 @@ Module Pseudo <: Language. else pseudoEval r st )) | PFunExp n p e => - (fix funexpseudo (e': nat) (st': ListState w) := + (fix funexpseudo (e': nat) (st': ListState w) := match e' with | O => Some st' | S e'' => @@ -116,7 +117,7 @@ Module Pseudo <: Language. Definition indexize {n: nat} (x: nat): Index n. intros; destruct (le_dec n 0). - - exists 0; abstract intuition. + - exists 0; abstract intuition auto with zarith. - exists (x mod n)%nat; abstract ( pose proof (Nat.mod_bound_pos x n); omega). Defined. @@ -179,4 +180,3 @@ Module Pseudo <: Language. Close Scope pseudo_notations. End Pseudo. - |